Fix running pylint on bin/bugzilla

crobinso · crobinso · commit c9b2b06ec0bc · 2013-08-15T13:13:15.000-04:00
pylint seems to get confused by being pointed at a script named
'bugzilla' and a library named 'bugzilla'. Add a top level bugzilla-cli
link which fixes the namespace issues. Clean up the fall out.
diff --git a/bin/bugzilla b/bin/bugzilla
@@ -407,6 +407,9 @@ def generate_man_page():
 
     today = datetime.date.today()
     datestr = today.strftime("%B %d, %Y")
+
+    # pylint: disable=W1401
+    # Anomalous backslash in string, man format confuses pylint
     manpage = \
 '''.TH bugzilla 1  "%s" "version %s" "User Commands"
 .SH NAME
@@ -689,7 +692,7 @@ def _convert_to_outputformat(output):
         fmt += "[%{target_milestone}] %{flags} %{cve}"
 
     else:
-        raise RuntimeError("Unknown output type '%s'" % opt.output)
+        raise RuntimeError("Unknown output type '%s'" % output)
 
     return fmt
 
diff --git a/bugzilla-cli b/bugzilla-cli
@@ -0,0 +1 @@
+bin/bugzilla
diff --git a/bugzilla/__init__.py b/bugzilla/__init__.py
@@ -18,6 +18,7 @@
 log = logging.getLogger("bugzilla")
 
 
+from bugzilla.base import BugzillaBase as _BugzillaBase
 from bugzilla.base import BugzillaError
 from bugzilla.bugzilla3 import Bugzilla3, Bugzilla32, Bugzilla34, Bugzilla36
 from bugzilla.bugzilla4 import Bugzilla4, Bugzilla42, Bugzilla44
@@ -88,29 +89,33 @@ def getBugzillaClassForURL(url):
     return c
 
 
-class Bugzilla(object):
+class Bugzilla(_BugzillaBase):
     '''
     Magical Bugzilla class that figures out which Bugzilla implementation
     to use and uses that. Requires 'url' parameter so we can check available
     XMLRPC methods to determine the Bugzilla version.
     '''
+    # pylint: disable=W0231
+    # __init__ method of base class not called
+
     def __init__(self, **kwargs):
         log.info("Bugzilla v%s initializing" % __version__)
         if 'url' not in kwargs:
             raise TypeError("You must pass a valid bugzilla URL")
 
         # pylint: disable=W0233
         # Use of __init__ of non parent class
+        # We base of _BugzillaBase to help pylint figure things out
 
         c = getBugzillaClassForURL(kwargs['url'])
         if not c:
             raise ValueError("Couldn't determine Bugzilla version for %s" %
                              kwargs['url'])
 
-        if c:
-            self.__class__ = c
-            c.__init__(self, **kwargs)
-            log.info("Chose subclass %s v%s" % (c.__name__, c.version))
+        self.__class__ = c
+        c.__init__(self, **kwargs)
+        log.info("Chose subclass %s v%s" % (c.__name__, c.version))
+
 
 # This is the list of possible Bugzilla instances an app can use,
 # bin/bugzilla uses it for the --bztype field
diff --git a/setup.py b/setup.py
@@ -148,10 +148,10 @@ def run(self):
             # W0212: Access to a protected member of a client class
             "--disable W0212 "
 
-            "bugzilla/ bin/bugzilla tests/*.py ")
+            "bugzilla/ bugzilla-cli tests/*.py ")
 
         os.system("pep8 --format=pylint "
-            "bugzilla/ bin/bugzilla tests/ "
+            "bugzilla/ bugzilla-cli tests/ "
             # E303: Too many blank lines
             # E125: Continuation indent isn't different from next block
             # E128: Not indented for visual style
