Merge lp:~jelmer/bzr/rm-post-mortem-compat into lp:bzr

[Jelmer Vernooij]

Remove compatibility code for python 2.4 for post mortem.

Remove post-mortem compatibility code for bzr < 2.6.

[Martin Packman (gz)]

Suggest you also avoid binding the tb in the local frame:

             tb = exc_info[2]

And just pass it directly or post_mortem pick it out itself.

review: Approve

=== modified file 'bzrlib/commands.py'
--- bzrlib/commands.py	2012-03-13 17:25:29 +0000
+++ bzrlib/commands.py	2012-08-28 20:52:20 +0000
@@ -935,28 +935,8 @@
         exitcode = trace.report_exception(exc_info, sys.stderr)
         if os.environ.get('BZR_PDB'):
             print '**** entering debugger'
-            tb = exc_info[2]
             import pdb
-            if sys.version_info[:2] < (2, 6):
-                # XXX: we want to do
-                #    pdb.post_mortem(tb)
-                # but because pdb.post_mortem gives bad results for tracebacks
-                # from inside generators, we do it manually.
-                # (http://bugs.python.org/issue4150, fixed in Python 2.6)
-
-                # Setup pdb on the traceback
-                p = pdb.Pdb()
-                p.reset()
-                p.setup(tb.tb_frame, tb)
-                # Point the debugger at the deepest frame of the stack
-                p.curindex = len(p.stack) - 1
-                p.curframe = p.stack[p.curindex][0]
-                # Start the pdb prompt.
-                p.print_stack_entry(p.stack[p.curindex])
-                p.execRcLines()
-                p.cmdloop()
-            else:
-                pdb.post_mortem(tb)
+            pdb.post_mortem(exc_info[2])
         return exitcode