bin: Deprecate the --bztype field

crobinso · crobinso · commit bbf9451409d3 · 2015-11-19T16:21:58.000-05:00
It's been hidden for a while, stop abiding it and just always autodetect
diff --git a/bin/bugzilla b/bin/bugzilla
@@ -1156,30 +1156,24 @@ def _do_set_attach(bz, opt, parser, args):
 # Main handling #
 #################
 
-def _make_bz_instance(global_opt, parser):
+def _make_bz_instance(global_opt):
     """
     Build the Bugzilla instance we will use
     """
-    if global_opt.bztype == 'auto':
-        log.info('Autodetecting Bugzilla type')
-        bzclass = bugzilla.Bugzilla
-    elif global_opt.bztype in bugzilla.classlist:
-        log.info('Using Bugzilla class %s', global_opt.bztype)
-        bzclass = getattr(bugzilla, global_opt.bztype)
-    else:
-        parser.error("bztype must be one of: %s" % str(bugzilla.classlist))
+    if global_opt.bztype != 'auto':
+        log.info("Explicit --bztype is no longer supported, ignoring")
 
+    cookiefile = None
+    tokenfile = None
     if global_opt.cache_credentials:
         cookiefile = global_opt.cookiefile or -1
         tokenfile = global_opt.tokenfile or -1
-    else:
-        cookiefile = None
-        tokenfile = None
 
-    bz = bzclass(url=global_opt.bugzilla,
-                 cookiefile=cookiefile,
-                 tokenfile=tokenfile,
-                 sslverify=global_opt.sslverify)
+    bz = bugzilla.Bugzilla(
+        url=global_opt.bugzilla,
+        cookiefile=cookiefile,
+        tokenfile=tokenfile,
+        sslverify=global_opt.sslverify)
     return bz
 
 
diff --git a/bugzilla/__init__.py b/bugzilla/__init__.py
@@ -116,7 +116,7 @@ def _init_class_from_url(self, url, sslverify):
 
 
 # This is the list of possible Bugzilla instances an app can use,
-# bin/bugzilla uses it for the --bztype field
+# bin/bugzilla used to use it for the --bztype field
 classlist = [
     "Bugzilla3", "Bugzilla32", "Bugzilla34", "Bugzilla36",
     "Bugzilla4", "Bugzilla42", "Bugzilla44",
