rev 3592 - in debbugs-illa: . bz

[Pierre Habouzit]

Author: madcoder
Date: 2006-04-18 17:17:52 +0000 (Tue, 18 Apr 2006)
New Revision: 3592

Modified:
   debbugs-illa/bz/__init__.py
   debbugs-illa/bzsync.py
Log:
strip down the last KDE reference in the scripts.

add bz.BzInterface.bugnumberFromUrl



Modified: debbugs-illa/bz/__init__.py
===================================================================
--- debbugs-illa/bz/__init__.py	2006-04-18 17:10:31 UTC (rev 3591)
+++ debbugs-illa/bz/__init__.py	2006-04-18 17:17:52 UTC (rev 3592)
@@ -30,16 +30,21 @@
 
 from report import Report as BzReport
 
-import commands
+import commands, re
 
 class BzInterface:
     def __init__(self, bzUrl):
         self.baseurl   = bzUrl.rstrip('/')
         self._wget_cmd = "wget -O - -o /dev/null %s/xml.cgi?id=%%s" % (self.baseurl)
+        self._bugurl   = re.compile(r"^%s/(?:show_bug.cgi\?id=)?([0-9]*)$" % (self.baseurl))
 
     def getReport(self, bugNum):
         return BzReport(bugNum, commands.getoutput(self._wget_cmd % (bugNum)))
 
+    def bugnumberFromUrl(self, url):
+        m = self._bugurl.match(url)
+        if m: return m.group(1)
+        else: return None
 
+
 __all__ = ['BzInterface', 'BzReport']
-

Modified: debbugs-illa/bzsync.py
===================================================================
--- debbugs-illa/bzsync.py	2006-04-18 17:10:31 UTC (rev 3591)
+++ debbugs-illa/bzsync.py	2006-04-18 17:17:52 UTC (rev 3592)
@@ -34,20 +34,17 @@
 
     mark debian bug #nnn be forwarded to %s/NNN
     also update usertag flags (bzStatus/bzRes atm).
-
 """
 
-import sys, re, os, email, smtplib
+import sys, os, email, smtplib
 from email.MIMEText import MIMEText
 
 import bz, bts
 from config import Config
 
-bugurl = re.compile(r"^http://bugs.kde.org/(?:show_bug.cgi\?id=)?([0-9]*)$")
-
 def usage(exitCode = 1):
     url = Config.Bugzilla.rstrip('/')
-    print >> sys.stderr, (__doc__ % (sys.argv[0].split('/')[-1]), url, url)
+    print >> sys.stderr, __doc__.lstrip() % (sys.argv[0].split('/')[-1], url, url)
     sys.exit(exitCode)
 
 def prepareMail(bug, rep, needsForwarded):
@@ -56,7 +53,7 @@
     body  = "user %s\n" % (Config.User)
     if needsForwarded:
         body += "forwarded %s %s/%s\n" % (bug, url, rep.bug)
-    
+
     tmp = rep.getStatus()
     if tmp is not None:
         body += "usertag %s + bzStatus-%s\n" % (rep.bug, tmp.lower())
@@ -69,15 +66,15 @@
 
     return body
 
+bzi = bz.BzInterface(Config.Bugzilla)
+
 if __name__ == "__main__":
     url = sys.argv[-1]
     fwd = True
 
-    m = bugurl.match(url)
-    if not m: usage(1)
+    bzBug = bzi.bugnumberFromUrl(url)
+    if bzBug is None: usage(1)
 
-    bzBug = m.group(1)
-
     if len(sys.argv) is 2:
         btsi = bts.BtsInterface(Config.Ldap)
         bug  = btsi.getReportOfBzBug(Config.Bugzilla, bzBug)
@@ -90,7 +87,6 @@
         bug = sys.argv[1]
     else: usage(1)
 
-    bzi = bz.BzInterface(Config.Bugzilla)
     rep = bzi.getReport(bzBug)
 
     msg = MIMEText(prepareMail(bug, rep, fwd))