Fixed lint errors (#23)

Author: quaark

Makefile

@@ -4,7 +4,7 @@ TESTER = ./venv/bin/nosetests
 LINTER = ./venv/bin/flake8
 
 .PHONY: all
-all: venv test
+all: venv lint test
 	@echo Done.
 
 .PHONY: lint

clients/logging/__init__.py

@@ -82,16 +82,16 @@ def __call__(self, event_info):
                         'Unhandled exception in deferred',
                         failure=str(event_info['failure']).replace('\n', '\n\r'),
                         traceback=str(event_info['failure'].getBriefTraceback()).replace('\n', '\n\r'))
-                except:
+                except Exception:
                     pass
 
                 try:
                     if len(event_info['message']) > 0:
                         self.logger_instance.error(
                             str(event_info['message']).replace('\n', '\n\r'))
-                except:
+                except Exception:
                     pass
-        except:
+        except Exception:
             pass
 
 

clients/logging/formatter/helpers.py

@@ -38,7 +38,7 @@ class ObjectEncoder(simplejson.JSONEncoder):
     def default(self, obj):
         try:
             return obj.__log__()
-        except:
+        except Exception:
             return obj.__repr__()
 
 
@@ -50,7 +50,7 @@ def format_to_json_str(params):
 
             # default encoding is utf8
             return simplejson.dumps(params, cls=ObjectEncoder)
-        except:
+        except Exception:
 
             # this is the widest complementary encoding found
             return simplejson.dumps(params, cls=ObjectEncoder, encoding='raw_unicode_escape')

clients/logging/formatter/human_readable.py

@@ -71,7 +71,7 @@ def _get_what_color():
             time_parts = output['when'].split('.')
             time_parts[-1] = time_parts[-1][:-3]
             output['when'] = '.'.join(time_parts)
-        except:
+        except Exception:
             pass
 
         # Disable coloring if requested

clients/logging/formatter/json.py

@@ -15,7 +15,7 @@ def format(self, record):
             more = dict(record.vars) if len(record.vars) else {}
             try:
                 del more['ctx']
-            except:
+            except Exception:
                 pass
         except Exception as exc:
             more = 'Record vars are not parsable: {0}'.format(str(exc))

core/__init__.py

@@ -353,6 +353,6 @@ def _get_next_dependent_target(self, parent_target):
     def _enforce_no_store_true_args(parser):
         for action in parser._actions:
             if isinstance(action, argparse._StoreTrueAction):
-                raise SyntaxError('manofest.py doens\'t support argument registration of type=\'store_true\' \n' + \
-                                  'offending action={0}'.format(action))
-
+                error_msg = 'manofest.py doens\'t support argument registration of type=\'store_true\' \n' + \
+                            'offending action={0}'.format(action)
+                raise SyntaxError(error_msg)

manof.py

@@ -51,9 +51,9 @@ def _register_arguments(parser):
     clients.logging.Client.register_arguments(parser)
 
     parser.add_argument(
-            '-mp', '--manofest-path',
-            help='Location of manofest.py',
-            default='manofest.py')
+        '-mp', '--manofest-path',
+        help='Location of manofest.py',
+        default='manofest.py')
 
     parser.add_argument(
         '--num-retries',
@@ -64,14 +64,14 @@ def _register_arguments(parser):
 
     # don't actually run any commands
     parser.add_argument(
-            '-dr', '--dry-run',
-            help='Don\'t actually run any commands, just log',
-            action='store_true')
+        '-dr', '--dry-run',
+        help='Don\'t actually run any commands, just log',
+        action='store_true')
 
     parser.add_argument('-p', '--parallel', action='store', help='Set how many commands to run in parallel', type=int)
 
     # update
-    update_command = subparsers.add_parser('update', help='Updates Manof')
+    subparsers.add_parser('update', help='Updates Manof')
 
     # provision
     provision_command = subparsers.add_parser('provision', help='Build or pull target images')
@@ -98,7 +98,7 @@ def _register_arguments(parser):
                                    action='append',
                                    dest='devices')
     run_parent_parser.add_argument('--device-cgroup-rule',
-                                   help='Add a rule to the cgroup allowed devices list (e.g. c\ 42:*\ rmw)')
+                                   help='Add a rule to the cgroup allowed devices list (e.g. c 42:* rmw)')
     run_parent_parser \
         .add_argument('--device-read-bps',
                       help='Limit read rate (bytes per second) from a device (e.g. /dev/sda:50mb)')

manof/__init__.py

@@ -1,6 +1,5 @@
 # to allow manofests to use manof.Image and such rather than manof.image.Image
-from target import *
-from image import *
-from volume import *
-from group import *
-
+from target import Target
+from image import Image
+from volume import Volume, NamedVolume
+from group import Group

manof/image.py

@@ -51,7 +51,7 @@ def provision(self):
                     # whatever happens, delete docker ignore silently
                     try:
                         os.remove(dockerignore_path)
-                    except:
+                    except Exception:
                         pass
             else:
 
@@ -687,7 +687,9 @@ def to_dict(self):
         return d
 
     def _update_env_override(self):
-        """ Set all the env related args we registered to environment """
+        """
+        Set all the env related args we registered to environment
+        """
         env = self.env
         for idx, envvar in enumerate(env):
             if isinstance(envvar, dict):

manof/utils/__init__.py

@@ -95,7 +95,8 @@ def venv_run(logger, venv_path, command, cwd=None, quiet=False):
 
 def getProcessOutputAndValue(executable, args=(), env={}, path=None,
                              reactor=None):
-    """Spawn a process and returns a Deferred that will be called back with
+    """
+    Spawn a process and returns a Deferred that will be called back with
     its output (from stdout and stderr) and it's exit code as (out, err, code)
     If a signal is raised, the Deferred will errback with the stdout and
     stderr up to that point, along with the signal, as (out, err, signalNum)
@@ -110,7 +111,7 @@ def _callProtocolWithDeferred(protocol, executable, args, env, path, reactor=Non
 
     d = defer.Deferred()
     p = protocol(d)
-    reactor.spawnProcess(p, executable, (executable,)+tuple(args), env, path)
+    reactor.spawnProcess(p, executable, (executable,) + tuple(args), env, path)
     return d