ftp: use sys.exc_info(); import traceback unconditionally

[bup.git] / lib / bup / cmd / ftp.py

diff --git a/lib/bup/cmd/ftp.py b/lib/bup/cmd/ftp.py
index 4694dd95bc596484e30da2e26924b3e12c6cab55..86392301016a798b4c4238ba92c1f78db9d2e173 100755 (executable)
--- a/lib/bup/cmd/ftp.py
+++ b/lib/bup/cmd/ftp.py
@@ -5,7 +5,7 @@
 # (e.g. ISO-8859-1).
 
 from __future__ import absolute_import, print_function
-import os, fnmatch, stat, sys
+import os, fnmatch, stat, sys, traceback
 
 from bup import _helpers, options, git, shquote, ls, vfs
 from bup.compat import argv_bytes
@@ -26,7 +26,7 @@ def do_ls(repo, pwd, args, out):
         opt = ls.opts_from_cmdline(args, onabort=OptionError, pwd=pwd_str)
     except OptionError as e:
         log('error: %s' % e)
-        return
+        return None
     return ls.within_repo(repo, opt, out, pwd_str)
 
 
@@ -84,12 +84,10 @@ def enter_completion(text, iteration):
             return text + ret
     except Exception as e:
         log('\n')
-        try:
-            import traceback
-            traceback.print_tb(sys.exc_traceback)
-        except Exception as e2:
-            log('Error printing traceback: %s\n' % e2)
+        _, _, tb = sys.exc_info()
+        traceback.print_tb(tb)
         log('\nError in completion: %s\n' % e)
+    return None
 
 
 optspec = """