Fix new pylint on f20

crobinso · crobinso · commit 3e0dc4a556d2 · 2013-10-28T13:39:14.000-04:00
diff --git a/bin/bugzilla b/bin/bugzilla
@@ -1053,7 +1053,7 @@ def main(bzinstance=None):
         log.info('Autodetecting Bugzilla type')
         bzclass = bugzilla.Bugzilla
     elif global_opt.bztype in bugzilla.classlist:
-        log.info('Using Bugzilla class %s' % global_opt.bztype)
+        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))
diff --git a/bugzilla/__init__.py b/bugzilla/__init__.py
@@ -32,7 +32,7 @@ class NovellBugzilla(Bugzilla34):
 
 def getBugzillaClassForURL(url):
     url = Bugzilla3.fix_url(url)
-    log.debug("Detecting subclass for %s" % url)
+    log.debug("Detecting subclass for %s", url)
     s = xmlrpclib.ServerProxy(url)
     rhbz = False
     bzversion = ''
@@ -53,7 +53,7 @@ def getBugzillaClassForURL(url):
             rhbz = True
     except xmlrpclib.Fault:
         pass
-    log.debug("rhbz=%s" % str(rhbz))
+    log.debug("rhbz=%s", str(rhbz))
 
     # Try to get the bugzilla version string
     try:
@@ -62,7 +62,7 @@ def getBugzillaClassForURL(url):
         bzversion = r['version']
     except xmlrpclib.Fault:
         pass
-    log.debug("bzversion='%s'" % str(bzversion))
+    log.debug("bzversion='%s'", str(bzversion))
 
     # note preference order: RHBugzilla* wins if available
     if rhbz:
@@ -73,7 +73,7 @@ def getBugzillaClassForURL(url):
         elif bzversion.startswith("4.2"):
             c = Bugzilla42
         else:
-            log.debug("No explicit match for %s, using latest bz4" % bzversion)
+            log.debug("No explicit match for %s, using latest bz4", bzversion)
             c = Bugzilla44
     else:
         if bzversion.startswith('3.6'):
@@ -99,7 +99,7 @@ class Bugzilla(_BugzillaBase):
     # __init__ method of base class not called
 
     def __init__(self, **kwargs):
-        log.info("Bugzilla v%s initializing" % __version__)
+        log.info("Bugzilla v%s initializing", __version__)
         if 'url' not in kwargs:
             raise TypeError("You must pass a valid bugzilla URL")
 
@@ -114,7 +114,7 @@ def __init__(self, **kwargs):
 
         self.__class__ = c
         c.__init__(self, **kwargs)
-        log.info("Chose subclass %s v%s" % (c.__name__, c.version))
+        log.info("Chose subclass %s v%s", c.__name__, c.version)
 
 
 # This is the list of possible Bugzilla instances an app can use,
diff --git a/bugzilla/base.py b/bugzilla/base.py
@@ -447,13 +447,13 @@ def readconfig(self, configpath=None):
         for s in sorted(c.sections(),
                         lambda a, b: cmp(len(a), len(b)) or cmp(a, b)):
             if s in self.url:
-                log.debug("Found matching section: %s" % s)
+                log.debug("Found matching section: %s", s)
                 section = s
         if not section:
             return
         for k, v in c.items(section):
             if k in ('user', 'password'):
-                log.debug("Setting '%s' from configfile" % k)
+                log.debug("Setting '%s' from configfile", k)
                 setattr(self, k, v)
 
     def connect(self, url=None):
diff --git a/bugzilla/bug.py b/bugzilla/bug.py
@@ -27,11 +27,11 @@ def __init__(self, bugzilla, **kwargs):
         self.bugzilla = bugzilla
 
         if 'dict' in kwargs and kwargs['dict']:
-            log.debug("Bug(%s)" % sorted(kwargs['dict'].keys()))
+            log.debug("Bug(%s)", sorted(kwargs['dict'].keys()))
             self._update_dict(kwargs['dict'])
 
         if 'bug_id' in kwargs:
-            log.debug("Bug(%i)" % kwargs['bug_id'])
+            log.debug("Bug(%i)", kwargs['bug_id'])
             setattr(self, 'id', kwargs['bug_id'])
 
         # Back compat for a previously handled param
diff --git a/tests/modify.py b/tests/modify.py
@@ -99,9 +99,9 @@ def testWhiteboard(self):
             {'cf_devel_whiteboard': 'devel-duh',
              'cf_internal_whiteboard': 'internal-hey',
              'cf_qa_whiteboard': 'yo-qa'}, wbout={
-            "qa": ([], ["foo"]),
-            "internal": (["bar"], []),
-            "devel": ([], ["yay"])},
+                "qa": ([], ["foo"]),
+                "internal": (["bar"], []),
+                "devel": ([], ["yay"])},
         )
 
     def testMisc(self):
