bugzilla: Move version differences into the main class

crobinso · crobinso · commit 31a91c2b76b1 · 2016-05-23T16:59:03.000-04:00
They are minor at this point, so let's just handle them inline
diff --git a/bugzilla/base.py b/bugzilla/base.py
@@ -580,8 +580,11 @@ def logged_in(self):
     #############################################
 
     def _getbugfields(self):
-        raise RuntimeError("This bugzilla version does not support listing "
-            "bug fields.")
+        '''
+        Get the list of valid fields for Bug objects
+        '''
+        r = self._proxy.Bug.fields({'include_fields': ['name']})
+        return [f['name'] for f in r['fields']]
 
     def getbugfields(self, force_refresh=False):
         '''
@@ -993,7 +996,8 @@ def build_query(self,
                     savedsearch=None,
                     savedsearch_sharer_id=None,
                     sub_component=None,
-                    tags=None):
+                    tags=None,
+                    exclude_fields=None):
         """
         Build a query string from passed arguments. Will handle
         query parameter differences between various bugzilla versions.
@@ -1007,9 +1011,10 @@ def build_query(self,
 
         Then pass the output to Bugzilla.query()
         """
+        # These parameters are only used by RHBugzilla, which overwrites
+        # this implementation. So ignore them here
         ignore = emailtype
         ignore = booleantype
-        ignore = include_fields
 
         for key, val in [
             ('fixed_in', fixed_in),
@@ -1054,6 +1059,18 @@ def build_query(self,
             "tag": self._listify(tags),
         }
 
+        # 'include_fields' only available for Bugzilla4+
+        if self._check_version(4, 0):
+            include_fields = self._convert_include_field_list(include_fields)
+            if include_fields:
+                if 'id' not in include_fields:
+                    include_fields.append('id')
+                query["include_fields"] = include_fields
+
+            exclude_fields = self._convert_include_field_list(exclude_fields)
+            if exclude_fields:
+                query["exclude_fields"] = exclude_fields
+
         # Strip out None elements in the dict
         for k, v in query.copy().items():
             if v is None:
diff --git a/bugzilla/bugzilla3.py b/bugzilla/bugzilla3.py
@@ -27,8 +27,3 @@ class Bugzilla34(Bugzilla32):
 
 class Bugzilla36(Bugzilla34):
     bz_ver_minor = 6
-
-    def _getbugfields(self):
-        '''Get the list of valid fields for Bug objects'''
-        r = self._proxy.Bug.fields({'include_fields': ['name']})
-        return [f['name'] for f in r['fields']]
diff --git a/bugzilla/bugzilla4.py b/bugzilla/bugzilla4.py
@@ -16,29 +16,6 @@ class Bugzilla4(Bugzilla36):
     bz_ver_minor = 0
 
 
-    #################
-    # Query Methods #
-    #################
-
-    def build_query(self, **kwargs):
-        query = Bugzilla36.build_query(self, **kwargs)
-
-        # 'include_fields' only available for Bugzilla4+
-        include_fields = self._convert_include_field_list(
-            kwargs.pop('include_fields', None))
-        if include_fields:
-            if 'id' not in include_fields:
-                include_fields.append('id')
-            query["include_fields"] = include_fields
-
-        exclude_fields = self._convert_include_field_list(
-            kwargs.pop('exclude_fields', None))
-        if exclude_fields:
-            query["exclude_fields"] = exclude_fields
-
-        return query
-
-
 class Bugzilla42(Bugzilla4):
     bz_ver_minor = 2
 
diff --git a/tests/misc.py b/tests/misc.py
@@ -200,7 +200,3 @@ def testRHBZInit(self):
         bugzilla.RHBugzilla(None, cookiefile=None, multicall=True,
             rhbz_back_compat=True)
         bugzilla.log.setLevel(level)
-
-    def testUnimplementedAPI(self):
-        bz3 = bugzilla.Bugzilla3(None, cookiefile=None, tokenfile=None)
-        self.assertRaises(RuntimeError, bz3.getbugfields)
