Other fixes W1202

Signed-off-by: Petr Hracek <phracek@redhat.com>

rebasehelper/application.py

@@ -112,7 +112,7 @@ def _add_debug_log_file(self):
                                                             ":%(lineno)s %(funcName)s: %(message)s"),
                                           logging.DEBUG)
         except (IOError, OSError):
-            logger.warning("Can not create debug log '{0}'".format(debug_log_file))
+            logger.warning("Can not create debug log '%s'", debug_log_file)
         else:
             self.debug_log_file = debug_log_file
 

rebasehelper/diff_helper.py

@@ -21,14 +21,12 @@
 #          Tomas Hozza <thozza@redhat.com>
 
 import os
-import sys
 from six import StringIO
 
 from rebasehelper.logger import logger
 from rebasehelper.utils import ConsoleHelper
 from rebasehelper.utils import ProcessHelper
 from rebasehelper import settings
-from rebasehelper.utils import GitHelper
 
 diff_tools = {}
 

rebasehelper/upstream_monitoring.py

@@ -26,7 +26,7 @@
 import git
 import os
 from rebasehelper.cli import CLI
-from rebasehelper.logger import logger, LoggerHelper
+from rebasehelper.logger import logger
 from rebasehelper.application import Application
 from rebasehelper.exceptions import RebaseHelperError
 
@@ -64,14 +64,15 @@ def parse_fedpkg_conf(self):
         config = ConfigParser.RawConfigParser()
         config.readfp(open(self.fedpkg_file))
         section = 'fedpkg'
-        module_name = 'module'
         fields = {}
         if config.has_section(section):
             for option in config.options(section):
                 fields[option] = config.get(section, option)
         self.url = fields.get(self.anonymous_url).replace('%(module)s', self.package)
 
-    def _get_package_version(self, msg):
+    def _get_package_version(self):
+
+        """ Get package and version from fedmsg  """
         try:
             rebase_helper_msg = ast.literal_eval(self.msg['msg']['log'].encode('utf-8'))
         except ValueError:
@@ -81,7 +82,7 @@ def _get_package_version(self, msg):
             logger.debug('wrong request from upstream monitoring service')
             return
         self.package = rebase_helper_msg.get('package')
-        logger.info('Package {0}', format(self.package))
+        logger.info('Package %s', self.package)
         self.version = rebase_helper_msg.get('version')
         self.arguments.append(self.version)
 
@@ -96,8 +97,11 @@ def _print_patches(self):
         if self.patches['unapplied']:
             logger.info('Following patches were unapplied %s', self.patches['unapplied'])
 
-    def _call_rebase_helper(self, tempdir):
-        logger.info('Clonning repository {0}', format(self.url))
+    def _call_rebase_helper(self):
+
+        """ Clonning repository and call rebase-helper """
+
+        logger.info('Clonning repository %s', self.url)
         git.Git().clone(self.url)
         os.chdir(self.package)
         cli = CLI(self.arguments)
@@ -111,14 +115,17 @@ def _call_rebase_helper(self, tempdir):
             logger.error(rbe.message)
 
     def process_messsage(self):
-        print ('NEW REQUEST')
-        print('TOPIC:', self.topic)
-        print('MSG:', self.msg)
+
+        """ Process message from fedmsg """
+
+        #print ('NEW REQUEST')
+        #print('TOPIC:', self.topic)
+        #print('MSG:', self.msg)
         if self.topic == 'org.fedoraproject.dev.logger.log':
             self._get_package_version(self.msg)
             self.parse_fedpkg_conf()
             tempdir = tempfile.mkdtemp(suffix='-rebase-helper')
             cwd = os.getcwd()
             os.chdir(tempdir)
-            self._call_rebase_helper(tempdir)
+            self._call_rebase_helper()
             os.chdir(cwd)

rebasehelper/utils.py

@@ -219,14 +219,8 @@ def run_subprocess_cwd_env(cmd, cwd=None, env=None, input=None, output=None, she
         close_out_file = False
         close_in_file = False
 
-        logger.debug("cmd={cmd}, cwd={cwd}, env={env}, input={input}, output={output}, shell={shell}".format(
-            cmd=str(cmd),
-            cwd=str(cwd),
-            env=str(env),
-            input=str(input),
-            output=str(output),
-            shell=str(shell),
-        ))
+        logger.debug("cmd=%s, cwd=%s, env=%s, input=%s, output=%s, shell=%s",
+                     str(cmd), str(cwd), str(env), str(input), str(output), str(shell))
 
         # write the output to a file/file-like object?
         try: