Merge pull request #285 from mpsonntag/uiconvert

Add custom InvalidVersion exception

Author: achilleas-k

odml/tools/dict_parser.py

@@ -5,7 +5,7 @@
 
 from .. import format as odmlfmt
 from ..info import FORMAT_VERSION
-from .parser_utils import ParserException
+from .parser_utils import InvalidVersionException, ParserException
 
 
 class DictWriter:
@@ -131,7 +131,7 @@ def to_odml(self, parsed_doc):
             msg = ("Cannot read file: invalid odML document format version '%s'. \n"
                    "This package supports odML format versions: '%s'."
                    % (self.parsed_doc.get('odml-version'), FORMAT_VERSION))
-            raise ParserException(msg)
+            raise InvalidVersionException(msg)
 
         self.parsed_doc = self.parsed_doc['Document']
 

odml/tools/parser_utils.py

@@ -11,3 +11,10 @@ class ParserException(Exception):
     Exception wrapper used by various odML parsers.
     """
     pass
+
+
+class InvalidVersionException(ParserException):
+    """
+    Exception wrapper to indicate a non-compatible odML version.
+    """
+    pass

odml/tools/xmlparser.py

@@ -18,7 +18,7 @@
 
 from .. import format
 from ..info import FORMAT_VERSION
-from .parser_utils import ParserException
+from .parser_utils import InvalidVersionException, ParserException
 
 try:
     unicode = unicode
@@ -162,7 +162,7 @@ def _handle_version(root):
             msg = ("Cannot read file: invalid odML document format version '%s'. \n"
                    "This package supports odML format versions: '%s'."
                    % (root.attrib['version'], FORMAT_VERSION))
-            raise ParserException(msg)
+            raise InvalidVersionException(msg)
 
     def from_file(self, xml_file):
         """