Split parsing of "Format:" string and validation of it.

[dak.git] / daklib / srcformats.py

diff --git a/daklib/srcformats.py b/daklib/srcformats.py
index d6079a0f5df6a9067445b5d366d4a4e51865b5ac..2b07c7ef4f524021b21a033944df3a7be81653af 100644 (file)
--- a/daklib/srcformats.py
+++ b/daklib/srcformats.py
@@ -28,32 +28,35 @@ class SourceFormat(type):
                 yield "contains source files not allowed in format %s" % cls.name
 
     @classmethod
-    def parse_format(cls, txt, is_a_dsc=False, field='files'):
+    def parse_format(cls, txt):
         format = re_verwithext.search(txt)
-        if not format:
+
+        if format is None:
             raise UnknownFormatError, txt
 
         format = format.groups()
-        if format[1] == None:
+
+        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] == None:
+
+        if format[2] is None:
             format = format[:2]
 
+        return format
+
+    @classmethod
+    def validate_format(cls, format, is_a_dsc=False, field='files'):
         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 \
+            if format != (1,0) and \
                format != (3,0,"quilt") and format != (3,0,"native"):
-                raise UnknownFormatError, txt
+                raise UnknownFormatError, repr(format)
         else:
             if (format < (1,5) or format > (1,8)):
-                raise UnknownFormatError, txt
+                raise UnknownFormatError, repr(format)
             if field != "files" and format < (1,8):
-                raise UnknownFormatError, txt
-
-        return format
+                raise UnknownFormatError, repr(format)
 
 class FormatOne(SourceFormat):
     __metaclass__ = SourceFormat