From 5130b1f6d8422bb7f89eb2c6d918a54bf45d770b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Fri, 6 Aug 2021 08:45:04 +0200 Subject: [PATCH] Bad 2to3 python conversion : map() function needs to be included into list() operator. If not, they're only analyzed once --- plugins/pre_analysis/page_to_hit.py | 5 +++-- plugins/pre_analysis/robots.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/pre_analysis/page_to_hit.py b/plugins/pre_analysis/page_to_hit.py index 9b7999a..cbcf820 100644 --- a/plugins/pre_analysis/page_to_hit.py +++ b/plugins/pre_analysis/page_to_hit.py @@ -59,11 +59,11 @@ class IWLAPreAnalysisPageToHit(IPlugin): def load(self): # Page to hit self.ph_regexps = self.iwla.getConfValue('page_to_hit_conf', []) - self.ph_regexps = map(lambda r: re.compile(r), self.ph_regexps) + self.ph_regexps = list(map(lambda r: re.compile(r), self.ph_regexps)) # Hit to page self.hp_regexps = self.iwla.getConfValue('hit_to_page_conf', []) - self.hp_regexps = map(lambda r: re.compile(r), self.hp_regexps) + self.hp_regexps = list(map(lambda r: re.compile(r), self.hp_regexps)) self.logger = logging.getLogger(self.__class__.__name__) return True @@ -105,4 +105,5 @@ class IWLAPreAnalysisPageToHit(IPlugin): super_hit['viewed_hits'][day] -= 1 super_hit['viewed_pages'][0] += 1 super_hit['viewed_hits'][0] -= 1 + break diff --git a/plugins/pre_analysis/robots.py b/plugins/pre_analysis/robots.py index af71d27..086dd8d 100644 --- a/plugins/pre_analysis/robots.py +++ b/plugins/pre_analysis/robots.py @@ -60,7 +60,7 @@ class IWLAPreAnalysisRobots(IPlugin): self.API_VERSION = 1 def load(self): - self.awstats_robots = map(lambda x : re.compile(('.*%s.*') % (x), re.IGNORECASE), awstats_data.robots) + self.awstats_robots = list(map(lambda x : re.compile(('.*%s.*') % (x), re.IGNORECASE), awstats_data.robots)) self.robot_re = re.compile(r'.*bot.*', re.IGNORECASE) self.crawl_re = re.compile(r'.*crawl.*', re.IGNORECASE) self.logger = logging.getLogger(self.__class__.__name__)