Adds fix for windows line endings

evepraisal · Feb 16, 2014 · a11d532 · a11d532
1 parent 32ebf30
commit a11d532
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/evepaste/utils.py b/evepaste/utils.py
@@ -15,7 +15,7 @@ def split_and_strip(s):
     """
     # Strip each line
     lines = [line.strip(' ').replace(u"\xa0", u"").replace(u"\xc2", u"")
-             for line in s.strip(' ').split('\n')]
+             for line in s.strip(' ').replace("\r\n", "\n").split('\n')]
     # Return non-empty lines
     return [line for line in lines if line]
 

diff --git a/tests/parsers/parse.py b/tests/parsers/parse.py
@@ -13,4 +13,7 @@
 \t\t\t\t\t\t\t\t\t\t''', ('cargo_scan',
                           [{'name': 'rifter', 'quantity': 10}],
                           ['\t\t\t\t\t\t\t\t\t\t']))
+PARSE_TABLE.add_test('10 rifter\r\n',
+                     ('cargo_scan',
+                      [{'name': 'rifter', 'quantity': 10}], []))
 PARSE_TABLE.add_test('', Unparsable)