rhbugzilla: Drop deprecated rhbz_back_compat, multicall

crobinso · crobinso · commit 78fd8311ef07 · 2016-05-23T17:32:19.000-04:00
rhbz_back_compat has thrown a warning for 2 years, I think we can
safely drop it
diff --git a/bugzilla/rhbugzilla.py b/bugzilla/rhbugzilla.py
@@ -33,25 +33,6 @@ class RHBugzilla(_parent):
     '''
 
     def __init__(self, *args, **kwargs):
-        """
-        @rhbz_back_compat: If True, convert parameters to the format they were
-            in prior RHBZ upgrade in June 2012. Mostly this replaces lists
-            with comma separated strings, and alters groups and flags.
-            Default is False. Please don't use this in new code, just update
-            your scripts.
-        @multicall: Unused nowadays, will be removed in the future
-        """
-        # 'multicall' is no longer used, just ignore it
-        multicall = kwargs.pop("multicall", None)
-        self.rhbz_back_compat = bool(kwargs.pop("rhbz_back_compat", False))
-
-        if multicall is not None:
-            log.warn("multicall is unused and will be removed in a "
-                "future release.")
-
-        if self.rhbz_back_compat:
-            log.warn("rhbz_back_compat will be removed in a future release.")
-
         _parent.__init__(self, *args, **kwargs)
 
         def _add_both_alias(newname, origname):
@@ -325,43 +306,6 @@ def post_translation(self, query, bug):
                     values += vallist
                 bug['sub_component'] = " ".join(values)
 
-        if not self.rhbz_back_compat:
-            return
-
-        if 'flags' in bug and isinstance(bug["flags"], list):
-            tmpstr = []
-            for tmp in bug['flags']:
-                tmpstr.append("%s%s" % (tmp['name'], tmp['status']))
-
-            bug['flags'] = ",".join(tmpstr)
-
-        if 'blocks' in bug and isinstance(bug["blocks"], list):
-            # Aliases will handle the 'blockedby' and 'blocked' back compat
-            bug['blocks'] = ','.join([str(b) for b in bug['blocks']])
-
-        if 'keywords' in bug and isinstance(bug["keywords"], list):
-            bug['keywords'] = ','.join(bug['keywords'])
-
-        if 'alias' in bug and isinstance(bug["alias"], list):
-            bug['alias'] = ','.join(bug['alias'])
-
-        if ('groups' in bug and
-            isinstance(bug["groups"], list) and
-            len(bug["groups"]) > 0 and
-            isinstance(bug["groups"][0], str)):
-            # groups went to the opposite direction: it got simpler
-            # instead of having name, ison, description, it's now just
-            # an array of strings of the groups the bug belongs to
-            # we're emulating the old behaviour here
-            tmp = []
-            for g in bug['groups']:
-                t = {}
-                t['name'] = g
-                t['description'] = g
-                t['ison'] = 1
-                tmp.append(t)
-            bug['groups'] = tmp
-
     def build_external_tracker_boolean_query(
             self, ext_type_description=None, ext_type_url=None,
             ext_bz_bug_id=None, ext_status=None):
diff --git a/tests/misc.py b/tests/misc.py
@@ -178,25 +178,5 @@ def _testPostCompare(bz, indict, outexpect):
         out_simple["versions"] = out_simple["version"]
         out_simple["version"] = out_simple["versions"][0]
 
-        out_complex = out_simple.copy()
-        out_complex["keywords"] = ",".join(out_complex["keywords"])
-        out_complex["blocks"] = ",".join([str(b) for b in
-                                          out_complex["blocks"]])
-        out_complex["alias"] = ",".join(out_complex["alias"])
-        out_complex["groups"] = [{'description': 'redhat',
-                                  'ison': 1, 'name': 'redhat'}]
-        out_complex["flags"] = "qe_test_coverage?,rhel-6.4.0+"
-
         _testPostCompare(bug3, test1, test1)
         _testPostCompare(rhbz, test1, out_simple)
-
-        rhbz.rhbz_back_compat = True
-        _testPostCompare(rhbz, test1, out_complex)
-
-    def testRHBZInit(self):
-        # Just get us coverage when the extra values are specified
-        level = bugzilla.log.level
-        bugzilla.log.setLevel(logging.ERROR)
-        bugzilla.RHBugzilla(None, cookiefile=None, multicall=True,
-            rhbz_back_compat=True)
-        bugzilla.log.setLevel(level)
diff --git a/tests/query.py b/tests/query.py
@@ -310,7 +310,3 @@ def testStandardQuery(self):
             'order': 'bug_status,bug_id'
         }
         self._check(url, query)
-
-    def testBZAutoMagic(self):
-        bz = bugzilla.Bugzilla("bugzilla.redhat.com")
-        self.assertTrue(hasattr(bz, "rhbz_back_compat"))

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,3 @@ def testStandardQuery(self):`
`310`	`310`	`'order': 'bug_status,bug_id'`
`311`	`311`	`}`
`312`	`312`	`self._check(url, query)`
`313`		`-`
`314`		`- def testBZAutoMagic(self):`
`315`		`- bz = bugzilla.Bugzilla("bugzilla.redhat.com")`
`316`		`- self.assertTrue(hasattr(bz, "rhbz_back_compat"))`