Flake8

Author: Jonathan Kamens

delete

@@ -4,14 +4,14 @@ import logging
 import optparse
 import os
 import shutil
-import stat
 import sys
 
+import libdelete
+from libdelete import perror
+
 logger = logging.getLogger('delete')
 whoami = os.path.basename(sys.argv[0])
 
-import libdelete
-from libdelete import perror
 
 def debug_callback(option, opt_str, value, parser):
     """
@@ -28,6 +28,7 @@ def debug_callback(option, opt_str, value, parser):
     for l in loggers:
         logging.getLogger(l).setLevel(logging.DEBUG)
 
+
 def ask(question, *args, **kwargs):
     """
     Ask a question, possibly prepended with the name of the program
@@ -41,6 +42,7 @@ def ask(question, *args, **kwargs):
     except KeyboardInterrupt:
         sys.exit(0)
 
+
 def actually_delete(filename, options):
     """
     Actually delete the file.
@@ -55,7 +57,8 @@ def actually_delete(filename, options):
                    filename):
             return False
     if options.noop:
-        print >>sys.stderr, "{0}: {1} would be removed".format(whoami, filename)
+        print >>sys.stderr, "{0}: {1} would be removed".format(
+            whoami, filename)
         return True
     (dirname, basename) = os.path.split(filename)
     newname = os.path.join(dirname, '.#' + basename)
@@ -73,6 +76,7 @@ def actually_delete(filename, options):
     os.utime(newname, None)
     return True
 
+
 def delete(filename, options):
     logger.debug("delete(%s)", filename)
     if not os.path.lexists(filename):
@@ -123,6 +127,7 @@ def delete(filename, options):
         else:
             return actually_delete(filename, options)
 
+
 def main():
     parser = optparse.OptionParser(usage="%prog [options] filename ...")
     # This is probably a terrible idea, but the old code did it
@@ -155,7 +160,8 @@ def main():
         default=linked_to_rmdir,
         help="Only remove empty directories (refuse to remove files)")
     parser.add_option(
-        "--debug", action="callback", type='string', help="Enable debugging (logger target or 'all')",
+        "--debug", action="callback", type='string',
+        help="Enable debugging (logger target or 'all')",
         callback=debug_callback, metavar='target')
     (options, args) = parser.parse_args()
     if options.filesonly and options.directoriesonly:
@@ -176,6 +182,7 @@ def main():
             errors = 1
     return errors
 
+
 if __name__ == "__main__":
     logging.basicConfig(level=logging.WARNING)
     sys.exit(main())

expunge

@@ -18,6 +18,7 @@ confirmation = "Do you wish to continue [return = no]? "
 logger = logging.getLogger('expunge')
 whoami = os.path.basename(sys.argv[0])
 
+
 def debug_callback(option, opt_str, value, parser):
     """
     An OptionParser callback that enables debugging.
@@ -33,6 +34,7 @@ def debug_callback(option, opt_str, value, parser):
     for l in loggers:
         logging.getLogger(l).setLevel(logging.DEBUG)
 
+
 def ask(question, *args, **kwargs):
     """
     Ask a question, possibly prepended with the name of the program
@@ -46,10 +48,12 @@ def ask(question, *args, **kwargs):
     except KeyboardInterrupt:
         sys.exit(0)
 
+
 def getsize(path):
     size = os.path.getsize(path)
     return (size, "(%dKB)" % (libdelete.to_kb(size),))
 
+
 def expunge(deleted_files, options):
     expunged_size = 0
     errors = 0
@@ -87,7 +91,11 @@ def expunge(deleted_files, options):
                     # We exit here, not keep going, as the original code did
                     sys.exit(errors)
             if options.verbose:
-                print "{whoami}: {path} {size} {maybe}expunged ({total}KB total)".format(whoami=whoami, path=f, size=size_str, maybe='would be ' if options.noop else '', total=libdelete.to_kb(expunged_size))
+                print("{whoami}: {path} {size} {maybe}expunged "
+                      "({total}KB total)".format(
+                          whoami=whoami, path=f, size=size_str,
+                          maybe='would be ' if options.noop else '',
+                          total=libdelete.to_kb(expunged_size)))
         if not options.noop:
             if os.path.isdir(f) and not os.path.islink(f):
                 logger.debug("rmdir: %s", f)
@@ -100,6 +108,7 @@ def expunge(deleted_files, options):
         print "Total expunged: {0}KB".format(libdelete.to_kb(expunged_size))
     return errors
 
+
 def parse_options():
     parser = optparse.OptionParser(usage="%prog [options] filename ...")
     parser.add_option(
@@ -133,14 +142,16 @@ def parse_options():
         "-m", dest="f_mounts", action="store_true", default=False,
         help="Follow mount points")
     parser.add_option(
-        "--debug", action="callback", type='string', help="Enable debugging (logger target or 'all')",
+        "--debug", action="callback", type='string',
+        help="Enable debugging (logger target or 'all')",
         callback=debug_callback, metavar='target')
     (options, args) = parser.parse_args()
     if options.noop:
         # -n implies -v
         options.verbose = True
     return (options, args)
 
+
 def main():
     rv = 0
     if ((whoami == "purge") and len(sys.argv) > 1):
@@ -175,11 +186,13 @@ def main():
             # Doesn't cover all corner cases, but covers everything the old
             # code supported.  In particular, weird symlinks will make this
             # sad
-            deleted_files.sort(reverse=True, key=lambda x: x.count(os.path.sep))
+            deleted_files.sort(reverse=True,
+                               key=lambda x: x.count(os.path.sep))
             rv += expunge(deleted_files, options)
 
     return rv
 
+
 if __name__ == "__main__":
     logging.basicConfig(level=logging.WARNING)
     sys.exit(main())

libdelete.py

@@ -10,7 +10,6 @@
 import re
 import time
 import sys
-import stat
 
 WILDCARDS_RE = re.compile('([*?[])')
 KILO = 1024
@@ -19,9 +18,11 @@
 _have_AFS = None
 whoami = os.path.basename(sys.argv[0])
 
+
 class DeleteError(Exception):
     pass
 
+
 def perror(message, **kwargs):
     """
     Format an error message, log it in the debug log
@@ -33,12 +34,14 @@ def perror(message, **kwargs):
     if should_print:
         print >>sys.stderr, msg
 
+
 def chunks(seq, size):
     """
     Break a sequence up into size chunks
     """
     return (seq[pos:pos + size] for pos in xrange(0, len(seq), size))
 
+
 def format_columns(items, singlecol=False, width=80):
     """
     Pretty-print in optional multi-column format, with padding/spread.
@@ -59,6 +62,7 @@ def format_columns(items, singlecol=False, width=80):
         rv.append("".join(item.ljust(col_width + padding) for item in c))
     return "\n".join(rv)
 
+
 def have_AFS():
     global _have_AFS, afs
 
@@ -71,6 +75,7 @@ def have_AFS():
             _have_AFS = False
     return _have_AFS
 
+
 def is_mountpoint(path):
     if os.path.ismount(path):
         return True
@@ -82,35 +87,41 @@ def is_mountpoint(path):
             logger.debug("Got exception while checking mount point: %s", e)
     return False
 
+
 def has_wildcards(string):
     return WILDCARDS_RE.search(string) is not None
 
+
 def is_deleted(path):
     """
     Return True if the file has been 'deleted' by delete(1)
     """
     return os.path.basename(path).startswith('.#')
 
+
 def dir_listing(path):
     """
     A directory listing with the full path.
     """
     return [os.path.join(path, x) for x in os.listdir(path)]
 
+
 def empty_directory(path):
     """
     Return True if the directory is "empty" (that is, any entries
     in it have been deleted)
     """
     return all(is_deleted(x) for x in dir_listing(path))
 
+
 def relpath(path):
     """
     For relative paths that begin with '.', strip off the leading
     stuff.
     """
     return path[2:] if path.startswith('./') else path
 
+
 def undeleted_name(path):
     """
     Return the undeleted name of a file.  Only the last component
@@ -124,6 +135,7 @@ def undeleted_name(path):
     else:
         return path
 
+
 def n_days_old(path, n):
     if n < 0:
         raise ValueError("n must not be negative")
@@ -134,27 +146,34 @@ def n_days_old(path, n):
     logger.debug("%s modified %d sec ago", path, mtime)
     return ((time.time() - mtime) >= (86400 * n))
 
+
 def escape_meta(path):
     return WILDCARDS_RE.sub(r'[\1]', path)
 
+
 def to_kb(size):
     return int(round(float(size) / KILO))
 
+
 def find_deleted_files(file_or_pattern, follow_links=False,
                        follow_mounts=False, recurse_undeleted_subdirs=None,
                        recurse_deleted_subdirs=None, n_days=0):
 
-    logger.debug("find_deleted_files(%s, links=%s, mounts=%s, recurse_un=%s, recurse_del=%s, ndays=%s)",
-                 file_or_pattern, follow_links, follow_mounts, recurse_undeleted_subdirs,
-                 recurse_deleted_subdirs, n_days)
+    logger.debug("find_deleted_files(%s, links=%s, mounts=%s, recurse_un=%s, "
+                 "recurse_del=%s, ndays=%s)",
+                 file_or_pattern, follow_links, follow_mounts,
+                 recurse_undeleted_subdirs, recurse_deleted_subdirs, n_days)
     rv = []
     # In AFS, without tokens, this is very slow.  "Don't do that."
     # The old code called readdir() and lstat'd everything before following.
-    # The old code also re-implemented glob() with BREs, and we're not doing that.
+    # The old code also re-implemented glob() with BREs, and we're not doing
+    # that.
     file_list = glob.glob(file_or_pattern) + glob.glob('.#' + file_or_pattern)
     if len(file_list) == 0:
-        raise DeleteError("{0}: {1}".format(file_or_pattern,
-                                            "No match" if has_wildcards(file_or_pattern) else os.strerror(errno.ENOENT)))
+        raise DeleteError("{0}: {1}".format(
+            file_or_pattern,
+            "No match" if has_wildcards(file_or_pattern)
+            else os.strerror(errno.ENOENT)))
 
     for filename in file_list:
         logger.debug("Examining %s", filename)
@@ -166,21 +185,26 @@ def find_deleted_files(file_or_pattern, follow_links=False,
             if is_mountpoint(filename) and not follow_mounts:
                 logger.debug("Skipping mountpoint: %s", filename)
                 continue
-            if ((is_deleted(filename) and (recurse_deleted_subdirs != False)) or \
-                    (not is_deleted(filename) and (recurse_undeleted_subdirs != False))):
-                # NOTE: recurse_undeleted_subdirs is being abused as a tristate with 'None'
-                #       meaning "do it on the first time only.
+            if ((is_deleted(filename) and
+                 (recurse_deleted_subdirs is not False)) or
+                (not is_deleted(filename) and
+                 (recurse_undeleted_subdirs is not False))):
+                # NOTE: recurse_undeleted_subdirs is being abused as a tristate
+                #       with 'None' meaning "do it on the first time only.
                 logger.debug("Recursing into %sdeleted directory: %s",
                              "un" if not is_deleted(filename) else "",
                              filename)
                 try:
                     for item in dir_listing(filename):
                         # Escape metachars before recursing because filenames
                         # can in fact contain metacharacters.
-                        rv += find_deleted_files(escape_meta(item), follow_links, follow_mounts,
-                                                 False if recurse_undeleted_subdirs is None else recurse_undeleted_subdirs,
-                                                 False if recurse_deleted_subdirs is None else recurse_deleted_subdirs,
-                                                 n_days)
+                        rv += find_deleted_files(
+                            escape_meta(item), follow_links, follow_mounts,
+                            False if recurse_undeleted_subdirs is None
+                            else recurse_undeleted_subdirs,
+                            False if recurse_deleted_subdirs is None
+                            else recurse_deleted_subdirs,
+                            n_days)
                 except OSError as e:
                     perror('{filename}: {error}', filename=e.filename,
                            error=e.strerror)

lsdel

@@ -11,6 +11,7 @@ from libdelete import perror
 logger = logging.getLogger('lsdel')
 whoami = os.path.basename(sys.argv[0])
 
+
 def debug_callback(option, opt_str, value, parser):
     """
     An OptionParser callback that enables debugging.
@@ -26,6 +27,7 @@ def debug_callback(option, opt_str, value, parser):
     for l in loggers:
         logging.getLogger(l).setLevel(logging.DEBUG)
 
+
 def parse_options():
     parser = optparse.OptionParser(usage="%prog [options] filename ...")
     parser.add_option(
@@ -53,7 +55,8 @@ def parse_options():
         "-m", dest="f_mounts", action="store_true", default=False,
         help="Follow mount points")
     parser.add_option(
-        "--debug", action="callback", type='string', help="Enable debugging (logger target or 'all')",
+        "--debug", action="callback", type='string',
+        help="Enable debugging (logger target or 'all')",
         callback=debug_callback, metavar='target')
     (options, args) = parser.parse_args()
     if options.singlecolumn and options.multicolumn:
@@ -64,6 +67,7 @@ def parse_options():
     delattr(options, 'multicolumn')
     return (options, args)
 
+
 def main():
     rv = 0
     (options, args) = parse_options()
@@ -77,7 +81,7 @@ def main():
                 follow_links=options.f_links,
                 follow_mounts=options.f_mounts,
                 recurse_undeleted_subdirs=options.recursive or None,
-                recurse_deleted_subdirs= not options.dirsonly,
+                recurse_deleted_subdirs=not options.dirsonly,
                 n_days=options.timev)
         except libdelete.DeleteError as e:
             perror(e.message)
@@ -97,11 +101,14 @@ def main():
             rv = 1
 
         if total is None:
-            perror('Unable to display total size: errors occurred during calculation.')
+            perror('Unable to display total size: errors occurred during '
+                   'calculation.')
         else:
-            print "\nTotal space taken up by files: %dKB" % round((float(total) / 1024))
+            print("\nTotal space taken up by files: %dKB" %
+                  round((float(total) / 1024)))
     return rv
 
+
 if __name__ == "__main__":
     logging.basicConfig(level=logging.WARNING)
     sys.exit(main())