Clean up usage and make PEP8 happy

setup.py

@@ -2,13 +2,13 @@
 
 from distutils.core import setup
 
-setup(  name='When-changed',
-        version='0.2.0',
-        description='Run a command when a file is changed',
-        author='Johannes H. Jensen',
-        url='https://github.com/joh/when-changed',
-        packages=['whenchanged'],
-        scripts=['when-changed'],
-        requires=['pyinotify'],
-        license = 'BSD'
-        )
+setup(name='When-changed',
+      version='0.2.0',
+      description='Run a command when a file is changed',
+      author='Johannes H. Jensen',
+      url='https://github.com/joh/when-changed',
+      packages=['whenchanged'],
+      scripts=['when-changed'],
+      requires=['pyinotify'],
+      license='BSD'
+      )

when-changed

@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 
-from whenchanged.whenchanged import main 
+from whenchanged.whenchanged import main
 main()

whenchanged/whenchanged.py

@@ -1,9 +1,11 @@
 #!/usr/bin/env python
-"""
-when-changed - run a command when a file is changed
+"""%(prog)s - run a command when a file is changed
+
+Usage: %(prog)s [-r] FILE COMMAND...
+       %(prog)s [-r] FILE [FILE ...] -c COMMAND
 
-Usage: when-changed [-r] FILE COMMAND...
-       when-changed [-r] FILE [FILE ...] -c COMMAND
+FILE can be a directory. Watch recursively with -r.
+Use %%f to pass the filename to the command.
 
 Copyright (c) 2011, Johannes H. Jensen.
 License: BSD, see LICENSE for more details.
@@ -15,6 +17,7 @@
 import re
 import pyinotify
 
+
 class WhenChanged(pyinotify.ProcessEvent):
     # Exclude Vim swap files, its file creation test file 4913 and backup files
     exclude = re.compile(r'^\..*\.sw[px]*$|^4913$|.~$')
@@ -64,7 +67,8 @@ def run(self):
         for p in self.paths:
             if os.path.isdir(p) and not p in watched:
                 # Add directory
-                wdd = wm.add_watch(p, mask, rec=self.recursive, auto_add=self.recursive)
+                wdd = wm.add_watch(p, mask, rec=self.recursive,
+                                   auto_add=self.recursive)
             else:
                 # Add parent directory
                 path = os.path.dirname(p)
@@ -74,25 +78,16 @@ def run(self):
         notifier.loop()
 
 
-usage =  'Usage: %(prog)s [-r] FILE COMMAND...\n'
-usage += '       %(prog)s [-r] FILE [FILE ...] -c COMMAND...'
-description = 'Run a command when a file is changed.\n'
-description += 'FILE can be a directory. Watch recursively with -r.\n'
-description += 'Use %f to pass the filename to the command.\n'
-
 def print_usage(prog):
-    print(usage % {'prog': prog})
+    print(__doc__ % {'prog': prog}, end='')
 
-def print_help(prog):
-    print_usage(prog)
-    print("\n" + description)
 
 def main():
     args = sys.argv
-    prog = args.pop(0)
+    prog = os.path.basename(args.pop(0))
 
     if '-h' in args or '--help' in args:
-        print_help(prog)
+        print_usage(prog)
         exit(0)
 
     files = []