Define perror once in libdelete.py rather than everywhere

Author: Jonathan Kamens

delete

@@ -11,6 +11,7 @@ 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):
     """
@@ -40,17 +41,6 @@ def ask(question, *args, **kwargs):
     except KeyboardInterrupt:
         sys.exit(0)
 
-def perror(message, **kwargs):
-    """
-    Format an error message, log it in the debug log
-    and maybe also print it to stderr.
-    """
-    should_print = kwargs.pop('_maybe', False)
-    msg = "{0}: {1}".format(whoami, message.format(**kwargs))
-    logger.debug("Error: %s", msg)
-    if should_print:
-        print >>sys.stderr, msg
-
 def actually_delete(filename, options):
     """
     Actually delete the file.

expunge

@@ -6,6 +6,7 @@ import os
 import sys
 
 import libdelete
+from libdelete import perror
 
 header = "The following deleted files are going to be expunged:\n"
 footer = """
@@ -45,17 +46,6 @@ def ask(question, *args, **kwargs):
     except KeyboardInterrupt:
         sys.exit(0)
 
-def perror(message, **kwargs):
-    """
-    Format an error message, log it in the debug log
-    and maybe also print it to stderr.
-    """
-    should_print = not kwargs.pop('_maybe', False)
-    msg = "{0}: {1}".format(whoami, message.format(**kwargs))
-    logger.debug("Error: %s", msg)
-    if should_print:
-        print >>sys.stderr, msg
-
 def getsize(path):
     size = os.path.getsize(path)
     return (size, "(%dKB)" % (libdelete.to_kb(size),))

libdelete.py

@@ -16,10 +16,22 @@
 
 logger = logging.getLogger('libdelete')
 _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
+    and maybe also print it to stderr.
+    """
+    should_print = kwargs.pop('_maybe', False)
+    msg = "{0}: {1}".format(whoami, message.format(**kwargs))
+    logger.debug("Error: %s", msg)
+    if should_print:
+        print >>sys.stderr, msg
+
 def chunks(seq, size):
     """
     Break a sequence up into size chunks

lsdel

@@ -6,6 +6,7 @@ import os
 import sys
 
 import libdelete
+from libdelete import perror
 
 logger = logging.getLogger('lsdel')
 whoami = os.path.basename(sys.argv[0])
@@ -25,17 +26,6 @@ def debug_callback(option, opt_str, value, parser):
     for l in loggers:
         logging.getLogger(l).setLevel(logging.DEBUG)
 
-def perror(message, **kwargs):
-    """
-    Format an error message, log it in the debug log
-    and maybe also print it to stderr.
-    """
-    should_print = not kwargs.pop('_maybe', False)
-    msg = "{0}: {1}".format(whoami, message.format(**kwargs))
-    logger.debug("Error: %s", msg)
-    if should_print:
-        print >>sys.stderr, msg
-
 def parse_options():
     parser = optparse.OptionParser(usage="%prog [options] filename ...")
     parser.add_option(

undelete

@@ -8,6 +8,7 @@ import stat
 import sys
 
 import libdelete
+from libdelete import perror
 
 logger = logging.getLogger('undelete')
 whoami = os.path.basename(sys.argv[0])
@@ -40,17 +41,6 @@ def ask(question, *args, **kwargs):
     except KeyboardInterrupt:
         sys.exit(0)
 
-def perror(message, **kwargs):
-    """
-    Format an error message, log it in the debug log
-    and maybe also print it to stderr.
-    """
-    should_print = kwargs.pop('_maybe', False)
-    msg = "{0}: {1}".format(whoami, message.format(**kwargs))
-    logger.debug("Error: %s", msg)
-    if should_print:
-        print >>sys.stderr, msg
-
 def actually_undelete(filename, options):
     undeleted_name = libdelete.undeleted_name(filename)
     logger.debug("actually_undelete(%s)", filename)