Raise more descriptive exceptions, DuplicateTag and InvalidTagSpec.

2011-03-12 12:24:55 +11:00
parent 160718f9b2
commit e74405d27a
2 changed files with 18 additions and 7 deletions
@@ -17,6 +17,8 @@
 # Copyright (c) 2011 William Grant <me@williamgrant.id.au>

 __all__ = [
+    'DuplicateTag',
+    'InvalidTagSpec',
    'InvalidTagValueList',
    'parse_tag_value',
    ]
@@ -26,6 +28,14 @@ class InvalidTagValueList(Exception):
    pass


+class DuplicateTag(InvalidTagValueList):
+    pass
+
+
+class InvalidTagSpec(InvalidTagValueList):
+    pass
+
+
 def parse_tag_value(tag_list):
    """Parse a DKIM Tag=Value list.

@@ -43,8 +53,8 @@ def parse_tag_value(tag_list):
        try:
            key, value = tag_spec.split('=', 1)
        except ValueError:
-            raise InvalidTagValueList()
+            raise InvalidTagSpec(tag_spec)
        if key.strip() in tags:
-            raise InvalidTagValueList()
+            raise DuplicateTag(key.strip())
        tags[key.strip()] = value.strip()
    return tags