[Python-checkins] r60688 - tracker/importer/config.py tracker/importer/handlers.py tracker/importer/sfxmlhandlers.py tracker/importer/xmlexport2handlers.py tracker/importer/xmlexport2toroundup.py

[martin.v.loewis]

Author: martin.v.loewis
Date: Sat Feb  9 11:03:40 2008
New Revision: 60688

Modified:
   tracker/importer/config.py
   tracker/importer/handlers.py
   tracker/importer/sfxmlhandlers.py
   tracker/importer/xmlexport2handlers.py
   tracker/importer/xmlexport2toroundup.py
Log:
Add support for Jython import


Modified: tracker/importer/config.py
==============================================================================
--- tracker/importer/config.py	(original)
+++ tracker/importer/config.py	Sat Feb  9 11:03:40 2008
@@ -1,4 +1,4 @@
-mappings = {'category':
+python = {'category':
             {"Demos and tools":"Demos and Tools",
              "Distutils and setup.py":"Distutils",
              "Python Interpreter Core":"Interpreter Core",
@@ -24,3 +24,20 @@
             }
              
 
+jython = {'category':
+            {},
+
+            'priority':
+            {'1':'low',
+              '2':'low',
+              '3':'low',
+              '4':'low',
+              '5':'normal',
+              '6':'high',
+              '7':'high',
+              '8':'immediate',
+              '9':'urgent'
+             },
+            }
+             
+

Modified: tracker/importer/handlers.py
==============================================================================
--- tracker/importer/handlers.py	(original)
+++ tracker/importer/handlers.py	Sat Feb  9 11:03:40 2008
@@ -183,7 +183,7 @@
     for i in range(len(alltds)):
         header = alltds[i].text or ""
         if -1 != header.find("Publicly Displayed Name:"):
-            realname = alltds[i+1].text
+            realname = alltds[i+1].text.strip()
             break
 
     ulh = UserlinkHandler(db,

Modified: tracker/importer/sfxmlhandlers.py
==============================================================================
--- tracker/importer/sfxmlhandlers.py	(original)
+++ tracker/importer/sfxmlhandlers.py	Sat Feb  9 11:03:40 2008
@@ -104,7 +104,7 @@
         for i in range(len(alltds)):
             header = alltds[i].text or ""
             if -1 != header.find("Publicly Displayed Name:"):
-                realname = alltds[i+1].text
+                realname = alltds[i+1].text.strip()
                 break
 
         return self.create_user(username, realname)

Modified: tracker/importer/xmlexport2handlers.py
==============================================================================
--- tracker/importer/xmlexport2handlers.py	(original)
+++ tracker/importer/xmlexport2handlers.py	Sat Feb  9 11:03:40 2008
@@ -1,6 +1,5 @@
 import time, os,  urllib, socket, mimetools, stat, re
 
-from config import mappings
 import time
 
 import BeautifulSoup as BS
@@ -105,7 +104,7 @@
         for i in range(len(alltds)):
             header = alltds[i].text or ""
             if -1 != header.find("Publicly Displayed Name:"):
-                realname = alltds[i+1].text
+                realname = alltds[i+1].text.strip()
                 break
 
         return (username, realname, address)
@@ -239,7 +238,13 @@
         self.resolutions = resolutions
 
     def handle(self, item, roundupdata):
-        resolution = self.resolutions[item.find(self.source).text].lower()
+        resolution = item.find(self.source)
+        # Some trackers (e.g. Jython Feature Requests) have the resolution box
+        # turned off
+        if resolution is None:
+            roundupdata[self.target] = None
+            return
+        resolution = self.resolutions[resolution.text].lower()
         if "none" == resolution:
             roundupdata[self.target] = None
         else:

Modified: tracker/importer/xmlexport2toroundup.py
==============================================================================
--- tracker/importer/xmlexport2toroundup.py	(original)
+++ tracker/importer/xmlexport2toroundup.py	Sat Feb  9 11:03:40 2008
@@ -24,6 +24,7 @@
 import xmlexport2handlers as x2h
 
 from roundup import instance
+import config
 
 def handle_idmapping(tracker, name, itemname):
     print "Reading in '%s'" % name
@@ -128,9 +129,11 @@
     trackerhome = "/var/lib/roundup/trackers/python-dev"
     startat = 0
     update = False
+    mappings = "python"
 
     opts, args = getopt.getopt(sys.argv[1:], "", ["xmlfile=", "trackerhome=",
-                                                  "startat=", "update"])
+                                                  "startat=", "update",
+                                                  "mappings="])
     for opt, optarg in opts:
         if "--xmlfile" == opt:
             xmlfile = optarg
@@ -140,6 +143,10 @@
             startat = int(optarg)
         elif "--update" == opt:
             update = 1
+        elif "--mappings" == opt:
+            mappings = optarg
+
+    x2h.mappings = getattr(config, mappings)
 
     rounduptracker = instance.open(trackerhome)
     db = rounduptracker.open("admin")