diff --git a/src/sphobjinv/inventory.py b/src/sphobjinv/inventory.py index ad490193..5c55d457 100644 --- 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 index 9e525f7b..ac639f94 100644 --- 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 new file mode 100644 index 00000000..3edaf693 Binary files /dev/null and b/tests/resource/objects_mdn.inv differ