Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-27 13:19:24 +01:00
Code Issues Projects Releases Wiki Activity

Fix bug #945522

Browse Source
This commit is contained in:
James Vega 2004-05-01 19:53:28 +00:00
parent 3672f72b96
commit 336fabe61f
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
plugins/Bugzilla.py
View File

@ -40,9 +40,7 @@ import os
import re import re
import csv import csv
import getopt import getopt
import string
import urllib import urllib
import urllib2
import xml.dom.minidom as minidom import xml.dom.minidom as minidom
from itertools import imap, ifilter from itertools import imap, ifilter
@ -55,6 +53,7 @@ import utils
import plugins import plugins
import ircutils import ircutils
import privmsgs import privmsgs
import webutils
import callbacks import callbacks
import structures import structures
@ -230,18 +229,26 @@ class Bugzilla(callbacks.PrivmsgCommandAndRegexp):
"""Given a URL and query list for a CSV bug list, it'll return """Given a URL and query list for a CSV bug list, it'll return
all the bugs in a dict all the bugs in a dict
""" """
u = urllib2.urlopen(url + '/buglist.cgi', string.join(query, '&')) bugs = {}
try:
url = '%s/buglist.cgi?%s' % (url, '&'.join(query))
u = webutils.getUrlFd(url)
except webutils.WebError, e:
return bugs
# actually read in the file # actually read in the file
csvreader = csv.reader(u) csvreader = csv.reader(u)
# read header # read header
fields = csvreader.next() fields = csvreader.next()
# read the rest of the list # read the rest of the list
bugs = {}
for bug in csvreader: for bug in csvreader:
try: if isinstance(bug, basestring):
bugid = int(bug[0]) bugid = bug
except ValueError: else:
bugid = bug[0] bugid = bug[0]
try:
bugid = int(bugid)
except ValueError:
pass
bugs[bugid] = {} bugs[bugid] = {}
i = 1 i = 1
for f in fields[1:]: for f in fields[1:]:
@ -278,6 +285,9 @@ class Bugzilla(callbacks.PrivmsgCommandAndRegexp):
bugs = self.urlquery2bugslist(url, query) bugs = self.urlquery2bugslist(url, query)
bugids = bugs.keys() bugids = bugs.keys()
bugids.sort() bugids.sort()
if not bugs:
irc.error('I could not find any bugs.')
return
s = '%s match %r (%s): %s.' % \ s = '%s match %r (%s): %s.' % \
(utils.nItems('bug', len(bugs)), searchstr, (utils.nItems('bug', len(bugs)), searchstr,
' AND '.join(keywords), utils.commaAndify(map(str, bugids))) ' AND '.join(keywords), utils.commaAndify(map(str, bugids)))
@ -373,11 +383,9 @@ class Bugzilla(callbacks.PrivmsgCommandAndRegexp):
def _getbugxml(self, url, desc): def _getbugxml(self, url, desc):
try: try:
fh = urllib2.urlopen(url) bugxml = webutils.getUrl(url)
except urllib2.HTTPError, e: except webutils.WebError, e:
raise IOError, 'Connection to %s bugzilla failed' % desc raise IOError, 'Connection to %s bugzilla failed' % desc
bugxml = fh.read()
fh.close()
if not bugxml: if not bugxml:
raise IOError, 'Error getting bug content from %s' % desc raise IOError, 'Error getting bug content from %s' % desc
return bugxml return bugxml