Show More
@@ -1,7 +1,7 b'' | |||||
1 | # -*- coding: utf-8 -*- |
|
1 | # -*- coding: utf-8 -*- | |
2 | """Release data for the IPython project. |
|
2 | """Release data for the IPython project. | |
3 |
|
3 | |||
4 |
$Id: Release.py 6 |
|
4 | $Id: Release.py 634 2005-07-17 01:56:45Z tzanko $""" | |
5 |
|
5 | |||
6 | #***************************************************************************** |
|
6 | #***************************************************************************** | |
7 | # Copyright (C) 2001-2005 Fernando Perez <fperez@colorado.edu> |
|
7 | # Copyright (C) 2001-2005 Fernando Perez <fperez@colorado.edu> | |
@@ -19,7 +19,7 b" name = 'ipython'" | |||||
19 |
|
19 | |||
20 | # For versions with substrings (like 0.6.7_rc1), use _ but NOT -, since |
|
20 | # For versions with substrings (like 0.6.7_rc1), use _ but NOT -, since | |
21 | # bdist_rpm chokes on dashes in the version string. |
|
21 | # bdist_rpm chokes on dashes in the version string. | |
22 |
version = '0.6.16_ |
|
22 | version = '0.6.16_svn' | |
23 |
|
23 | |||
24 | description = "An enhanced interactive Python shell." |
|
24 | description = "An enhanced interactive Python shell." | |
25 |
|
25 |
@@ -4,7 +4,7 b'' | |||||
4 | All the matplotlib support code was co-developed with John Hunter, |
|
4 | All the matplotlib support code was co-developed with John Hunter, | |
5 | matplotlib's author. |
|
5 | matplotlib's author. | |
6 |
|
6 | |||
7 |
$Id: Shell.py 6 |
|
7 | $Id: Shell.py 634 2005-07-17 01:56:45Z tzanko $""" | |
8 |
|
8 | |||
9 | #***************************************************************************** |
|
9 | #***************************************************************************** | |
10 | # Copyright (C) 2001-2004 Fernando Perez <fperez@colorado.edu> |
|
10 | # Copyright (C) 2001-2004 Fernando Perez <fperez@colorado.edu> | |
@@ -400,15 +400,6 b' class MatplotlibShellBase:' | |||||
400 | self.mpl_use._called = True |
|
400 | self.mpl_use._called = True | |
401 |
|
401 | |||
402 | self.matplotlib = matplotlib |
|
402 | self.matplotlib = matplotlib | |
403 |
|
||||
404 | # Take control of matplotlib's error handling, which can normally |
|
|||
405 | # lock up the python interpreter when raw_input() is called |
|
|||
406 | import matplotlib.backends as backend |
|
|||
407 | backend.error_msg = error |
|
|||
408 |
|
||||
409 | # we'll handle the mainloop, tell show not to |
|
|||
410 | import matplotlib.backends |
|
|||
411 | matplotlib.backends.show._needmain = False |
|
|||
412 | self.mpl_backend = matplotlib.rcParams['backend'] |
|
403 | self.mpl_backend = matplotlib.rcParams['backend'] | |
413 |
|
404 | |||
414 | # we also need to block switching of interactive backends by use() |
|
405 | # we also need to block switching of interactive backends by use() | |
@@ -417,9 +408,6 b' class MatplotlibShellBase:' | |||||
417 | # overwrite the original matplotlib.use with our wrapper |
|
408 | # overwrite the original matplotlib.use with our wrapper | |
418 | matplotlib.use = use |
|
409 | matplotlib.use = use | |
419 |
|
410 | |||
420 | # We need to detect at runtime whether show() is called by the user. |
|
|||
421 | # For this, we wrap it into a decorator which adds a 'called' flag. |
|
|||
422 | backend.draw_if_interactive = flag_calls(backend.draw_if_interactive) |
|
|||
423 |
|
411 | |||
424 | # This must be imported last in the matplotlib series, after |
|
412 | # This must be imported last in the matplotlib series, after | |
425 | # backend/interactivity choices have been made |
|
413 | # backend/interactivity choices have been made | |
@@ -432,6 +420,11 b' class MatplotlibShellBase:' | |||||
432 | self.pylab = matlab |
|
420 | self.pylab = matlab | |
433 | self.pylab_name = 'matlab' |
|
421 | self.pylab_name = 'matlab' | |
434 |
|
422 | |||
|
423 | self.pylab.show._needmain = False | |||
|
424 | # We need to detect at runtime whether show() is called by the user. | |||
|
425 | # For this, we wrap it into a decorator which adds a 'called' flag. | |||
|
426 | self.pylab.draw_if_interactive = flag_calls(self.pylab.draw_if_interactive) | |||
|
427 | ||||
435 | # Build a user namespace initialized with matplotlib/matlab features. |
|
428 | # Build a user namespace initialized with matplotlib/matlab features. | |
436 | user_ns = {'__name__':'__main__', |
|
429 | user_ns = {'__name__':'__main__', | |
437 | '__builtins__' : __builtin__ } |
|
430 | '__builtins__' : __builtin__ } |
General Comments 0
You need to be logged in to leave comments.
Login now