iwla Commit Details

Date:

2021-06-04 09:10:50 (1 month 25 days ago)

Author:

Grégory Soutadé

Branch:

dev

Commit:

f149baed70353fdfefaefbfc3744bd6d4c9b963d

Parents:

937706d88d8b818c17f33d5d1cf18d095c3eab73

Message:

Fix error: open log file in text mode to avoid doing str conversion and get some bytes result

Changes:

M	iwla.py (2 diffs)

File differences

-788
789 789
790 790
791 
791
792 792
793 793
794 794
... ...
828 828
829 829
830 830
831 
831
832 832
833 
833
834 834
835 835
836 836
+        for l in _file:␊
            # print "line " + l␊
␊
            groups = self.log_re.match(str(l))␊
            groups = self.log_re.match(l)␊
␊
            if groups:␊
                self._newHit(groups.groupdict(""))␊

            raise StopIteration()␊
        filename = self.filenames.pop(0)␊
        if filename.endswith('gz'):␊
            self.cur_file = gzip.open(filename, 'r')␊
            self.cur_file = gzip.open(filename, 'rt')␊
        else:␊
            self.cur_file = open(filename)␊
            self.cur_file = open(filename, 'rt')␊
␊
    def next(self):␊
        l = self.cur_file.readline()␊
 ...
         for l in _file:␊
             # print "line " + l␊
 ␊
-            groups = self.log_re.match(str(l))␊
+            groups = self.log_re.match(l)␊
 ␊
             if groups:␊
                 self._newHit(groups.groupdict(""))␊
             raise StopIteration()␊
         filename = self.filenames.pop(0)␊
         if filename.endswith('gz'):␊
-            self.cur_file = gzip.open(filename, 'r')␊
+            self.cur_file = gzip.open(filename, 'rt')␊
         else:␊
-            self.cur_file = open(filename)␊
+            self.cur_file = open(filename, 'rt')␊
 ␊
     def next(self):␊
         l = self.cur_file.readline()␊