From 0cdf7f09d02a9f856121671f734ef2e767cc2c33 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Sun, 14 Feb 2021 13:13:24 +0100 Subject: [PATCH] Fixed missing len of pattern --- CHANGELOG.rst | 2 ++ setup.py | 2 +- src/twomartens/allrisscraper/internal.py | 15 +++++++++------ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c44abb9..c02c706 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -3,6 +3,8 @@ Changelog This changelog contains a list of versions with their respective high-level changes. +v0.5.5: + - fixed missing len of pattern v0.5.4: - match video conference starts case insensitive v0.5.3: diff --git a/setup.py b/setup.py index 7669a9b..e82f30e 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ setup( author="Jim Martens", author_email="github@2martens.de", url="https://git.2martens.de/2martens/allris-scraper", - version="0.5.4", + version="0.5.5", namespace_packages=["twomartens"], packages=find_packages('src', exclude=["*.tests", "*.tests.*", "tests.*", "tests"]), package_dir={'': 'src'}, diff --git a/src/twomartens/allrisscraper/internal.py b/src/twomartens/allrisscraper/internal.py index 2a1fe30..3507ae9 100644 --- a/src/twomartens/allrisscraper/internal.py +++ b/src/twomartens/allrisscraper/internal.py @@ -175,16 +175,19 @@ def get_abbreviated_committee_name(name: str, district: str) -> str: start_youth_help_committee = "Sitzung des Jugendhilfeausschusses" start_other_committee = "Sitzung des" end_other_committee = "ausschusses" - start_video_conf1 = re.compile("NICHTÖFFENTLICHE VIDEOKONFERENZ! ", re.I) - start_video_conf2 = re.compile("Nichtöffentliche Videokonferenz ", re.I) - start_video_conf3 = re.compile("Nichtöffentliche Videokonferenz- ", re.I) + start_video_conf1 = "NICHTÖFFENTLICHE VIDEOKONFERENZ! " + start_video_conf2 = "Nichtöffentliche Videokonferenz " + start_video_conf3 = "Nichtöffentliche Videokonferenz- " + start_video_conf1_p = re.compile("NICHTÖFFENTLICHE VIDEOKONFERENZ! ", re.I) + start_video_conf2_p = re.compile("Nichtöffentliche Videokonferenz ", re.I) + start_video_conf3_p = re.compile("Nichtöffentliche Videokonferenz- ", re.I) abbreviated_name = "" - if start_video_conf1.match(name): + if start_video_conf1_p.match(name): name = name[len(start_video_conf1):] - if start_video_conf2.match(name): + if start_video_conf2_p.match(name): name = name[len(start_video_conf2):] - if start_video_conf3.match(name): + if start_video_conf3_p.match(name): name = name[len(start_video_conf3):] if name.startswith(start_plenary): abbreviated_name = "BV"