Changes from these upstream commits: * Fix typo in default imports, Björn Wingman * rhbugzilla: Fix passing in multicall argument, Cole Robinson * When logging Bug() info, sort the keys for easy reading, Cole Robinson diff --git a/bugzilla/__init__.py b/bugzilla/__init__.py index 941ea21..1c9f3f5 100644 --- a/bugzilla/__init__.py +++ b/bugzilla/__init__.py @@ -9,7 +9,7 @@ # option) any later version. See http://www.gnu.org/copyleft/gpl.html for # the full text of the license. -from bugzilla3 import Bugzilla3, Bugzilla32, Bugzilla34, Bugzilla3 +from bugzilla3 import Bugzilla3, Bugzilla32, Bugzilla34, Bugzilla36 from bugzilla4 import Bugzilla4 from rhbugzilla import RHBugzilla, RHBugzilla3, RHBugzilla4 from nvlbugzilla import NovellBugzilla diff --git a/bugzilla/base.py b/bugzilla/base.py index 7748e2b..fc9e692 100644 --- a/bugzilla/base.py +++ b/bugzilla/base.py @@ -1173,7 +1173,7 @@ class _Bug(object): self.bugzilla = bugzilla self.autorefresh = True if 'dict' in kwargs and kwargs['dict']: - log.debug("Bug(%s)" % kwargs['dict'].keys()) + log.debug("Bug(%s)" % sorted(kwargs['dict'].keys())) self.__dict__.update(kwargs['dict']) if 'bug_id' in kwargs: log.debug("Bug(%i)" % kwargs['bug_id']) diff --git a/bugzilla/rhbugzilla.py b/bugzilla/rhbugzilla.py index 4233d32..b3ec9de 100644 --- a/bugzilla/rhbugzilla.py +++ b/bugzilla/rhbugzilla.py @@ -42,9 +42,12 @@ class RHBugzilla(Bugzilla4): user_agent = bugzilla.base.user_agent + ' RHBugzilla4/%s' % version def __init__(self, **kwargs): + self.multicall = True + if "multicall" in kwargs: + self.multicall = kwargs.pop("multicall") + Bugzilla4.__init__(self, **kwargs) self.user_agent = self.__class__.user_agent - self.multicall = kwargs.get('multicall',True) #---- Methods and properties with basic bugzilla info