[dak/master 01/10] Move "Format:" field parsing into srcformats.py

[Chris Lamb <lamby@debian.org>]

Signed-off-by: Chris Lamb <lamby@debian.org>
---
 daklib/srcformats.py |   31 +++++++++++++++++++++++++++++++
 daklib/utils.py      |   30 +++---------------------------
 2 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/daklib/srcformats.py b/daklib/srcformats.py
index 0a74c19..d6079a0 100644
--- a/daklib/srcformats.py
+++ b/daklib/srcformats.py
@@ -1,5 +1,8 @@
 import re
 
+from regexes import re_verwithext
+from dak_exceptions import UnknownFormatError
+
 srcformats = []
 
 class SourceFormat(type):
@@ -24,6 +27,34 @@ 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
 
diff --git a/daklib/utils.py b/daklib/utils.py
index 788bcd4..5021483 100755
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -44,9 +44,8 @@ from dbconn import DBConn, get_architecture, get_component, get_suite
 from dak_exceptions import *
 from textutils import fix_maintainer
 from regexes import re_html_escaping, html_escaping, re_single_line_field, \
-                    re_multi_line_field, re_srchasver, re_verwithext, \
-                    re_taint_free, re_gpg_uid, re_re_mark, \
-                    re_whitespace_comment, re_issource
+                    re_multi_line_field, re_srchasver, re_taint_free, \
+                    re_gpg_uid, re_re_mark, re_whitespace_comment, re_issource
 
 from srcformats import srcformats
 from collections import defaultdict
@@ -524,30 +523,7 @@ def build_file_list(changes, is_a_dsc=0, field="files", hashname="md5sum"):
     if not changes.has_key(field):
         raise NoFilesFieldError
 
-    # Make sure we recognise the format of the Files: field
-    format = re_verwithext.search(changes.get("format", "0.0"))
-    if not format:
-        raise UnknownFormatError, "%s" % (changes.get("format","0.0"))
-
-    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, "%s" % (changes.get("format","0.0"))
-    else:
-        if (format < (1,5) or format > (1,8)):
-            raise UnknownFormatError, "%s" % (changes.get("format","0.0"))
-        if field != "files" and format < (1,8):
-            raise UnknownFormatError, "%s" % (changes.get("format","0.0"))
+    format = SourceFormat.parse_format(changes.get["format"], field, is_a_dsc)
 
     includes_section = (not is_a_dsc) and field == "files"
 
-- 
1.6.3.3