bugzilla: Privatize getbug_extra_fields

crobinso · crobinso · commit 087a6c65e7bb · 2014-04-18T16:10:25.000-04:00
diff --git a/bugzilla/base.py b/bugzilla/base.py
@@ -829,8 +829,8 @@ def _find_comps():
     #
     # As of Dec 2012 it seems like only RH bugzilla actually has behavior
     # like this, for upstream bz it returns all info for every Bug.get()
-    getbug_extra_fields = []
-
+    _getbug_extra_fields = []
+    _supports_getbug_extra_fields = False
 
     def _getbugs(self, idlist, simple=False, permissive=True,
             extra_fields=None):
@@ -849,14 +849,15 @@ def _getbugs(self, idlist, simple=False, permissive=True,
                 # String aliases can be passed as well
                 idlist.append(i)
 
+        extra_fields = self._listify(extra_fields or [])
+        if not simple:
+            extra_fields += self._getbug_extra_fields
+
         getbugdata = {"ids": idlist}
         if permissive:
             getbugdata["permissive"] = 1
-        if self.getbug_extra_fields and not simple:
-            # This means bugzilla actually supports extra_fields
-            getbugdata["extra_fields"] = self.getbug_extra_fields
-            if extra_fields:
-                getbugdata["extra_fields"] += extra_fields
+        if self._supports_getbug_extra_fields:
+            getbugdata["extra_fields"] = extra_fields
 
         log.debug("Calling Bug.get_bugs with: %s", getbugdata)
         r = self._proxy.Bug.get_bugs(getbugdata)
diff --git a/bugzilla/rhbugzilla.py b/bugzilla/rhbugzilla.py
@@ -62,14 +62,12 @@ def _add_both_alias(newname, origname):
         # flags format isn't exactly the same but it's the closest approx
         self._add_field_alias('flags', 'flag_types')
 
-
-    getbug_extra_fields = (
-        _parent.getbug_extra_fields + [
+        self._getbug_extra_fields += [
             "comments", "description",
             "external_bugs", "flags", "sub_components",
             "tags",
         ]
-    )
+        self._supports_getbug_extra_fields = True
 
 
     ######################
