Merged in _petronius/bpython (pull request #42)

sebastinas · sebastinas · commit 8d63eab68b97 · 2014-05-03T20:02:48.000+02:00
Fix Python 2.5 compatability (issue #279)
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -21,6 +21,7 @@
 # THE SOFTWARE.
 #
 
+from __future__ import with_statement
 import __builtin__
 import rlcompleter
 import re
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -1,3 +1,4 @@
+from __future__ import with_statement
 from __future__ import absolute_import
 
 import sys
@@ -66,7 +67,8 @@ def mainloop(config, locals_, banner, interp=None, paste=None):
                 def process_event(e):
                     try:
                         repl.process_event(e)
-                    except (SystemExitFromCodeGreenlet, SystemExit) as err:
+                    except (SystemExitFromCodeGreenlet, SystemExit):
+                        err = sys.exc_info()[1]
                         array, cursor_pos = repl.paint(about_to_exit=True, user_quit=isinstance(err, SystemExitFromCodeGreenlet))
                         scrolled = term.render_to_terminal(array, cursor_pos)
                         repl.scroll_offset += scrolled
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -1,3 +1,4 @@
+from __future__ import with_statement
 import code
 import contextlib
 import errno

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`# THE SOFTWARE.`
`22`	`22`	`#`
`23`	`23`
	`24`	`+from __future__ import with_statement`
`24`	`25`	`import __builtin__`
`25`	`26`	`import rlcompleter`
`26`	`27`	`import re`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+from __future__ import with_statement`
`1`	`2`	`import code`
`2`	`3`	`import contextlib`
`3`	`4`	`import errno`