bugzilla: move the last rhbz specific query bits to Bugzilla

crobinso · crobinso · commit aa8aafe27468 · 2016-05-25T15:23:52.000-04:00
So we can break the pattern of adding custom bits in subclasses. We
shouldn't add site specific extensions to the API anymore, but we
let's keep these old values around for compat at least
diff --git a/bugzilla/base.py b/bugzilla/base.py
@@ -1036,7 +1036,8 @@ def build_query(self,
                     savedsearch_sharer_id=None,
                     sub_component=None,
                     tags=None,
-                    exclude_fields=None):
+                    exclude_fields=None,
+                    extra_fields=None):
         """
         Build a query string from passed arguments. Will handle
         query parameter differences between various bugzilla versions.
@@ -1116,13 +1117,16 @@ def add_email(key, value, count):
             query["longdesc_type"] = "allwordssubstr"
 
         # 'include_fields' only available for Bugzilla4+
+        # 'extra_fields' is an RHBZ extension
         query.update(self._process_include_fields(
-            include_fields, exclude_fields, None))
+            include_fields, exclude_fields, extra_fields))
 
         # Strip out None elements in the dict
         for k, v in query.copy().items():
             if v is None:
                 del(query[k])
+
+        self.pre_translation(query)
         return query
 
     def query(self, query):
diff --git a/bugzilla/rhbugzilla.py b/bugzilla/rhbugzilla.py
@@ -339,11 +339,4 @@ def _warn_bool(kwkey):
         _warn_bool("devel_whiteboard")
         _warn_bool("alias")
 
-        query = {}
-        query.update(self._process_include_fields(None, None,
-            kwargs.pop('extra_fields', None)))
-
-        newquery = Bugzilla.build_query(self, **kwargs)
-        query.update(newquery)
-        self.pre_translation(query)
-        return query
+        return Bugzilla.build_query(self, **kwargs)
