Merge pull request #37 from vrutkovs/code-smells

Fix logging (PEP-282) code smells

Author: vrutkovs

ctf_cli/application.py

@@ -168,7 +168,7 @@ def update(self):
         common_steps_dir = os.path.join(self._execution_dir_path, "tests", "steps", "common_steps")
         common_features_dir = os.path.join(self._execution_dir_path, "tests", "features", "common-features")
         for directory in [common_steps_dir, common_features_dir]:
-            logger.info("Updating %s" % directory)
+            logger.info("Updating %s", directory)
             check_call("git fetch origin", shell=True, cwd=directory)
             check_call("git checkout origin/master", shell=True, cwd=directory)
 

ctf_cli/behave.py

@@ -29,6 +29,7 @@
 from ctf_cli.common_environment import common_environment_py_header
 from ctf_cli import __path__
 
+
 class BehaveTestsConfig(object):
     """
     Configuration parser for tests configuration
@@ -219,8 +220,8 @@ def _add_project_specific_steps(self):
         """
         project_steps_dir = os.path.join(self._project_tests_dir, 'steps')
         if os.path.exists(project_steps_dir):
-            logger.info("Using project specific Steps from '%s'", project_steps_dir.replace(self._execution_dir
-                                                                                            + os.sep, ''))
+            logger.info("Using project specific Steps from '%s'",
+                        project_steps_dir.replace(self._execution_dir + os.sep, ''))
             shutil.copytree(project_steps_dir, os.path.join(self._steps_dir,
                                                             '{0}_steps'.format(os.path.basename(
                                                                 self._execution_dir).replace('-', '_'))))
@@ -237,8 +238,8 @@ def _add_project_specific_features(self):
         """
         project_features_dir = os.path.join(self._project_tests_dir, 'features')
         if os.path.exists(project_features_dir):
-            logger.info("Using project specific Features from '%s'", project_features_dir.replace(self._execution_dir
-                                                                                                  + os.sep, ''))
+            logger.info("Using project specific Features from '%s'",
+                        project_features_dir.replace(self._execution_dir + os.sep, ''))
             shutil.copytree(project_features_dir, os.path.join(self._features_dir,
                                                                '{0}_features'.format(os.path.basename(
                                                                    self._execution_dir).replace('-', '_'))))
@@ -324,7 +325,7 @@ def get_import_statements(path):
         """
         imports = []
 
-        for (dirpath, dirnames, filenames) in os.walk(path, followlinks=True):
+        for (dirpath, _, filenames) in os.walk(path, followlinks=True):
             module = dirpath.replace(path, '').strip(os.sep).replace(os.sep, '.')
             # generate imports for the *.py files in the current dir
 
@@ -356,7 +357,7 @@ def check_and_add_init_py(path, skip_root=False):
         """
         files = []
 
-        for (dirpath, dirnames, filenames) in os.walk(path, followlinks=True):
+        for (dirpath, _, filenames) in os.walk(path, followlinks=True):
             if skip_root and dirpath == path:
                 continue
 

ctf_cli/common_environment_content.py

@@ -43,7 +43,7 @@ def open_file(path):
             inventory=inventory,
             module_args='src={0} dest={1}'.format(
                 path, context.temp_dir)).run()
-        for host, value in ret['contacted'].iteritems():
+        for _, value in ret['contacted'].iteritems():
             try:
                 ret_file = open(value['dest'])
                 return ret_file
@@ -55,7 +55,7 @@ def open_file(path):
     def run(command):
         if '{{' in command:
             command = command.replace("{{", "{{ '{{").replace("}}", "}}' }}")
-        logging.info("Running '%s'" % command)
+        logging.info("Running '%s'", command)
         context.result = ansible.runner.Runner(
             module_name="shell",
             inventory=inventory,
@@ -72,9 +72,9 @@ def run(command):
                 print("stderr: {0}".format(values['stderr']))
                 print("cmd: {0}".format(values['cmd']))
                 assert False
-            logging.info('stdout:\\n%s' % values['stdout'])
+            logging.info('stdout:\\n%s', values['stdout'])
             if values['stderr']:
-                logging.info('stderr\\n:%s' % values['stderr'])
+                logging.info('stderr\\n:%s', values['stderr'])
             return values['stdout']
     context.run = run
 
@@ -109,7 +109,7 @@ def copy_dockerfile():
                             oct(stat.S_IMODE(os.stat(glob_path).st_mode)))
                     ).run()
         except Exception as e:
-            logging.warning("copy_dockerfile:%s" % e)
+            logging.warning("copy_dockerfile:%s", e)
 
     copy_dockerfile()
 
@@ -141,7 +141,7 @@ def after_scenario(context, scenario):
     try:
         cid = context.run('cat %s' % context.cid_file)
     except AssertionError as e:
-        logging.info("before_scenario: {0}".format(e))
+        logging.info("before_scenario: %s", e)
         return
     if cid:
         context.run("docker logs %s" % cid)