summaryrefslogtreecommitdiffstats
path: root/bugzilla
diff options
context:
space:
mode:
authorWill Woods <wwoods@redhat.com>2008-06-10 14:54:15 -0400
committerWill Woods <wwoods@redhat.com>2008-06-10 14:54:15 -0400
commit68299ba63acc14fc38f2dc2c7fd1373c0aff1119 (patch)
tree60004e19b4962c128dfe001fb91371bded023f87 /bugzilla
parent4782cbf51cdf89faa977ccace668f75e97e21e6d (diff)
downloadpython-bugzilla-68299ba63acc14fc38f2dc2c7fd1373c0aff1119.zip
python-bugzilla-68299ba63acc14fc38f2dc2c7fd1373c0aff1119.tar.gz
python-bugzilla-68299ba63acc14fc38f2dc2c7fd1373c0aff1119.tar.xz
Explicitly mark methods unsupported by bugzilla3.0. Change the format of the .product attribute to be more like Bugzilla 3.x.
Diffstat (limited to 'bugzilla')
-rw-r--r--bugzilla/base.py19
-rw-r--r--bugzilla/bugzilla3.py33
-rw-r--r--bugzilla/rhbugzilla.py16
3 files changed, 48 insertions, 20 deletions
diff --git a/bugzilla/base.py b/bugzilla/base.py
index 1be4224..554d89f 100644
--- a/bugzilla/base.py
+++ b/bugzilla/base.py
@@ -273,7 +273,13 @@ class BugzillaBase(object):
fdel=lambda self: setattr(self,"_querydefaults",None))
def getproducts(self,force_refresh=False):
- '''Return a dict of product names and product descriptions.'''
+ '''Get product data: names, descriptions, etc.
+ The data varies between Bugzilla versions but the basic format is a
+ list of dicts, where the dicts will have at least the following keys:
+ {'id':1,'name':"Some Product",'description':"This is a product"}
+
+ Any method that requires a 'product' can be given either the
+ id or the name.'''
if force_refresh or not self._products:
self._products = self._getproducts()
return self._products
@@ -281,6 +287,17 @@ class BugzillaBase(object):
# call and return it for each subsequent call.
products = property(fget=lambda self: self.getproducts(),
fdel=lambda self: setattr(self,'_products',None))
+ def _product_id_to_name(self,productid):
+ '''Convert a product ID (int) to a product name (str).'''
+ # This will auto-create the 'products' list
+ for p in self.products:
+ if p['id'] == productid:
+ return p['name']
+ def _product_name_to_id(self,product):
+ '''Convert a product name (str) to a product ID (int).'''
+ for p in self.products:
+ if p['name'] == product:
+ return p['id']
def getcomponents(self,product,force_refresh=False):
'''Return a dict of components:descriptions for the given product.'''
diff --git a/bugzilla/bugzilla3.py b/bugzilla/bugzilla3.py
index 5877a4d..d5b1e9b 100644
--- a/bugzilla/bugzilla3.py
+++ b/bugzilla/bugzilla3.py
@@ -42,19 +42,18 @@ class Bugzilla3(bugzilla.base.BugzillaBase):
keylist.append('assigned_to')
return keylist
def _getqueryinfo(self):
- raise NotImplementedError
+ raise NotImplementedError, "Bugzilla 3.0 does not support this method."
def _getproducts(self):
'''This throws away a bunch of data that RH's getProdInfo
didn't return. Ah, abstraction.'''
product_ids = self._proxy.Product.get_accessible_products()
r = self._proxy.Product.get_products(product_ids)
- pdict = {}
- for p in r['products']:
- pdict[p['name']] = p['description']
- return pdict
-
+ return r['products']
def _getcomponents(self,product):
- raise NotImplementedError
+ if type(product) == str:
+ product = self._product_name_to_id(product)
+ r = self._proxy.Bug.legal_values({'product_id':product,'field':'component'})
+ return r['values']
def _getcomponentsdetails(self,product):
raise NotImplementedError
@@ -102,7 +101,7 @@ class Bugzilla3(bugzilla.base.BugzillaBase):
bz_gid: if present, and the entire bug is *not* already private
to this group ID, this comment will be marked private.
'''
- raise NotImplementedError
+ raise NotImplementedError, "Bugzilla 3.0 does not support this method."
def _setstatus(self,id,status,comment='',private=False,private_in_it=False,nomail=False):
'''Set the status of the bug with the given ID. You may optionally
include a comment to be added, and may further choose to mark that
@@ -112,7 +111,7 @@ class Bugzilla3(bugzilla.base.BugzillaBase):
Less common: 'VERIFIED','ON_DEV','ON_QA','REOPENED'
'CLOSED' is not valid with this method; use closebug() instead.
'''
- raise NotImplementedError
+ raise NotImplementedError, "Bugzilla 3.0 does not support this method."
def _closebug(self,id,resolution,dupeid,fixedin,comment,isprivate,private_in_it,nomail):
'''Raw xmlrpc call for closing bugs. Documentation from Bug.pm is
below. Note that we drop the username and password fields because the
@@ -150,18 +149,18 @@ class Bugzilla3(bugzilla.base.BugzillaBase):
$nomail
# OPTIONAL Flag that is either 1 or 0 if you want email to be sent or not for this change
'''
- raise NotImplementedError
+ raise NotImplementedError, "Bugzilla 3.0 does not support this method."
def _setassignee(self,id,**data):
'''Raw xmlrpc call to set one of the assignee fields on a bug.
changeAssignment($id, $data, $username, $password)
data: 'assigned_to','reporter','qa_contact','comment'
returns: [$id, $mailresults]'''
- raise NotImplementedError
+ raise NotImplementedError, "Bugzilla 3.0 does not support this method."
def _updatedeps(self,id,deplist):
'''IMPLEMENT ME: update the deps (blocked/dependson) for the given bug.
updateDepends($bug_id,$data,$username,$password,$nodependencyemail)
#data: 'blocked'=>id,'dependson'=>id,'action' => ('add','remove')'''
- raise NotImplementedError
+ raise NotImplementedError, "Bugzilla 3.0 does not support this method."
def _updatecc(self,id,cclist,action,comment='',nomail=False):
'''Updates the CC list using the action and account list specified.
cclist must be a list (not a tuple!) of addresses.
@@ -169,15 +168,13 @@ class Bugzilla3(bugzilla.base.BugzillaBase):
comment specifies an optional comment to add to the bug.
if mail is True, email will be generated for this change.
'''
- data = {'id':id, 'action':action, 'cc':','.join(cclist),
- 'comment':comment, 'nomail':nomail}
- raise NotImplementedError
+ raise NotImplementedError, "Bugzilla 3.0 does not support this method."
def _updatewhiteboard(self,id,text,which,action):
'''Update the whiteboard given by 'which' for the given bug.
performs the given action (which may be 'append',' prepend', or
'overwrite') using the given text.'''
data = {'type':which,'text':text,'action':action}
- raise NotImplementedError
+ raise NotImplementedError, "Bugzilla 3.0 does not support this method."
# TODO: update this when the XMLRPC interface grows requestee support
def _updateflags(self,id,flags):
'''Updates the flags associated with a bug report.
@@ -187,7 +184,7 @@ class Bugzilla3(bugzilla.base.BugzillaBase):
NOTE: the Red Hat XMLRPC interface does not yet support setting the
requestee (as in: needinfo from smartguy@answers.com). Alas.'''
- raise NotImplementedError
+ raise NotImplementedError, "Bugzilla 3.0 does not support this method."
#---- Methods for working with attachments
@@ -197,7 +194,7 @@ class Bugzilla3(bugzilla.base.BugzillaBase):
# want to override _attachment_uri here.
def _attachfile(self,id,**attachdata):
- raise NotImplementedError
+ raise NotImplementedError, "Bugzilla 3.0 does not support this method."
#---- createbug - call to create a new bug
diff --git a/bugzilla/rhbugzilla.py b/bugzilla/rhbugzilla.py
index c5964e2..a069a2b 100644
--- a/bugzilla/rhbugzilla.py
+++ b/bugzilla/rhbugzilla.py
@@ -33,10 +33,24 @@ class RHBugzilla(bugzilla.base.BugzillaBase):
def _getqueryinfo(self):
return self._proxy.bugzilla.getQueryInfo()
def _getproducts(self):
- return self._proxy.bugzilla.getProdInfo()
+ '''Backend _getproducts method for RH Bugzilla. This predates the
+ Bugzilla3 Products stuff, so we need to massage this data to make it
+ fit the proper format'''
+ r = self._proxy.bugzilla.getProdInfo()
+ n = 0
+ prod = []
+ for name,desc in r.iteritems():
+ # We're making up a fake id, since RHBugzilla doesn't use them
+ prod.append({'id':n,'name':name,'description':desc})
+ n += 1
+ return prod
def _getcomponents(self,product):
+ if type(product) == int:
+ product = self._product_id_to_name(product)
return self._proxy.bugzilla.getProdCompInfo(product)
def _getcomponentsdetails(self,product):
+ if type(product) == int:
+ product = self._product_id_to_name(product)
return self._proxy.bugzilla.getProdCompDetails(product)
#---- Methods for reading bugs and bug info