Replace read_stripped_lines with generator

MycroftAI · Mar 11, 2020 · c348115 · c348115
1 parent c075d65
commit c348115
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/mycroft/util/file_utils.py b/mycroft/util/file_utils.py
@@ -88,7 +88,10 @@ def read_stripped_lines(filename):
         (list) list of lines stripped from leading and ending white chars.
     """
     with open(filename, 'r') as f:
-        return [line.strip() for line in f]
+        for line in f:
+            line = line.strip()
+            if line:
+                yield line
 
 
 def read_dict(filename, div='='):

diff --git a/test/unittests/util/test_util.py b/test/unittests/util/test_util.py
@@ -92,7 +92,7 @@ def test_read_stripped_lines(self):
         expected = ['Once upon a time', 'there was a great Dragon',
                     'It was red and cute', 'The end']
         unstripped_path = join(TestReadFiles.base, 'unstripped_lines.txt')
-        self.assertEqual(read_stripped_lines(unstripped_path), expected)
+        self.assertEqual(list(read_stripped_lines(unstripped_path)), expected)
 
     def test_read_dict(self):
         expected = {'fraggle': 'gobo', 'muppet': 'miss piggy'}