From 7cc2d57520cf33cae948b2eba9a240b976f1eb43 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 3 Oct 2021 14:11:43 -0500 Subject: [PATCH] ftp: use sys.exc_info(); import traceback unconditionally Since it appears that works across all the versions we support. Signed-off-by: Rob Browning Tested-by: Rob Browning --- lib/bup/cmd/ftp.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/bup/cmd/ftp.py b/lib/bup/cmd/ftp.py index 99121f0..8639230 100755 --- 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 @@ -84,11 +84,8 @@ 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 -- 2.39.2