Git: Ignore two more generated files

[bup.git] / main.py

diff --git a/main.py b/main.py
index ef229571714926cfb41b09f0448d94e595e628e9..ecc975fed5d274b7550f5b25a8aa9eaf7e18a0cd 100755 (executable)
--- a/main.py
+++ b/main.py
@@ -7,6 +7,7 @@ exec "$bup_python" "$0" ${1+"$@"}
 
 import sys, os, subprocess, signal, getopt
 
+
 argv = sys.argv
 exe = os.path.realpath(argv[0])
 exepath = os.path.split(exe)[0] or '.'
@@ -29,8 +30,10 @@ os.environ['PYTHONPATH'] = libpath + ':' + os.environ.get('PYTHONPATH', '')
 os.environ['BUP_MAIN_EXE'] = os.path.abspath(exe)
 os.environ['BUP_RESOURCE_PATH'] = resourcepath
 
+
 from bup import helpers
-from bup.helpers import *
+from bup.helpers import atoi, columnate, debug1, log, tty_width
+
 
 # after running 'bup newliner', the tty_width() ioctl won't work anymore
 os.environ['WIDTH'] = str(tty_width())
@@ -80,7 +83,7 @@ if len(argv) < 2:
 try:
     optspec = ['help', 'version', 'debug', 'profile', 'bup-dir=']
     global_args, subcmd = getopt.getopt(argv[1:], '?VDd:', optspec)
-except getopt.GetoptError, ex:
+except getopt.GetoptError as ex:
     usage('error: %s' % ex.msg)
 
 help_requested = None
@@ -195,7 +198,7 @@ try:
             ret = p.wait()
             forward_signals = False
             break
-    except OSError, e:
+    except OSError as e:
         log('%s: %s\n' % (subcmd[0], e))
         ret = 98
 finally: