[Python-checkins] r54915 - tracker/importer/sfxmlhandlers.py

[erik.forsberg]

Author: erik.forsberg
Date: Sat Apr 21 19:43:45 2007
New Revision: 54915

Modified:
   tracker/importer/sfxmlhandlers.py
Log:
Merge 2.2.x -> 2.2 and 2.1.x -> 2.1 as specified in
http://psf.upfronthosting.co.za/roundup/meta/issue101.


Modified: tracker/importer/sfxmlhandlers.py
==============================================================================
--- tracker/importer/sfxmlhandlers.py	(original)
+++ tracker/importer/sfxmlhandlers.py	Sat Apr 21 19:43:45 2007
@@ -423,6 +423,11 @@
         elif "Python 3000" == group:
             roundupdata['keywords'].append(self.db.keyword.lookup('py3k'))
         try:
+            # Merge as specified in http://psf.upfronthosting.co.za/roundup/meta/issue101
+            if group.startswith("Python 2.1"):
+                group = "Python 2.1"
+            elif group.startswith("Python 2.2"):
+                group = "Python 2.2"
             version = self.db.version.lookup(group)
             roundupdata[self.target] = version
             return