From: Christian Herdtweck <christian.herdtweck@intra2net.com>
Date: Tue, 22 Jan 2019 09:50:41 +0000 (+0100)
Subject: log_read: Fix import order and return from prepare_result
X-Git-Tag: v1.6.7~2^2~3
X-Git-Url: http://developer.intra2net.com/git/?p=pyi2ncommon;a=commitdiff_plain;h=215a12fd1bc7c5bb6f5c5c983dbc89ddfea4caee

log_read: Fix import order and return from prepare_result
---

diff --git a/src/log_read.py b/src/log_read.py
index 07f9ac0..7e11095 100644
--- a/src/log_read.py
+++ b/src/log_read.py
@@ -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