make traceback line number frobbing smarter and make PYTHONSTARTUP execution happen after initialisation of repl to allow the repl to deal with any exceptions that may be raised in the file

bobf · bobf · commit 917471ca3b30 · 2009-12-29T21:28:28.000Z
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1548,6 +1548,8 @@ def main_curses(scr, args, config, interactive=True, locals_=None):
     sys.stdout = repl
     sys.stderr = repl
 
+    repl.startup()
+
     if args:
         with open(args[0], 'r') as sourcefile:
             code_obj = compile(sourcefile.read(), args[0], 'exec')
diff --git a/bpython/gtk_.py b/bpython/gtk_.py
@@ -629,6 +629,8 @@ def main(args=None):
     sys.stderr = repl_widget
     sys.stdout = repl_widget
 
+#    repl.startup()
+
     gobject.idle_add(init_import_completion)
 
     window = gtk.Window()
@@ -642,6 +644,7 @@ def main(args=None):
     window.add(sw)
     window.show_all()
     window.connect('delete-event', lambda widget, event: gtk.main_quit())
+
     gtk.main()
 
 
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -112,10 +112,10 @@ def showtraceback(self):
             tblist = traceback.extract_tb(tb)
             del tblist[:1]
             # Set the right lineno (encoding header adds an extra line)
-            lineno = tblist[0][1]
             if not py3:
-                lineno -= 1
-            tblist[0] = (tblist[0][0], lineno) + tblist[0][2:]
+                for i, (filename, lineno, module, something) in enumerate(tblist):
+                    if filename == '<input>':
+                        tblist[i] = (filename, lineno - 1, module, something)
 
             l = traceback.format_list(tblist)
             if l:
@@ -301,9 +301,11 @@ def __init__(self, interp, config, idle=None):
         if os.path.exists(pythonhist):
             self.rl_history.load(pythonhist, getpreferredencoding())
 
-# This was a feature request to have the PYTHONSTARTUP
-# file executed on startup - I personally don't use this
-# feature so please notify me of any breakage.
+    def startup(self):
+        """
+        Execute PYTHONSTARTUP file if it exits. Call this after front
+        end-specific initialisation.
+        """
         filename = os.environ.get('PYTHONSTARTUP')
         if filename and os.path.isfile(filename):
             with open(filename, 'r') as f:
