Generalize priority in data line regex

Also add custom MDN inventory with non-integer priority values. Fixes #147
bskinn · Nov 10, 2020 · 646d67c · 646d67c
1 parent 4513593
commit 646d67c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/src/sphobjinv/inventory.py b/src/sphobjinv/inventory.py
@@ -565,7 +565,7 @@ def _general_import(self):
         import_errors = {
             SourceTypes.BytesPlaintext: TypeError,
             SourceTypes.BytesZlib: (zlib_error, TypeError),
-            SourceTypes.FnamePlaintext: (OSError, TypeError),
+            SourceTypes.FnamePlaintext: (OSError, TypeError, UnicodeDecodeError),
             SourceTypes.FnameZlib: (OSError, TypeError, zlib_error),
             SourceTypes.DictJSON: (ValidationError),
         }

diff --git a/src/sphobjinv/re.py b/src/sphobjinv/re.py
@@ -77,7 +77,7 @@
     :                        # Dividing colon
     (?P<{2}>\w+)             # --> Role
     \s+                      # Dividing space
-    (?P<{3}>-?\d+)           # --> Priority
+    (?P<{3}>\S+)             # --> Priority
     \s+                      # Dividing space
     (?P<{4}>\S+)             # --> URI
     \s+                      # Dividing space

diff --git a/tests/resource/objects_mdn.inv b/tests/resource/objects_mdn.inv