improved bom stripping

Author: rossengeorgiev

tests/test_vdf.py

@@ -68,14 +68,12 @@ def test_routine_dump_writing(self):
 
 class testcase_parse_routine(unittest.TestCase):
     def test_parse_bom_removal(self):
-        for mark in vdf.BOMS:
-            result = vdf.loads(mark + '"asd" "123"')
-            self.assertEqual(result, {'asd': '123'})
+        result = vdf.loads(vdf.BOMS + '"asd" "123"')
+        self.assertEqual(result, {'asd': '123'})
 
         if sys.version_info[0] is 2:
-            for mark in vdf.BOMS_UNICODE:
-                result = vdf.loads(mark + '"asd" "123"')
-                self.assertEqual(result, {'asd': '123'})
+            result = vdf.loads(vdf.BOMS_UNICODE + '"asd" "123"')
+            self.assertEqual(result, {'asd': '123'})
 
     def test_parse_asserts(self):
         for t in [5, 5.5, 1.0j, True, None, (), {}, lambda: 0]:

vdf/__init__.py

@@ -18,30 +18,20 @@
     from io import IOBase as file_type
     string_type = str
     next_method_name = '__next__'
-    BOMS = ('\ufffe', '\ufeff')
+    BOMS = '\ufffe\ufeff'
 
     def strip_bom(line):
-        if line.startswith(BOMS):
-            return line[1:]
-        return line
-
+        return line.lstrip(BOMS)
 else:
     from StringIO import StringIO
     file_type = (file, StringIO)
     string_type = basestring
     next_method_name = 'next'
-    BOMS = ('\xff\xfe', '\xfe\xff')
-    BOMS_UNICODE = ['\\ufffe', '\\ufeff']
-    BOMS_UNICODE = tuple(map(lambda x: x.decode('unicode-escape'), BOMS_UNICODE))
+    BOMS = '\xef\xbb\xbf\xff\xfe\xfe\xff'
+    BOMS_UNICODE = '\\ufffe\\ufeff'.decode('unicode-escape')
 
     def strip_bom(line):
-        if isinstance(line, str):
-            if line.startswith(BOMS):
-                return line[2:]
-        else:
-            if line.startswith(BOMS_UNICODE):
-                    return line[1:]
-        return line
+        return line.lstrip(BOMS if isinstance(line, str) else BOMS_UNICODE)
 
 ###############################################
 #
@@ -61,7 +51,7 @@ def parse(source):
     else:
         raise ValueError("Expected parametar to be file or str")
 
-    # strip anoying BOMS
+    # strip annoying BOMS
     lines[0] = strip_bom(lines[0])
 
     # init