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

diff --git a/daklib/srcformats.py b/daklib/srcformats.py
index f3afb8db..accccae6 100644
--- a/daklib/srcformats.py
+++ b/daklib/srcformats.py
@@ -1,39 +1,54 @@
-import re
+#!/usr/bin/python
 
-from regexes import re_verwithext
-from dak_exceptions import UnknownFormatError
+""" Helper functions for the various source formats
 
-srcformats = []
+@contact: Debian FTPMaster <ftpmaster@debian.org>
+@copyright: 2009, 2010  Joerg Jaspert <joerg@debian.org>
+@copyright: 2009  Chris Lamb <lamby@debian.org>
+@license: GNU General Public License version 2 or later
+"""
 
-def parse_format(txt):
-    """
-    Parse a .changes Format string into a tuple representation for easy
-    comparison.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
 
-    >>> parse_format('1.0')
-    (1, 0)
-    >>> parse_format('8.4 (hardy)')
-    (8, 4, 'hardy')
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 
-    If the format doesn't match these forms, raises UnknownFormatError.
-    """
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+################################################################################
+
+# <sgran> hey, I think something's wrong with your git repo
+# <sgran> when I git pulled this last time, I got something that looked almost
+#         like python instead of dak
+# <mhy> sgran: slander
+# <sgran> sorry, I take it back, I've had a better look now
 
-    format = re_verwithext.search(txt)
+################################################################################
+import re
 
-    if format is None:
-        raise UnknownFormatError, txt
+from dak_exceptions import UnknownFormatError
 
-    format = format.groups()
+srcformats = []
 
-    if format[1] is None:
-        format = int(float(format[0])), 0, format[2]
-    else:
-        format = int(format[0]), int(format[1]), format[2]
+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.
+    """
 
-    if format[2] is None:
-        format = format[:2]
+    for format in srcformats:
+        if format.re_format.match(txt):
+            return format
 
-    return format
+    raise UnknownFormatError("Unknown format %r" % txt)
 
 class SourceFormat(type):
     def __new__(cls, name, bases, attrs):
@@ -57,23 +72,11 @@ 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
 
     name = '1.0'
-    format = r'1.0'
+    format = r'1\.0'
 
     requires = ()
     disallowed = ('debian_tar', 'more_orig_tar')