log_read: Fix import order and return from prepare_result
authorChristian Herdtweck <christian.herdtweck@intra2net.com>
Tue, 22 Jan 2019 09:50:41 +0000 (10:50 +0100)
committerChristian Herdtweck <christian.herdtweck@intra2net.com>
Mon, 8 Nov 2021 15:12:32 +0000 (16:12 +0100)
src/log_read.py

index 07f9ac0..7e11095 100644 (file)
@@ -52,9 +52,9 @@ INTERFACE
 """
 
 import os
+import os.path
 import re
 from warnings import warn
-import os.path
 import logging
 from .iter_helpers import zip_longest
 from .type_helpers import is_str_or_byte, is_file_obj
@@ -391,6 +391,6 @@ class LogParser(LineReader):
         for _, raw_line in super(LogParser, self).prepare_result(*args):
             result = re.match(self.pattern, raw_line)
             if result:
-                yield result
+                return result
             else:
-                yield raw_line
+                return raw_line