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

Signed-off-by: Chris Lamb <lamby@debian.org>

diff --git a/daklib/srcformats.py b/daklib/srcformats.py
index 735b7b686c26b8f06bf5827c64ee215b1ef78d96..2b07c7ef4f524021b21a033944df3a7be81653af 100644 (file)
--- a/daklib/srcformats.py
+++ b/daklib/srcformats.py
@@ -28,7 +28,7 @@ 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 format is None:
@@ -44,17 +44,19 @@ class SourceFormat(type):
         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:
             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

diff --git a/daklib/utils.py b/daklib/utils.py
index 5021483fcb0c901a2154b2a67f8ca7e408f03724..8362c57fd6ce14d8d1ab77bf1b2ac21f65e36673 100755 (executable)
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -523,7 +523,8 @@ def build_file_list(changes, is_a_dsc=0, field="files", hashname="md5sum"):
     if not changes.has_key(field):
         raise NoFilesFieldError
 
-    format = SourceFormat.parse_format(changes.get["format"], field, is_a_dsc)
+    format = SourceFormat.parse_format(changes.get["format"])
+    SourceFormat.validate_format(format, is_a_dsc=False, field='files')
 
     includes_section = (not is_a_dsc) and field == "files"
 

diff --git a/tests/test_srcformats.py b/tests/test_srcformats.py
index 802f0ffb688e29ad223760e569213c68c5b3dbe7..9c62d831bdb8a46b609e826848472fca584004f1 100755 (executable)
--- a/tests/test_srcformats.py
+++ b/tests/test_srcformats.py
@@ -107,16 +107,16 @@ class FormatTreeQuiltTestCase(SourceFormatTestCase):
 
 class ParseFormat(unittest.TestCase):
     def assertFormat(self, input, expected, **kwargs):
-        self.assertEqual(
-            srcformats.SourceFormat.parse_format(input, **kwargs),
-            expected,
-        )
+        format = srcformats.SourceFormat.parse_format(input)
+        self.assertEqual(format, expected)
+        srcformats.SourceFormat.validate_format(format, **kwargs)
 
     def assertInvalidFormat(self, input, **kwargs):
-        self.assertRaises(
-            UnknownFormatError,
-            lambda: srcformats.SourceFormat.parse_format(input, **kwargs),
-        )
+        try:
+            format = srcformats.SourceFormat.parse_format(input)
+            srcformats.SourceFormat.validate_format(format, **kwargs)
+        except UnknownFormatError:
+            return
 
     def testEmpty(self):
         self.assertInvalidFormat('')