Bugzilla: drop some bugzilla < 4.0 handling

crobinso · crobinso · commit 33c970e628d4 · 2020-01-11T19:26:08.000-05:00
The last release of the bugzilla 3 series was Feb 2013.
bugzilla 4 was first released Feb 2011.
I don't know of any bugzilla 3 instances still in the wild.

Drop the old version checks.

Signed-off-by: Cole Robinson &lt;crobinso@redhat.com&gt;
diff --git a/bugzilla/_cli.py b/bugzilla/_cli.py
@@ -548,7 +548,7 @@ def _do_query(bz, opt, parser):
     built_query.update(q)
     q = built_query
 
-    if not q:
+    if not q:  # pragma: no cover
         parser.error("'query' command requires additional arguments")
     return bz.query(q)
 
diff --git a/bugzilla/base.py b/bugzilla/base.py
@@ -978,15 +978,14 @@ def _convert_fields(_in):
             return _in
 
         ret = {}
-        if self._check_version(4, 0):
-            if include_fields:
-                include_fields = _convert_fields(include_fields)
-                if "id" not in include_fields:
-                    include_fields.append("id")
-                ret["include_fields"] = include_fields
-            if exclude_fields:
-                exclude_fields = _convert_fields(exclude_fields)
-                ret["exclude_fields"] = exclude_fields
+        if include_fields:
+            include_fields = _convert_fields(include_fields)
+            if "id" not in include_fields:
+                include_fields.append("id")
+            ret["include_fields"] = include_fields
+        if exclude_fields:
+            exclude_fields = _convert_fields(exclude_fields)
+            ret["exclude_fields"] = exclude_fields
         if self._supports_getbug_extra_fields():
             if extra_fields:
                 ret["extra_fields"] = _convert_fields(extra_fields)
@@ -1057,11 +1056,7 @@ def _getbugs(self, idlist, permissive,
 
         r = self._backend.bug_get(getbugdata)
 
-        if self._check_version(4, 0):
-            bugdict = dict([(b['id'], b) for b in r['bugs']])
-        else:  # pragma: no cover
-            bugdict = dict([(b['id'], b['internals']) for b in r['bugs']])
-
+        bugdict = dict([(b['id'], b) for b in r['bugs']])
         ret = []
         for i in idlist:
             found = None
diff --git a/tests/test_cli_query.py b/tests/test_cli_query.py
@@ -14,13 +14,8 @@
 #################################
 
 def test_query(run_cli):
-    # query that ends up empty
-    cmd = "bugzilla query --ids "
-    fakebz = tests.mockbackend.make_bz(version="3.0.0")
-    out = run_cli(cmd, fakebz, expectfail=True)
-    assert "requires additional arguments" in out
-
     # bad field option
+    fakebz = tests.mockbackend.make_bz()
     cmd = "bugzilla query --field FOO"
     out = run_cli(cmd, fakebz, expectfail=True)
     assert "Invalid field argument" in out
