Move parse_format into daklib.formats

[dak.git] / daklib / srcformats.py

diff --git a/daklib/srcformats.py b/daklib/srcformats.py
index bcb2e2bbae4e373df2e0c2cb1a130a58d15cfa1e..d26a642b1cedde85081fe7880a10b01e8b462b14 100644 (file)
--- a/daklib/srcformats.py
+++ b/daklib/srcformats.py
@@ -1,39 +1,21 @@
 import re
 
-from regexes import re_verwithext
 from dak_exceptions import UnknownFormatError
 
 srcformats = []
 
-def parse_format(txt):
+def get_format_from_string(txt):
     """
-    Parse a .changes Format string into a tuple representation for easy
-    comparison.
-
-    >>> parse_format('1.0')
-    (1, 0)
-    >>> parse_format('8.4 (hardy)')
-    (8, 4, 'hardy')
-
-    If the format doesn't match these forms, raises UnknownFormatError.
+    Returns the SourceFormat class that corresponds to the specified .changes
+    Format value. If the string does not match any class, UnknownFormatError
+    is raised.
     """
 
-    format = re_verwithext.search(txt)
-
-    if format is None:
-        raise UnknownFormatError, txt
-
-    format = format.groups()
-
-    if format[1] is None:
-        format = int(float(format[0])), 0, format[2]
-    else:
-        format = int(format[0]), int(format[1]), format[2]
-
-    if format[2] is None:
-        format = format[:2]
+    for format in srcformats:
+        if format.re_format.match(txt):
+            return format
 
-    return format
+    raise UnknownFormatError, "Unknown format %r" % txt
 
 class SourceFormat(type):
     def __new__(cls, name, bases, attrs):