[4suite-checkins] In 4Suite/Ft/Lib/DistExt, files Version.py

Jeremy Kloth jkloth at 4suite.org
Sun Oct 8 18:46:20 MDT 2006


Modified Files:
    Version.py

Log Message:
Improved version parsing compatability

ViewCVS diff:
  http://cvs.4suite.org/viewcvs/4Suite/Ft/Lib/DistExt/Version.py.diff?r1=1.1&r2=1.2
ViewCVS view:
  http://cvs.4suite.org/viewcvs/4Suite/Ft/Lib/DistExt/Version.py?rev=1.2&content-type=text/vnd.viewcvs-markup

Index: Version.py
===================================================================
RCS file: /var/local/cvsroot/4Suite/Ft/Lib/DistExt/Version.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- Version.py	12 Aug 2006 15:56:24 -0000	1.1
+++ Version.py	9 Oct 2006 00:46:20 -0000	1.2
@@ -28,5 +28,5 @@
 
     version_re = re.compile(r'\d+(\.\d+)*')
-    tag_re = re.compile(r'[.-]?([a-zA-Z]+)(\d+(?:\.\d)*)?')
+    tag_re = re.compile(r'[_.-]?([a-zA-Z]+)?(\d+(?:\.\d)*)?')
 
     # 'tag_aliases' maps release tags to the tag that should be used for
@@ -67,5 +67,5 @@
                 raise ValueError("invalid release tag: %r" % vstring[start:])
             tag, version = match.groups()
-            tag = tag.lower()
+            tag = tag and tag.lower()
             if tag in self.tag_aliases:
                 tag = self.tag_aliases[tag]


More information about the 4suite-checkins mailing list