pep8 cleanup

dhellmann · dhellmann · commit 62eb6b5f6c7e · 2012-07-20T11:33:18.000-04:00
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py26,py32
+envlist = py27,py26,py32,pep8
 
 [testenv]
 commands = bash ./tests/run_tests {envdir} []
@@ -9,6 +9,11 @@ deps = virtualenv
 setenv =
     TOXIC = true
 
+[testenv:pep8]
+deps = pep8==1.1
+commands = pep8 --ignore=E501 --repeat --show-source virtualenvwrapper
+
+
 # Not sure why this is needed, but on my system if it isn't included then
 # the python version picked up for 2.6 is actually 2.7.
 # IF THIS CAUSES YOU A PROBLEM COMMENT IT OUT BEFORE RUNNING THE TESTS.
diff --git a/virtualenvwrapper/hook_loader.py b/virtualenvwrapper/hook_loader.py
@@ -16,9 +16,11 @@
 from stevedore import ExtensionManager
 from stevedore import NamedExtensionManager
 
+LOG_FORMAT = '%(asctime)s %(levelname)s %(name)s %(message)s'
+
 
 class GroupWriteRotatingFileHandler(logging.handlers.RotatingFileHandler):
-    """Taken from http://stackoverflow.com/questions/1407474/does-python-logging-handlers-rotatingfilehandler-allow-creation-of-a-group-writa
+    """Taken from http://stackoverflow.com/questions/1407474
     """
     def _open(self):
         prevumask = os.umask(0o002)
@@ -34,56 +36,63 @@ def main():
         description='Manage hooks for virtualenvwrapper',
         )
 
-    parser.add_option('-S', '--script',
-                      help='Runs "hook" then "<hook>_source", writing the ' +
-                           'result to <file>',
-                      dest='script_filename',
-                      default=None,
-                      )
-    parser.add_option('-s', '--source',
-                      help='Print the shell commands to be run in the current shell',
-                      action='store_true',
-                      dest='sourcing',
-                      default=False,
-                      )
-    parser.add_option('-l', '--list',
-                      help='Print a list of the plugins available for the given hook',
-                      action='store_true',
-                      default=False,
-                      dest='listing',
-                      )
-    parser.add_option('-v', '--verbose',
-                      help='Show more information on the console',
-                      action='store_const',
-                      const=2,
-                      default=1,
-                      dest='verbose_level',
-                      )
-    parser.add_option('-q', '--quiet',
-                      help='Show less information on the console',
-                      action='store_const',
-                      const=0,
-                      dest='verbose_level',
-                      )
-    parser.add_option('-n', '--name',
-                      help='Only run the hook from the named plugin',
-                      action='append',
-                      dest='names',
-                      default=[],
-                      )
-    parser.disable_interspersed_args()  # stop when we hit an option without an '-'
+    parser.add_option(
+        '-S', '--script',
+        help='Runs "hook" then "<hook>_source", writing the ' +
+        'result to <file>',
+        dest='script_filename',
+        default=None,
+        )
+    parser.add_option(
+        '-s', '--source',
+        help='Print the shell commands to be run in the current shell',
+        action='store_true',
+        dest='sourcing',
+        default=False,
+        )
+    parser.add_option(
+        '-l', '--list',
+        help='Print a list of the plugins available for the given hook',
+        action='store_true',
+        default=False,
+        dest='listing',
+        )
+    parser.add_option(
+        '-v', '--verbose',
+        help='Show more information on the console',
+        action='store_const',
+        const=2,
+        default=1,
+        dest='verbose_level',
+        )
+    parser.add_option(
+        '-q', '--quiet',
+        help='Show less information on the console',
+        action='store_const',
+        const=0,
+        dest='verbose_level',
+        )
+    parser.add_option(
+        '-n', '--name',
+        help='Only run the hook from the named plugin',
+        action='append',
+        dest='names',
+        default=[],
+        )
+    parser.disable_interspersed_args()  # stop when on option without an '-'
     options, args = parser.parse_args()
 
     root_logger = logging.getLogger('')
 
     # Set up logging to a file
     root_logger.setLevel(logging.DEBUG)
     file_handler = GroupWriteRotatingFileHandler(
-        os.path.expandvars(os.path.join('$VIRTUALENVWRAPPER_LOG_DIR', 'hook.log')),
+        os.path.expandvars(os.path.join('$VIRTUALENVWRAPPER_LOG_DIR',
+                                        'hook.log')),
         maxBytes=10240,
         backupCount=1,
         )
-    formatter = logging.Formatter('%(asctime)s %(levelname)s %(name)s %(message)s')
+    formatter = logging.Formatter(LOG_FORMAT)
     file_handler.setFormatter(formatter)
     root_logger.addHandler(file_handler)
 
@@ -121,7 +130,8 @@ def main():
     run_hooks(hook, options, args)
 
     if options.script_filename:
-        log.debug('Saving sourcable %s hooks to %s', hook, options.script_filename)
+        log.debug('Saving sourcable %s hooks to %s',
+                  hook, options.script_filename)
         options.sourcing = True
         output = open(options.script_filename, "w")
         try:
@@ -147,7 +157,8 @@ def run_hooks(hook, options, args, output=None):
 
     if options.listing:
         def show(ext):
-            output.write('  %-10s -- %s\n' % (ext.name, inspect.getdoc(ext.plugin) or ''))
+            output.write('  %-10s -- %s\n' %
+                         (ext.name, inspect.getdoc(ext.plugin) or ''))
         hook_mgr.map(show)
 
     elif options.sourcing:
diff --git a/virtualenvwrapper/project.py b/virtualenvwrapper/project.py
@@ -8,8 +8,6 @@
 import logging
 import os
 
-import pkg_resources
-
 from virtualenvwrapper.user_scripts import make_hook, run_global
 
 log = logging.getLogger(__name__)
@@ -28,6 +26,7 @@
      "This hook is run after a project is deleted."),
     ]
 
+
 def initialize(args):
     """Set up user hooks
     """
@@ -38,10 +37,11 @@ def initialize(args):
 
 def pre_mkproject(args):
     log.debug('pre_mkproject %s', str(args))
-    envname=args[0]
+    envname = args[0]
     run_global('premkproject', *args)
     return
 
+
 def post_mkproject_source(args):
     return """
 #
@@ -50,6 +50,7 @@ def post_mkproject_source(args):
 [ -f "$WORKON_HOME/postmkproject" ] && source "$WORKON_HOME/postmkproject"
 """
 
+
 def post_activate_source(args):
     return """
 #
diff --git a/virtualenvwrapper/user_scripts.py b/virtualenvwrapper/user_scripts.py
@@ -12,13 +12,15 @@
 import subprocess
 import sys
 
-import pkg_resources
 
 log = logging.getLogger(__name__)
 
-    
 # Are we running under msys
-if sys.platform == 'win32' and os.environ.get('OS') == 'Windows_NT' and os.environ.get('MSYSTEM') == 'MINGW32':
+if (sys.platform == 'win32'
+    and
+    os.environ.get('OS') == 'Windows_NT'
+    and
+    os.environ.get('MSYSTEM') == 'MINGW32'):
     is_msys = True
     script_folder = 'Scripts'
 else:
@@ -32,12 +34,12 @@ def run_script(script_path, *args):
     if os.path.exists(script_path):
         cmd = [script_path] + list(args)
         if is_msys:
-            cmd = [get_path(os.environ['MSYS_HOME'],'bin','sh.exe')] + cmd
+            cmd = [get_path(os.environ['MSYS_HOME'], 'bin', 'sh.exe')] + cmd
         log.debug('running %s', str(cmd))
         try:
-            return_code = subprocess.call(cmd)
+            subprocess.call(cmd)
         except OSError:
-            _,  msg, _ = sys.exc_info()
+            _, msg, _ = sys.exc_info()
             log.error('could not run "%s": %s', script_path, str(msg))
         #log.debug('Returned %s', return_code)
     return
@@ -85,7 +87,8 @@ def run_global(script_name, *args):
 
     # get_env_details
     ("get_env_details",
-     "This hook is run when the list of virtualenvs is printed so each name can include details."),
+     "This hook is run when the list of virtualenvs is printed "
+     "so each name can include details."),
     ]
 
 
@@ -104,13 +107,14 @@ def run_global(script_name, *args):
 
     # get_env_details
     ("get_env_details",
-     "This hook is run when the list of virtualenvs is printed in 'long' mode so each name can include details."),
+     "This hook is run when the list of virtualenvs is printed "
+     "in 'long' mode so each name can include details."),
     ]
 
 
 def make_hook(filename, comment):
     """Create a hook script.
-    
+
     :param filename: The name of the file to write.
     :param comment: The comment to insert into the file.
     """
@@ -122,14 +126,15 @@ def make_hook(filename, comment):
             f.write("""#!%(shell)s
 # %(comment)s
 
-""" % {'comment':comment, 'shell':os.environ.get('SHELL', '/bin/sh')})
+""" % {'comment': comment,
+       'shell': os.environ.get('SHELL', '/bin/sh'),
+       })
         finally:
             f.close()
         os.chmod(filename, PERMISSIONS)
     return
 
 
-
 # HOOKS
 
 
@@ -147,9 +152,10 @@ def initialize_source(args):
 [ -f "$VIRTUALENVWRAPPER_HOOK_DIR/initialize" ] && source "$VIRTUALENVWRAPPER_HOOK_DIR/initialize"
 """
 
+
 def pre_mkvirtualenv(args):
     log.debug('pre_mkvirtualenv %s', str(args))
-    envname=args[0]
+    envname = args[0]
     for filename, comment in LOCAL_HOOKS:
         make_hook(get_path('$WORKON_HOME', envname, script_folder, filename), comment)
     run_global('premkvirtualenv', *args)
@@ -164,9 +170,10 @@ def post_mkvirtualenv_source(args):
 [ -f "$VIRTUALENVWRAPPER_HOOK_DIR/postmkvirtualenv" ] && source "$VIRTUALENVWRAPPER_HOOK_DIR/postmkvirtualenv"
 """
 
+
 def pre_cpvirtualenv(args):
     log.debug('pre_cpvirtualenv %s', str(args))
-    envname=args[0]
+    envname = args[0]
     for filename, comment in LOCAL_HOOKS:
         make_hook(get_path('$WORKON_HOME', envname, script_folder, filename), comment)
     run_global('precpvirtualenv', *args)
@@ -234,7 +241,7 @@ def post_deactivate_source(args):
 [ -f "$WORKON_HOME/%(env_name)s/bin/postdeactivate" ] && source "$WORKON_HOME/%(env_name)s/bin/postdeactivate"
 [ -f "$VIRTUALENVWRAPPER_HOOK_DIR/postdeactivate" ] && source "$VIRTUALENVWRAPPER_HOOK_DIR/postdeactivate"
 unset VIRTUALENVWRAPPER_LAST_VIRTUAL_ENV
-""" % { 'env_name':args[0] }
+""" % {'env_name': args[0]}
 
 
 def get_env_details(args):
@@ -244,18 +251,22 @@ def get_env_details(args):
     run_script(script_path, *args)
     return
 
+
 def get_path(*args):
     '''
     Get a full path from args.
-    Path separator is determined according to the os and the shell and allow to use is_msys.
+
+    Path separator is determined according to the os and the shell and
+    allow to use is_msys.
+
     Variables and user are expanded during the process.
     '''
     path = os.path.expanduser(os.path.expandvars(os.path.join(*args)))
     if is_msys:
         # MSYS accept unix or Win32 and sometimes it drives to mixed style paths
         if re.match(r'^/[a-zA-Z](/|^)', path):
             # msys path could starts with '/c/'-form drive letter
-            path = ''.join((path[1],':',path[2:]))
+            path = ''.join((path[1], ':', path[2:]))
         path = path.replace('/', os.sep)
-        
+
     return os.path.abspath(path)
