iwla Commit Details

Date:

2021-08-06 08:45:04 (2 years 1 month ago)

Author:

Grégory Soutadé

Branch:

dev, master

Commit:

5130b1f6d8422bb7f89eb2c6d918a54bf45d770b

Parents:

f149baed70353fdfefaefbfc3744bd6d4c9b963d

Message:

Bad 2to3 python conversion : map() function needs to be included into list() operator. If not, they're only analyzed once

Changes:

M	plugins/pre_analysis/page_to_hit.py (2 diffs)
M	plugins/pre_analysis/robots.py (1 diff)

File differences

-59
60 60
61 61
62 
62
63 63
64 64
65 65
66 
66
67 67
68 68
69 69
... ...
105 105
106 106
107 107
108
108 109
+    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␊

                            super_hit['viewed_hits'][day] -= 1␊
                            super_hit['viewed_pages'][0] += 1␊
                            super_hit['viewed_hits'][0] -= 1␊
␊
                            break␊
 ...
     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␊
                             super_hit['viewed_hits'][day] -= 1␊
                             super_hit['viewed_pages'][0] += 1␊
                             super_hit['viewed_hits'][0] -= 1␊
+␊
                             break␊

-60
61 61
62 62
63 
63
64 64
65 65
66 66
+        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__)␊
         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__)␊

Download the corresponding diff file

iwla

File differences

Branches

Tags