Show More
@@ -88,7 +88,7 b' def main():' | |||||
88 | const='auto', help = \ |
|
88 | const='auto', help = \ | |
89 | "Pre-load matplotlib and numpy for interactive use. If GUI is not \ |
|
89 | "Pre-load matplotlib and numpy for interactive use. If GUI is not \ | |
90 | given, the GUI backend is matplotlib's, otherwise use one of: \ |
|
90 | given, the GUI backend is matplotlib's, otherwise use one of: \ | |
91 |
['tk', 'gtk', 'qt', 'wx', ' |
|
91 | ['tk', 'gtk', 'qt', 'wx', 'inline'].") | |
92 |
|
92 | |||
93 | wgroup = parser.add_argument_group('widget options') |
|
93 | wgroup = parser.add_argument_group('widget options') | |
94 | wgroup.add_argument('--paging', type=str, default='inside', |
|
94 | wgroup.add_argument('--paging', type=str, default='inside', |
@@ -28,7 +28,7 b" backends = {'tk': 'TkAgg'," | |||||
28 | 'wx': 'WXAgg', |
|
28 | 'wx': 'WXAgg', | |
29 | 'qt': 'Qt4Agg', # qt3 not supported |
|
29 | 'qt': 'Qt4Agg', # qt3 not supported | |
30 | 'qt4': 'Qt4Agg', |
|
30 | 'qt4': 'Qt4Agg', | |
31 |
' |
|
31 | 'inline' : 'module://IPython.zmq.pylab.backend_inline'} | |
32 |
|
32 | |||
33 | #----------------------------------------------------------------------------- |
|
33 | #----------------------------------------------------------------------------- | |
34 | # Main classes and functions |
|
34 | # Main classes and functions | |
@@ -41,12 +41,12 b' def find_gui_and_backend(gui=None):' | |||||
41 | Parameters |
|
41 | Parameters | |
42 | ---------- |
|
42 | ---------- | |
43 | gui : str |
|
43 | gui : str | |
44 |
Can be one of ('tk','gtk','wx','qt','qt4',' |
|
44 | Can be one of ('tk','gtk','wx','qt','qt4','inline'). | |
45 |
|
45 | |||
46 | Returns |
|
46 | Returns | |
47 | ------- |
|
47 | ------- | |
48 | A tuple of (gui, backend) where backend is one of ('TkAgg','GTKAgg', |
|
48 | A tuple of (gui, backend) where backend is one of ('TkAgg','GTKAgg', | |
49 |
'WXAgg','Qt4Agg','module://IPython.zmq.pylab.backend_ |
|
49 | 'WXAgg','Qt4Agg','module://IPython.zmq.pylab.backend_inline'). | |
50 | """ |
|
50 | """ | |
51 |
|
51 | |||
52 | import matplotlib |
|
52 | import matplotlib | |
@@ -108,11 +108,11 b' def import_pylab(user_ns, backend, import_all=True, shell=None):' | |||||
108 | # If using our svg payload backend, register the post-execution |
|
108 | # If using our svg payload backend, register the post-execution | |
109 | # function that will pick up the results for display. This can only be |
|
109 | # function that will pick up the results for display. This can only be | |
110 | # done with access to the real shell object. |
|
110 | # done with access to the real shell object. | |
111 |
if backend == backends[' |
|
111 | if backend == backends['inline']: | |
112 |
from IPython.zmq.pylab.backend_ |
|
112 | from IPython.zmq.pylab.backend_inline import flush_svg | |
113 | shell.register_post_execute(flush_svg) |
|
113 | shell.register_post_execute(flush_svg) | |
114 | else: |
|
114 | else: | |
115 |
from IPython.zmq.pylab.backend_ |
|
115 | from IPython.zmq.pylab.backend_inline import paste | |
116 | from matplotlib import pyplot |
|
116 | from matplotlib import pyplot | |
117 | # Add 'paste' to pyplot and to the user's namespace |
|
117 | # Add 'paste' to pyplot and to the user's namespace | |
118 | user_ns['paste'] = pyplot.paste = paste |
|
118 | user_ns['paste'] = pyplot.paste = paste |
@@ -550,7 +550,7 b' def main():' | |||||
550 | const='auto', help = \ |
|
550 | const='auto', help = \ | |
551 | "Pre-load matplotlib and numpy for interactive use. If GUI is not \ |
|
551 | "Pre-load matplotlib and numpy for interactive use. If GUI is not \ | |
552 | given, the GUI backend is matplotlib's, otherwise use one of: \ |
|
552 | given, the GUI backend is matplotlib's, otherwise use one of: \ | |
553 |
['tk', 'gtk', 'qt', 'wx', ' |
|
553 | ['tk', 'gtk', 'qt', 'wx', 'inline'].") | |
554 | namespace = parser.parse_args() |
|
554 | namespace = parser.parse_args() | |
555 |
|
555 | |||
556 | kernel_class = Kernel |
|
556 | kernel_class = Kernel | |
@@ -558,7 +558,7 b" given, the GUI backend is matplotlib's, otherwise use one of: \\" | |||||
558 | kernel_classes = { |
|
558 | kernel_classes = { | |
559 | 'qt' : QtKernel, |
|
559 | 'qt' : QtKernel, | |
560 | 'qt4': QtKernel, |
|
560 | 'qt4': QtKernel, | |
561 |
' |
|
561 | 'inline': Kernel, | |
562 | 'wx' : WxKernel, |
|
562 | 'wx' : WxKernel, | |
563 | 'tk' : TkKernel, |
|
563 | 'tk' : TkKernel, | |
564 | 'gtk': GTKKernel, |
|
564 | 'gtk': GTKKernel, |
1 | NO CONTENT: file renamed from IPython/zmq/pylab/backend_payload_svg.py to IPython/zmq/pylab/backend_inline.py |
|
NO CONTENT: file renamed from IPython/zmq/pylab/backend_payload_svg.py to IPython/zmq/pylab/backend_inline.py |
General Comments 0
You need to be logged in to leave comments.
Login now