X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fsrcformats.py;fp=daklib%2Fsrcformats.py;h=f3afb8dba8b65b04fceca139b79b906b214e3080;hb=b7d36f712210b0efac983da88ae91cdd3fd7f469;hp=2b07c7ef4f524021b21a033944df3a7be81653af;hpb=c9ba1a13b41a4f21b72485d9d93008f4d16f71ac;p=dak.git diff --git a/daklib/srcformats.py b/daklib/srcformats.py index 2b07c7ef..f3afb8db 100644 --- a/daklib/srcformats.py +++ b/daklib/srcformats.py @@ -5,6 +5,36 @@ from dak_exceptions import UnknownFormatError srcformats = [] +def parse_format(txt): + """ + Parse a .changes Format string into a tuple representation for easy + comparison. + + >>> parse_format('1.0') + (1, 0) + >>> parse_format('8.4 (hardy)') + (8, 4, 'hardy') + + If the format doesn't match these forms, raises UnknownFormatError. + """ + + format = re_verwithext.search(txt) + + if format is None: + raise UnknownFormatError, txt + + format = format.groups() + + 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] is None: + format = format[:2] + + return format + class SourceFormat(type): def __new__(cls, name, bases, attrs): klass = super(SourceFormat, cls).__new__(cls, name, bases, attrs) @@ -27,25 +57,6 @@ class SourceFormat(type): if has[key]: yield "contains source files not allowed in format %s" % cls.name - @classmethod - def parse_format(cls, txt): - format = re_verwithext.search(txt) - - if format is None: - raise UnknownFormatError, txt - - format = format.groups() - - 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] is None: - format = format[:2] - - return format - @classmethod def validate_format(cls, format, is_a_dsc=False, field='files'): if is_a_dsc: