From ba56301f7ddbf752be6fe8900a8d1780a16b8010 Mon Sep 17 00:00:00 2001
From: Dennis Kaarsemaker <dennis@ubuntu-nl.org>
Date: Mon, 26 Jun 2006 22:35:16 +0200
Subject: [PATCH] Remove spurious prints, fix importance handling for launchpad
 bugs

---
 Bantracker/plugin.py |  3 ---
 Bugtracker/plugin.py | 11 +++++------
 Mess/plugin.py       |  2 --
 Webcal/plugin.py     |  1 -
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py
index 631ad5d..e50117c 100644
--- a/Bantracker/plugin.py
+++ b/Bantracker/plugin.py
@@ -73,7 +73,6 @@ class Bantracker(callbacks.Plugin):
         self.logs[channel] = self.logs[channel][-199:] + [s.strip()]
         
     def doKickban(self, irc, channel, nick, target, kickmsg = None):
-        print "DoKickban: %s - %s - %s - %s" % (channel, nick, target, kickmsg)
         if not self.registryValue('enabled', channel):
             return
         n = now()
@@ -83,7 +82,6 @@ class Bantracker(callbacks.Plugin):
             db_run("INSERT INTO comments (ban_id, who, comment, time) values(%s,%s,%s,%s)", (id, nick, kickmsg, n))
 
     def doUnban(self, irc, channel, nick, mask):
-        print "DoUnban: %s - %s - %s" % (channel, nick, mask)
         if not self.registryValue('enabled', channel):
             return
         data = db_run("SELECT MAX(id) FROM bans where channel=%s and mask=%s", (channel, mask), expect_result=True)
@@ -150,7 +148,6 @@ class Bantracker(callbacks.Plugin):
             if 'b' in msg.args[1] or 'd' in msg.args[1]:
                 i = 2
                 plusmin = False
-                print msg.args
                 for c in msg.args[1]:
                     if   c == '-': plusmin = False
                     elif c == '+': plusmin = True
diff --git a/Bugtracker/plugin.py b/Bugtracker/plugin.py
index 5f965d9..2e390db 100644
--- a/Bugtracker/plugin.py
+++ b/Bugtracker/plugin.py
@@ -169,7 +169,6 @@ class Bugtracker(callbacks.PluginRegexp):
         sure_bug = match.group('bt').endswith('bug') or match.group('bt').endswith('bug')
         # FIXME dig into supybot docs/code
         #if conf.supybot.reply.whenAddressedBy.strings:
-        #    print type(conf.supybot.reply.whenAddressedBy.strings)
         #    for p in conf.supybot.reply.whenAddressedBy.strings:
         #        if s.startswith(str(p)):
         #            return
@@ -371,17 +370,17 @@ class Malone(IBugtracker):
         # Status sort: 
         try:
             statuses   = ['Rejected', 'Fix Committed', 'Fix Released', 'Confirmed', 'In Progress', 'Needs Info', 'Unconfirmed']
-            severities = ['Wishlist', 'Minor', 'Normal', 'Major', 'Critical']
+            severities = ['Untriaged', 'Wishlist', 'Minor', 'Low', 'Normal', 'Medium', 'Major', 'High', 'Critical']
             if task1['status'] not in statuses and task2['status'] in statuses: return 1
             if task1['status'] in statuses and task2['status'] not in statuses: return -1
-            if task1['severity'] not in severities and task2['severity'] in severities: return 1
-            if task1['severity'] in severities and task2['severity'] not in severities: return -1
+            if task1['importance'] not in severities and task2['importance'] in severities: return 1
+            if task1['importance'] in severities and task2['importance'] not in severities: return -1
             if not (task1['status'] == task2['status']):
                 if statuses.index(task1['status']) < statuses.index(task2['status']):
                     return -1
                 return 1
-            if not (task1['severity'] == task2['severity']):
-                if severities.index(task1['severity']) < severities.index(task2['severity']):
+            if not (task1['importance'] == task2['importance']):
+                if severities.index(task1['importance']) < severities.index(task2['importance']):
                     return -1
                 return 1
         except: # Launchpad changed again?
diff --git a/Mess/plugin.py b/Mess/plugin.py
index 5564db5..05b0802 100644
--- a/Mess/plugin.py
+++ b/Mess/plugin.py
@@ -33,8 +33,6 @@ class Mess(callbacks.PluginRegexp):
         if not count: count = 1 
         if count > 5: count = 5
         t = u' '.join([x.__call__([u"\u2680",u"\u2681",u"\u2682",u"\u2683",u"\u2684",u"\u2685"]) for x in [random.choice]*count])
-        print t
-        #print str(t)
         irc.reply(t)
     dice = wrap(dice, [additional('int')])
 
diff --git a/Webcal/plugin.py b/Webcal/plugin.py
index d08fd4a..08cacfb 100644
--- a/Webcal/plugin.py
+++ b/Webcal/plugin.py
@@ -195,7 +195,6 @@ class Webcal(callbacks.Plugin):
                     return
             #c = "#ubuntu-meeting"
             url = self.registryValue('url', c)
-            print c, url
             if not url:
                 meeting = ''
             else: