Merge remote branch 'flotow/master'

[dak.git] / daklib / srcformats.py

diff --git a/daklib/srcformats.py b/daklib/srcformats.py
index d6079a0f5df6a9067445b5d366d4a4e51865b5ac..7d7dd940e3837c1c5c99a7f8708ae3663ae53d44 100644 (file)
--- a/daklib/srcformats.py
+++ b/daklib/srcformats.py
@@ -1,10 +1,22 @@
 import re
 
-from regexes import re_verwithext
 from dak_exceptions import UnknownFormatError
 
 srcformats = []
 
+def get_format_from_string(txt):
+    """
+    Returns the SourceFormat class that corresponds to the specified .changes
+    Format value. If the string does not match any class, UnknownFormatError
+    is raised.
+    """
+
+    for format in srcformats:
+        if format.re_format.match(txt):
+            return format
+
+    raise UnknownFormatError, "Unknown format %r" % txt
+
 class SourceFormat(type):
     def __new__(cls, name, bases, attrs):
         klass = super(SourceFormat, cls).__new__(cls, name, bases, attrs)
@@ -27,34 +39,6 @@ class SourceFormat(type):
             if has[key]:
                 yield "contains source files not allowed in format %s" % cls.name
 
-    @classmethod
-    def parse_format(cls, txt, is_a_dsc=False, field='files'):
-        format = re_verwithext.search(txt)
-        if not format:
-            raise UnknownFormatError, txt
-
-        format = format.groups()
-        if format[1] == None:
-            format = int(float(format[0])), 0, format[2]
-        else:
-            format = int(format[0]), int(format[1]), format[2]
-        if format[2] == None:
-            format = format[:2]
-
-        if is_a_dsc:
-            # format = (0,0) are missing format headers of which we still
-            # have some in the archive.
-            if format != (1,0) and format != (0,0) and \
-               format != (3,0,"quilt") and format != (3,0,"native"):
-                raise UnknownFormatError, txt
-        else:
-            if (format < (1,5) or format > (1,8)):
-                raise UnknownFormatError, txt
-            if field != "files" and format < (1,8):
-                raise UnknownFormatError, txt
-
-        return format
-
 class FormatOne(SourceFormat):
     __metaclass__ = SourceFormat