X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fsrcformats.py;h=7d7dd940e3837c1c5c99a7f8708ae3663ae53d44;hb=d0779ef69d429a210405002f252067806ddfa6f2;hp=f3afb8dba8b65b04fceca139b79b906b214e3080;hpb=b7d36f712210b0efac983da88ae91cdd3fd7f469;p=dak.git

diff --git a/daklib/srcformats.py b/daklib/srcformats.py
index f3afb8db..7d7dd940 100644
--- 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()
+    for format in srcformats:
+        if format.re_format.match(txt):
+            return format
 
-    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]
-
-    return format
+    raise UnknownFormatError, "Unknown format %r" % txt
 
 class SourceFormat(type):
     def __new__(cls, name, bases, attrs):
@@ -57,18 +39,6 @@ class SourceFormat(type):
             if has[key]:
                 yield "contains source files not allowed in format %s" % cls.name
 
-    @classmethod
-    def validate_format(cls, format, is_a_dsc=False, field='files'):
-        if is_a_dsc:
-            if format != (1,0) and \
-               format != (3,0,"quilt") and format != (3,0,"native"):
-                raise UnknownFormatError, repr(format)
-        else:
-            if (format < (1,5) or format > (1,8)):
-                raise UnknownFormatError, repr(format)
-            if field != "files" and format < (1,8):
-                raise UnknownFormatError, repr(format)
-
 class FormatOne(SourceFormat):
     __metaclass__ = SourceFormat