rm windows line break in get_list_of_strings

common_helper_files/fail_safe_file_operations.py

@@ -38,13 +38,18 @@ def get_string_list_from_file(file_path):
     '''
     try:
         raw = get_binary_from_file(file_path)
-        string = raw.decode(encoding='utf_8', errors='replace')
-        return string.split('\n')
+        raw_string = raw.decode(encoding='utf-8', errors='replace')
+        cleaned_string = _rm_cr(raw_string)
+        return cleaned_string.split('\n')
     except Exception as e:
         logging.error('Could not read file: {} {}'.format(sys.exc_info()[0].__name__, e))
         return []
 
 
+def _rm_cr(input_string):
+    return input_string.replace('\r', '')
+
+
 def write_binary_to_file(file_binary, file_path, overwrite=False, file_copy=False):
     '''
     Fail-safe file write operation. Creates directories if needed.

setup.py

 from setuptools import setup, find_packages
 
-VERSION = '0.2'
+VERSION = '0.2.1'
 
 setup(
     name='common_helper_files',

tests/test_fail_safe_file_operations.py

 import os
 from tempfile import TemporaryDirectory
 import unittest
+import pytest
 
 from common_helper_files import get_binary_from_file, \
     write_binary_to_file, delete_file, get_safe_name, \
     get_files_in_dir, get_string_list_from_file, \
     get_dirs_in_dir, get_directory_for_filename, \
     create_symlink, get_dir_of_file
-from common_helper_files.fail_safe_file_operations import _get_counted_file_path
+from common_helper_files.fail_safe_file_operations import _get_counted_file_path,\
+    _rm_cr
 
 
 class Test_FailSafeFileOperations(unittest.TestCase):
@@ -128,5 +130,8 @@ class Test_FailSafeFileOperations(unittest.TestCase):
         self.assertEqual(absolute_file_path_result, self.tmp_dir.name)
 
 
-if __name__ == "__main__":
-    unittest.main()
+@pytest.mark.parametrize('input_data, expected', [
+    ('abc', 'abc'),
+    ('ab\r\nc', 'ab\nc')])
+def test_rm_cr(input_data, expected):
+    assert _rm_cr(input_data) == expected