##// END OF EJS Templates
do not crash on exit() with py2.5
vivainio -
Show More
@@ -6,7 +6,7 b' Requires Python 2.3 or newer.'
6
6
7 This file contains all the classes and helper functions specific to IPython.
7 This file contains all the classes and helper functions specific to IPython.
8
8
9 $Id: iplib.py 1478 2006-07-26 14:20:44Z vivainio $
9 $Id: iplib.py 1785 2006-09-26 21:08:22Z vivainio $
10 """
10 """
11
11
12 #*****************************************************************************
12 #*****************************************************************************
@@ -1740,7 +1740,7 b' want to merge them back into the new files.""" % locals()'
1740 except SystemExit:
1740 except SystemExit:
1741 self.resetbuffer()
1741 self.resetbuffer()
1742 self.showtraceback()
1742 self.showtraceback()
1743 warn("Type exit or quit to exit IPython "
1743 warn("Type %exit or %quit to exit IPython "
1744 "(%Exit or %Quit do so unconditionally).",level=1)
1744 "(%Exit or %Quit do so unconditionally).",level=1)
1745 except self.custom_exceptions:
1745 except self.custom_exceptions:
1746 etype,value,tb = sys.exc_info()
1746 etype,value,tb = sys.exc_info()
@@ -1801,7 +1801,14 b' want to merge them back into the new files.""" % locals()'
1801 continuation in a sequence of inputs.
1801 continuation in a sequence of inputs.
1802 """
1802 """
1803
1803
1804 line = raw_input_original(prompt)
1804 try:
1805 line = raw_input_original(prompt)
1806 except ValueError:
1807 # python 2.5 closes stdin on exit -> ValueError
1808 # xxx should we delete 'exit' and 'quit' from builtin?
1809 self.exit_now = True
1810 return ''
1811
1805
1812
1806 # Try to be reasonably smart about not re-indenting pasted input more
1813 # Try to be reasonably smart about not re-indenting pasted input more
1807 # than necessary. We do this by trimming out the auto-indent initial
1814 # than necessary. We do this by trimming out the auto-indent initial
@@ -1,3 +1,8 b''
1 2006-09-27 Ville Vainio <vivainio@gmail.com>
2
3 * iplib.py (raw_input): python 2.5 closes stdin on quit -> avoid
4 infinite loop and just exit. It's a hack, but will do for a while.
5
1 2006-08-25 Walter Doerwald <walter@livinglogic.de>
6 2006-08-25 Walter Doerwald <walter@livinglogic.de>
2
7
3 * IPython/Extensions/ipipe.py (ils): Add arguments dirs and files to
8 * IPython/Extensions/ipipe.py (ils): Add arguments dirs and files to
General Comments 0
You need to be logged in to leave comments. Login now