lsdel and expunge shouldn't output extra blank lines

When lsdel and expunge list files they shouldn't output a blank line
when there are no files to list.

Author: Jonathan Kamens

expunge

@@ -43,9 +43,10 @@ def expunge(deleted_files, options):
     errors = 0
     if options.listfiles:
         print header
-        print libdelete.format_columns(sorted(
+        sys.stdout.write(libdelete.format_columns(
+            sorted(
                 [libdelete.relpath(
-                        libdelete.undeleted_name(x)) for x in deleted_files]))
+                    libdelete.undeleted_name(x)) for x in deleted_files])))
         print footer
         if not options.force and \
                 not ask(confirmation, nowhoami=True):

libdelete.py

@@ -79,7 +79,7 @@ def format_columns(items, singlecol=False, width=80):
     rv = []
     for c in chunks(items, n_cols):
         rv.append("".join(item.ljust(col_width + padding) for item in c))
-    return "\n".join(rv)
+    return "\n".join(rv) + "\n" if rv else ""
 
 
 def have_AFS():

lsdel

@@ -71,10 +71,12 @@ def main():
             perror(e.message)
             rv = 1
 
-    print libdelete.format_columns(sorted(
+    sys.stdout.write(libdelete.format_columns(
+        sorted(
             [libdelete.relpath(
-                    libdelete.undeleted_name(x)) for x in deleted_files]),
-                                   options.singlecolumn)
+                libdelete.undeleted_name(x)) for x in deleted_files]),
+        options.singlecolumn))
+
     if options.yieldsize:
         total = None
         try: