Show More
@@ -1,402 +1,405 b'' | |||||
1 | #!/usr/bin/env python |
|
1 | #!/usr/bin/env python | |
2 | # encoding: utf-8 |
|
2 | # encoding: utf-8 | |
3 | """ |
|
3 | """ | |
4 | The :class:`~IPython.core.application.Application` object for the command |
|
4 | The :class:`~IPython.core.application.Application` object for the command | |
5 | line :command:`ipython` program. |
|
5 | line :command:`ipython` program. | |
6 |
|
6 | |||
7 | Authors |
|
7 | Authors | |
8 | ------- |
|
8 | ------- | |
9 |
|
9 | |||
10 | * Brian Granger |
|
10 | * Brian Granger | |
11 | * Fernando Perez |
|
11 | * Fernando Perez | |
12 | * Min Ragan-Kelley |
|
12 | * Min Ragan-Kelley | |
13 | """ |
|
13 | """ | |
14 |
|
14 | |||
15 | #----------------------------------------------------------------------------- |
|
15 | #----------------------------------------------------------------------------- | |
16 | # Copyright (C) 2008-2011 The IPython Development Team |
|
16 | # Copyright (C) 2008-2011 The IPython Development Team | |
17 | # |
|
17 | # | |
18 | # Distributed under the terms of the BSD License. The full license is in |
|
18 | # Distributed under the terms of the BSD License. The full license is in | |
19 | # the file COPYING, distributed as part of this software. |
|
19 | # the file COPYING, distributed as part of this software. | |
20 | #----------------------------------------------------------------------------- |
|
20 | #----------------------------------------------------------------------------- | |
21 |
|
21 | |||
22 | #----------------------------------------------------------------------------- |
|
22 | #----------------------------------------------------------------------------- | |
23 | # Imports |
|
23 | # Imports | |
24 | #----------------------------------------------------------------------------- |
|
24 | #----------------------------------------------------------------------------- | |
25 |
|
25 | |||
26 | from __future__ import absolute_import |
|
26 | from __future__ import absolute_import | |
27 |
|
27 | |||
28 | import logging |
|
28 | import logging | |
29 | import os |
|
29 | import os | |
30 | import sys |
|
30 | import sys | |
31 |
|
31 | |||
32 | from IPython.config.loader import ( |
|
32 | from IPython.config.loader import ( | |
33 | Config, PyFileConfigLoader, ConfigFileNotFound |
|
33 | Config, PyFileConfigLoader, ConfigFileNotFound | |
34 | ) |
|
34 | ) | |
35 | from IPython.config.application import boolean_flag, catch_config_error |
|
35 | from IPython.config.application import boolean_flag, catch_config_error | |
36 | from IPython.core import release |
|
36 | from IPython.core import release | |
37 | from IPython.core import usage |
|
37 | from IPython.core import usage | |
38 | from IPython.core.completer import IPCompleter |
|
38 | from IPython.core.completer import IPCompleter | |
39 | from IPython.core.crashhandler import CrashHandler |
|
39 | from IPython.core.crashhandler import CrashHandler | |
40 | from IPython.core.formatters import PlainTextFormatter |
|
40 | from IPython.core.formatters import PlainTextFormatter | |
41 | from IPython.core.prompts import PromptManager |
|
41 | from IPython.core.prompts import PromptManager | |
42 | from IPython.core.application import ( |
|
42 | from IPython.core.application import ( | |
43 | ProfileDir, BaseIPythonApplication, base_flags, base_aliases |
|
43 | ProfileDir, BaseIPythonApplication, base_flags, base_aliases | |
44 | ) |
|
44 | ) | |
45 | from IPython.core.shellapp import ( |
|
45 | from IPython.core.shellapp import ( | |
46 | InteractiveShellApp, shell_flags, shell_aliases |
|
46 | InteractiveShellApp, shell_flags, shell_aliases | |
47 | ) |
|
47 | ) | |
48 | from IPython.frontend.terminal.interactiveshell import TerminalInteractiveShell |
|
48 | from IPython.frontend.terminal.interactiveshell import TerminalInteractiveShell | |
49 | from IPython.lib import inputhook |
|
49 | from IPython.lib import inputhook | |
50 | from IPython.utils import warn |
|
50 | from IPython.utils import warn | |
51 | from IPython.utils.path import get_ipython_dir, check_for_old_config |
|
51 | from IPython.utils.path import get_ipython_dir, check_for_old_config | |
52 | from IPython.utils.traitlets import ( |
|
52 | from IPython.utils.traitlets import ( | |
53 | Bool, List, Dict, CaselessStrEnum |
|
53 | Bool, List, Dict, CaselessStrEnum | |
54 | ) |
|
54 | ) | |
55 |
|
55 | |||
56 | #----------------------------------------------------------------------------- |
|
56 | #----------------------------------------------------------------------------- | |
57 | # Globals, utilities and helpers |
|
57 | # Globals, utilities and helpers | |
58 | #----------------------------------------------------------------------------- |
|
58 | #----------------------------------------------------------------------------- | |
59 |
|
59 | |||
60 | #: The default config file name for this application. |
|
60 | #: The default config file name for this application. | |
61 | default_config_file_name = u'ipython_config.py' |
|
61 | default_config_file_name = u'ipython_config.py' | |
62 |
|
62 | |||
63 | _examples = """ |
|
63 | _examples = """ | |
64 | ipython --pylab # start in pylab mode |
|
64 | ipython --pylab # start in pylab mode | |
65 | ipython --pylab=qt # start in pylab mode with the qt4 backend |
|
65 | ipython --pylab=qt # start in pylab mode with the qt4 backend | |
66 | ipython --log-level=DEBUG # set logging to DEBUG |
|
66 | ipython --log-level=DEBUG # set logging to DEBUG | |
67 | ipython --profile=foo # start with profile foo |
|
67 | ipython --profile=foo # start with profile foo | |
68 |
|
68 | |||
69 | ipython qtconsole # start the qtconsole GUI application |
|
69 | ipython qtconsole # start the qtconsole GUI application | |
70 | ipython qtconsole -h # show the help string for the qtconsole subcmd |
|
70 | ipython qtconsole -h # show the help string for the qtconsole subcmd | |
71 |
|
71 | |||
|
72 | ipython console # start the terminal-based console application | |||
|
73 | ipython console -h # show the help string for the console subcmd | |||
|
74 | ||||
72 | ipython profile create foo # create profile foo w/ default config files |
|
75 | ipython profile create foo # create profile foo w/ default config files | |
73 | ipython profile -h # show the help string for the profile subcmd |
|
76 | ipython profile -h # show the help string for the profile subcmd | |
74 | """ |
|
77 | """ | |
75 |
|
78 | |||
76 | #----------------------------------------------------------------------------- |
|
79 | #----------------------------------------------------------------------------- | |
77 | # Crash handler for this application |
|
80 | # Crash handler for this application | |
78 | #----------------------------------------------------------------------------- |
|
81 | #----------------------------------------------------------------------------- | |
79 |
|
82 | |||
80 | class IPAppCrashHandler(CrashHandler): |
|
83 | class IPAppCrashHandler(CrashHandler): | |
81 | """sys.excepthook for IPython itself, leaves a detailed report on disk.""" |
|
84 | """sys.excepthook for IPython itself, leaves a detailed report on disk.""" | |
82 |
|
85 | |||
83 | def __init__(self, app): |
|
86 | def __init__(self, app): | |
84 | contact_name = release.authors['Fernando'][0] |
|
87 | contact_name = release.authors['Fernando'][0] | |
85 | contact_email = release.author_email |
|
88 | contact_email = release.author_email | |
86 | bug_tracker = 'https://github.com/ipython/ipython/issues' |
|
89 | bug_tracker = 'https://github.com/ipython/ipython/issues' | |
87 | super(IPAppCrashHandler,self).__init__( |
|
90 | super(IPAppCrashHandler,self).__init__( | |
88 | app, contact_name, contact_email, bug_tracker |
|
91 | app, contact_name, contact_email, bug_tracker | |
89 | ) |
|
92 | ) | |
90 |
|
93 | |||
91 | def make_report(self,traceback): |
|
94 | def make_report(self,traceback): | |
92 | """Return a string containing a crash report.""" |
|
95 | """Return a string containing a crash report.""" | |
93 |
|
96 | |||
94 | sec_sep = self.section_sep |
|
97 | sec_sep = self.section_sep | |
95 | # Start with parent report |
|
98 | # Start with parent report | |
96 | report = [super(IPAppCrashHandler, self).make_report(traceback)] |
|
99 | report = [super(IPAppCrashHandler, self).make_report(traceback)] | |
97 | # Add interactive-specific info we may have |
|
100 | # Add interactive-specific info we may have | |
98 | rpt_add = report.append |
|
101 | rpt_add = report.append | |
99 | try: |
|
102 | try: | |
100 | rpt_add(sec_sep+"History of session input:") |
|
103 | rpt_add(sec_sep+"History of session input:") | |
101 | for line in self.app.shell.user_ns['_ih']: |
|
104 | for line in self.app.shell.user_ns['_ih']: | |
102 | rpt_add(line) |
|
105 | rpt_add(line) | |
103 | rpt_add('\n*** Last line of input (may not be in above history):\n') |
|
106 | rpt_add('\n*** Last line of input (may not be in above history):\n') | |
104 | rpt_add(self.app.shell._last_input_line+'\n') |
|
107 | rpt_add(self.app.shell._last_input_line+'\n') | |
105 | except: |
|
108 | except: | |
106 | pass |
|
109 | pass | |
107 |
|
110 | |||
108 | return ''.join(report) |
|
111 | return ''.join(report) | |
109 |
|
112 | |||
110 | #----------------------------------------------------------------------------- |
|
113 | #----------------------------------------------------------------------------- | |
111 | # Aliases and Flags |
|
114 | # Aliases and Flags | |
112 | #----------------------------------------------------------------------------- |
|
115 | #----------------------------------------------------------------------------- | |
113 | flags = dict(base_flags) |
|
116 | flags = dict(base_flags) | |
114 | flags.update(shell_flags) |
|
117 | flags.update(shell_flags) | |
115 | addflag = lambda *args: flags.update(boolean_flag(*args)) |
|
118 | addflag = lambda *args: flags.update(boolean_flag(*args)) | |
116 | addflag('autoedit-syntax', 'TerminalInteractiveShell.autoedit_syntax', |
|
119 | addflag('autoedit-syntax', 'TerminalInteractiveShell.autoedit_syntax', | |
117 | 'Turn on auto editing of files with syntax errors.', |
|
120 | 'Turn on auto editing of files with syntax errors.', | |
118 | 'Turn off auto editing of files with syntax errors.' |
|
121 | 'Turn off auto editing of files with syntax errors.' | |
119 | ) |
|
122 | ) | |
120 | addflag('banner', 'TerminalIPythonApp.display_banner', |
|
123 | addflag('banner', 'TerminalIPythonApp.display_banner', | |
121 | "Display a banner upon starting IPython.", |
|
124 | "Display a banner upon starting IPython.", | |
122 | "Don't display a banner upon starting IPython." |
|
125 | "Don't display a banner upon starting IPython." | |
123 | ) |
|
126 | ) | |
124 | addflag('confirm-exit', 'TerminalInteractiveShell.confirm_exit', |
|
127 | addflag('confirm-exit', 'TerminalInteractiveShell.confirm_exit', | |
125 | """Set to confirm when you try to exit IPython with an EOF (Control-D |
|
128 | """Set to confirm when you try to exit IPython with an EOF (Control-D | |
126 | in Unix, Control-Z/Enter in Windows). By typing 'exit' or 'quit', |
|
129 | in Unix, Control-Z/Enter in Windows). By typing 'exit' or 'quit', | |
127 | you can force a direct exit without any confirmation.""", |
|
130 | you can force a direct exit without any confirmation.""", | |
128 | "Don't prompt the user when exiting." |
|
131 | "Don't prompt the user when exiting." | |
129 | ) |
|
132 | ) | |
130 | addflag('term-title', 'TerminalInteractiveShell.term_title', |
|
133 | addflag('term-title', 'TerminalInteractiveShell.term_title', | |
131 | "Enable auto setting the terminal title.", |
|
134 | "Enable auto setting the terminal title.", | |
132 | "Disable auto setting the terminal title." |
|
135 | "Disable auto setting the terminal title." | |
133 | ) |
|
136 | ) | |
134 | classic_config = Config() |
|
137 | classic_config = Config() | |
135 | classic_config.InteractiveShell.cache_size = 0 |
|
138 | classic_config.InteractiveShell.cache_size = 0 | |
136 | classic_config.PlainTextFormatter.pprint = False |
|
139 | classic_config.PlainTextFormatter.pprint = False | |
137 | classic_config.PromptManager.in_template = '>>> ' |
|
140 | classic_config.PromptManager.in_template = '>>> ' | |
138 | classic_config.PromptManager.in2_template = '... ' |
|
141 | classic_config.PromptManager.in2_template = '... ' | |
139 | classic_config.PromptManager.out_template = '' |
|
142 | classic_config.PromptManager.out_template = '' | |
140 | classic_config.InteractiveShell.separate_in = '' |
|
143 | classic_config.InteractiveShell.separate_in = '' | |
141 | classic_config.InteractiveShell.separate_out = '' |
|
144 | classic_config.InteractiveShell.separate_out = '' | |
142 | classic_config.InteractiveShell.separate_out2 = '' |
|
145 | classic_config.InteractiveShell.separate_out2 = '' | |
143 | classic_config.InteractiveShell.colors = 'NoColor' |
|
146 | classic_config.InteractiveShell.colors = 'NoColor' | |
144 | classic_config.InteractiveShell.xmode = 'Plain' |
|
147 | classic_config.InteractiveShell.xmode = 'Plain' | |
145 |
|
148 | |||
146 | flags['classic']=( |
|
149 | flags['classic']=( | |
147 | classic_config, |
|
150 | classic_config, | |
148 | "Gives IPython a similar feel to the classic Python prompt." |
|
151 | "Gives IPython a similar feel to the classic Python prompt." | |
149 | ) |
|
152 | ) | |
150 | # # log doesn't make so much sense this way anymore |
|
153 | # # log doesn't make so much sense this way anymore | |
151 | # paa('--log','-l', |
|
154 | # paa('--log','-l', | |
152 | # action='store_true', dest='InteractiveShell.logstart', |
|
155 | # action='store_true', dest='InteractiveShell.logstart', | |
153 | # help="Start logging to the default log file (./ipython_log.py).") |
|
156 | # help="Start logging to the default log file (./ipython_log.py).") | |
154 | # |
|
157 | # | |
155 | # # quick is harder to implement |
|
158 | # # quick is harder to implement | |
156 | flags['quick']=( |
|
159 | flags['quick']=( | |
157 | {'TerminalIPythonApp' : {'quick' : True}}, |
|
160 | {'TerminalIPythonApp' : {'quick' : True}}, | |
158 | "Enable quick startup with no config files." |
|
161 | "Enable quick startup with no config files." | |
159 | ) |
|
162 | ) | |
160 |
|
163 | |||
161 | flags['i'] = ( |
|
164 | flags['i'] = ( | |
162 | {'TerminalIPythonApp' : {'force_interact' : True}}, |
|
165 | {'TerminalIPythonApp' : {'force_interact' : True}}, | |
163 | """If running code from the command line, become interactive afterwards. |
|
166 | """If running code from the command line, become interactive afterwards. | |
164 | Note: can also be given simply as '-i.'""" |
|
167 | Note: can also be given simply as '-i.'""" | |
165 | ) |
|
168 | ) | |
166 | flags['pylab'] = ( |
|
169 | flags['pylab'] = ( | |
167 | {'TerminalIPythonApp' : {'pylab' : 'auto'}}, |
|
170 | {'TerminalIPythonApp' : {'pylab' : 'auto'}}, | |
168 | """Pre-load matplotlib and numpy for interactive use with |
|
171 | """Pre-load matplotlib and numpy for interactive use with | |
169 | the default matplotlib backend.""" |
|
172 | the default matplotlib backend.""" | |
170 | ) |
|
173 | ) | |
171 |
|
174 | |||
172 | aliases = dict(base_aliases) |
|
175 | aliases = dict(base_aliases) | |
173 | aliases.update(shell_aliases) |
|
176 | aliases.update(shell_aliases) | |
174 |
|
177 | |||
175 | # it's possible we don't want short aliases for *all* of these: |
|
178 | # it's possible we don't want short aliases for *all* of these: | |
176 | aliases.update(dict( |
|
179 | aliases.update(dict( | |
177 | gui='TerminalIPythonApp.gui', |
|
180 | gui='TerminalIPythonApp.gui', | |
178 | pylab='TerminalIPythonApp.pylab', |
|
181 | pylab='TerminalIPythonApp.pylab', | |
179 | )) |
|
182 | )) | |
180 |
|
183 | |||
181 | #----------------------------------------------------------------------------- |
|
184 | #----------------------------------------------------------------------------- | |
182 | # Main classes and functions |
|
185 | # Main classes and functions | |
183 | #----------------------------------------------------------------------------- |
|
186 | #----------------------------------------------------------------------------- | |
184 |
|
187 | |||
185 | class TerminalIPythonApp(BaseIPythonApplication, InteractiveShellApp): |
|
188 | class TerminalIPythonApp(BaseIPythonApplication, InteractiveShellApp): | |
186 | name = u'ipython' |
|
189 | name = u'ipython' | |
187 | description = usage.cl_usage |
|
190 | description = usage.cl_usage | |
188 | default_config_file_name = default_config_file_name |
|
191 | default_config_file_name = default_config_file_name | |
189 | crash_handler_class = IPAppCrashHandler |
|
192 | crash_handler_class = IPAppCrashHandler | |
190 | examples = _examples |
|
193 | examples = _examples | |
191 |
|
194 | |||
192 | flags = Dict(flags) |
|
195 | flags = Dict(flags) | |
193 | aliases = Dict(aliases) |
|
196 | aliases = Dict(aliases) | |
194 | classes = List() |
|
197 | classes = List() | |
195 | def _classes_default(self): |
|
198 | def _classes_default(self): | |
196 | """This has to be in a method, for TerminalIPythonApp to be available.""" |
|
199 | """This has to be in a method, for TerminalIPythonApp to be available.""" | |
197 | return [ |
|
200 | return [ | |
198 | InteractiveShellApp, # ShellApp comes before TerminalApp, because |
|
201 | InteractiveShellApp, # ShellApp comes before TerminalApp, because | |
199 | self.__class__, # it will also affect subclasses (e.g. QtConsole) |
|
202 | self.__class__, # it will also affect subclasses (e.g. QtConsole) | |
200 | TerminalInteractiveShell, |
|
203 | TerminalInteractiveShell, | |
201 | PromptManager, |
|
204 | PromptManager, | |
202 | ProfileDir, |
|
205 | ProfileDir, | |
203 | PlainTextFormatter, |
|
206 | PlainTextFormatter, | |
204 | IPCompleter, |
|
207 | IPCompleter, | |
205 | ] |
|
208 | ] | |
206 |
|
209 | |||
207 | subcommands = Dict(dict( |
|
210 | subcommands = Dict(dict( | |
208 | qtconsole=('IPython.frontend.qt.console.qtconsoleapp.IPythonQtConsoleApp', |
|
211 | qtconsole=('IPython.frontend.qt.console.qtconsoleapp.IPythonQtConsoleApp', | |
209 | """Launch the IPython Qt Console.""" |
|
212 | """Launch the IPython Qt Console.""" | |
210 | ), |
|
213 | ), | |
211 | notebook=('IPython.frontend.html.notebook.notebookapp.NotebookApp', |
|
214 | notebook=('IPython.frontend.html.notebook.notebookapp.NotebookApp', | |
212 | """Launch the IPython HTML Notebook Server""" |
|
215 | """Launch the IPython HTML Notebook Server.""" | |
213 | ), |
|
216 | ), | |
214 | profile = ("IPython.core.profileapp.ProfileApp", |
|
217 | profile = ("IPython.core.profileapp.ProfileApp", | |
215 | "Create and manage IPython profiles." |
|
218 | "Create and manage IPython profiles." | |
216 | ), |
|
219 | ), | |
217 | kernel = ("IPython.zmq.ipkernel.IPKernelApp", |
|
220 | kernel = ("IPython.zmq.ipkernel.IPKernelApp", | |
218 | "Start a kernel without an attached frontend." |
|
221 | "Start a kernel without an attached frontend." | |
219 | ), |
|
222 | ), | |
220 |
|
|
223 | console=('IPython.frontend.zmqterminal.app.ZMQTerminalIPythonApp', | |
221 |
"""Launch t |
|
224 | """Launch the IPython terminal-based Console.""" | |
222 | ), |
|
225 | ), | |
223 | )) |
|
226 | )) | |
224 |
|
227 | |||
225 | # *do* autocreate requested profile, but don't create the config file. |
|
228 | # *do* autocreate requested profile, but don't create the config file. | |
226 | auto_create=Bool(True) |
|
229 | auto_create=Bool(True) | |
227 | # configurables |
|
230 | # configurables | |
228 | ignore_old_config=Bool(False, config=True, |
|
231 | ignore_old_config=Bool(False, config=True, | |
229 | help="Suppress warning messages about legacy config files" |
|
232 | help="Suppress warning messages about legacy config files" | |
230 | ) |
|
233 | ) | |
231 | quick = Bool(False, config=True, |
|
234 | quick = Bool(False, config=True, | |
232 | help="""Start IPython quickly by skipping the loading of config files.""" |
|
235 | help="""Start IPython quickly by skipping the loading of config files.""" | |
233 | ) |
|
236 | ) | |
234 | def _quick_changed(self, name, old, new): |
|
237 | def _quick_changed(self, name, old, new): | |
235 | if new: |
|
238 | if new: | |
236 | self.load_config_file = lambda *a, **kw: None |
|
239 | self.load_config_file = lambda *a, **kw: None | |
237 | self.ignore_old_config=True |
|
240 | self.ignore_old_config=True | |
238 |
|
241 | |||
239 | gui = CaselessStrEnum(('qt', 'wx', 'gtk', 'glut', 'pyglet'), config=True, |
|
242 | gui = CaselessStrEnum(('qt', 'wx', 'gtk', 'glut', 'pyglet'), config=True, | |
240 | help="Enable GUI event loop integration ('qt', 'wx', 'gtk', 'glut', 'pyglet')." |
|
243 | help="Enable GUI event loop integration ('qt', 'wx', 'gtk', 'glut', 'pyglet')." | |
241 | ) |
|
244 | ) | |
242 | pylab = CaselessStrEnum(['tk', 'qt', 'wx', 'gtk', 'osx', 'auto'], |
|
245 | pylab = CaselessStrEnum(['tk', 'qt', 'wx', 'gtk', 'osx', 'auto'], | |
243 | config=True, |
|
246 | config=True, | |
244 | help="""Pre-load matplotlib and numpy for interactive use, |
|
247 | help="""Pre-load matplotlib and numpy for interactive use, | |
245 | selecting a particular matplotlib backend and loop integration. |
|
248 | selecting a particular matplotlib backend and loop integration. | |
246 | """ |
|
249 | """ | |
247 | ) |
|
250 | ) | |
248 | display_banner = Bool(True, config=True, |
|
251 | display_banner = Bool(True, config=True, | |
249 | help="Whether to display a banner upon starting IPython." |
|
252 | help="Whether to display a banner upon starting IPython." | |
250 | ) |
|
253 | ) | |
251 |
|
254 | |||
252 | # if there is code of files to run from the cmd line, don't interact |
|
255 | # if there is code of files to run from the cmd line, don't interact | |
253 | # unless the --i flag (App.force_interact) is true. |
|
256 | # unless the --i flag (App.force_interact) is true. | |
254 | force_interact = Bool(False, config=True, |
|
257 | force_interact = Bool(False, config=True, | |
255 | help="""If a command or file is given via the command-line, |
|
258 | help="""If a command or file is given via the command-line, | |
256 | e.g. 'ipython foo.py""" |
|
259 | e.g. 'ipython foo.py""" | |
257 | ) |
|
260 | ) | |
258 | def _force_interact_changed(self, name, old, new): |
|
261 | def _force_interact_changed(self, name, old, new): | |
259 | if new: |
|
262 | if new: | |
260 | self.interact = True |
|
263 | self.interact = True | |
261 |
|
264 | |||
262 | def _file_to_run_changed(self, name, old, new): |
|
265 | def _file_to_run_changed(self, name, old, new): | |
263 | if new and not self.force_interact: |
|
266 | if new and not self.force_interact: | |
264 | self.interact = False |
|
267 | self.interact = False | |
265 | _code_to_run_changed = _file_to_run_changed |
|
268 | _code_to_run_changed = _file_to_run_changed | |
266 |
|
269 | |||
267 | # internal, not-configurable |
|
270 | # internal, not-configurable | |
268 | interact=Bool(True) |
|
271 | interact=Bool(True) | |
269 |
|
272 | |||
270 |
|
273 | |||
271 | def parse_command_line(self, argv=None): |
|
274 | def parse_command_line(self, argv=None): | |
272 | """override to allow old '-pylab' flag with deprecation warning""" |
|
275 | """override to allow old '-pylab' flag with deprecation warning""" | |
273 |
|
276 | |||
274 | argv = sys.argv[1:] if argv is None else argv |
|
277 | argv = sys.argv[1:] if argv is None else argv | |
275 |
|
278 | |||
276 | if '-pylab' in argv: |
|
279 | if '-pylab' in argv: | |
277 | # deprecated `-pylab` given, |
|
280 | # deprecated `-pylab` given, | |
278 | # warn and transform into current syntax |
|
281 | # warn and transform into current syntax | |
279 | argv = argv[:] # copy, don't clobber |
|
282 | argv = argv[:] # copy, don't clobber | |
280 | idx = argv.index('-pylab') |
|
283 | idx = argv.index('-pylab') | |
281 | warn.warn("`-pylab` flag has been deprecated.\n" |
|
284 | warn.warn("`-pylab` flag has been deprecated.\n" | |
282 | " Use `--pylab` instead, or `--pylab=foo` to specify a backend.") |
|
285 | " Use `--pylab` instead, or `--pylab=foo` to specify a backend.") | |
283 | sub = '--pylab' |
|
286 | sub = '--pylab' | |
284 | if len(argv) > idx+1: |
|
287 | if len(argv) > idx+1: | |
285 | # check for gui arg, as in '-pylab qt' |
|
288 | # check for gui arg, as in '-pylab qt' | |
286 | gui = argv[idx+1] |
|
289 | gui = argv[idx+1] | |
287 | if gui in ('wx', 'qt', 'qt4', 'gtk', 'auto'): |
|
290 | if gui in ('wx', 'qt', 'qt4', 'gtk', 'auto'): | |
288 | sub = '--pylab='+gui |
|
291 | sub = '--pylab='+gui | |
289 | argv.pop(idx+1) |
|
292 | argv.pop(idx+1) | |
290 | argv[idx] = sub |
|
293 | argv[idx] = sub | |
291 |
|
294 | |||
292 | return super(TerminalIPythonApp, self).parse_command_line(argv) |
|
295 | return super(TerminalIPythonApp, self).parse_command_line(argv) | |
293 |
|
296 | |||
294 | @catch_config_error |
|
297 | @catch_config_error | |
295 | def initialize(self, argv=None): |
|
298 | def initialize(self, argv=None): | |
296 | """Do actions after construct, but before starting the app.""" |
|
299 | """Do actions after construct, but before starting the app.""" | |
297 | super(TerminalIPythonApp, self).initialize(argv) |
|
300 | super(TerminalIPythonApp, self).initialize(argv) | |
298 | if self.subapp is not None: |
|
301 | if self.subapp is not None: | |
299 | # don't bother initializing further, starting subapp |
|
302 | # don't bother initializing further, starting subapp | |
300 | return |
|
303 | return | |
301 | if not self.ignore_old_config: |
|
304 | if not self.ignore_old_config: | |
302 | check_for_old_config(self.ipython_dir) |
|
305 | check_for_old_config(self.ipython_dir) | |
303 | # print self.extra_args |
|
306 | # print self.extra_args | |
304 | if self.extra_args: |
|
307 | if self.extra_args: | |
305 | self.file_to_run = self.extra_args[0] |
|
308 | self.file_to_run = self.extra_args[0] | |
306 | # create the shell |
|
309 | # create the shell | |
307 | self.init_shell() |
|
310 | self.init_shell() | |
308 | # and draw the banner |
|
311 | # and draw the banner | |
309 | self.init_banner() |
|
312 | self.init_banner() | |
310 | # Now a variety of things that happen after the banner is printed. |
|
313 | # Now a variety of things that happen after the banner is printed. | |
311 | self.init_gui_pylab() |
|
314 | self.init_gui_pylab() | |
312 | self.init_extensions() |
|
315 | self.init_extensions() | |
313 | self.init_code() |
|
316 | self.init_code() | |
314 |
|
317 | |||
315 | def init_shell(self): |
|
318 | def init_shell(self): | |
316 | """initialize the InteractiveShell instance""" |
|
319 | """initialize the InteractiveShell instance""" | |
317 | # I am a little hesitant to put these into InteractiveShell itself. |
|
320 | # I am a little hesitant to put these into InteractiveShell itself. | |
318 | # But that might be the place for them |
|
321 | # But that might be the place for them | |
319 | sys.path.insert(0, '') |
|
322 | sys.path.insert(0, '') | |
320 |
|
323 | |||
321 | # Create an InteractiveShell instance. |
|
324 | # Create an InteractiveShell instance. | |
322 | # shell.display_banner should always be False for the terminal |
|
325 | # shell.display_banner should always be False for the terminal | |
323 | # based app, because we call shell.show_banner() by hand below |
|
326 | # based app, because we call shell.show_banner() by hand below | |
324 | # so the banner shows *before* all extension loading stuff. |
|
327 | # so the banner shows *before* all extension loading stuff. | |
325 | self.shell = TerminalInteractiveShell.instance(config=self.config, |
|
328 | self.shell = TerminalInteractiveShell.instance(config=self.config, | |
326 | display_banner=False, profile_dir=self.profile_dir, |
|
329 | display_banner=False, profile_dir=self.profile_dir, | |
327 | ipython_dir=self.ipython_dir) |
|
330 | ipython_dir=self.ipython_dir) | |
328 | self.shell.configurables.append(self) |
|
331 | self.shell.configurables.append(self) | |
329 |
|
332 | |||
330 | def init_banner(self): |
|
333 | def init_banner(self): | |
331 | """optionally display the banner""" |
|
334 | """optionally display the banner""" | |
332 | if self.display_banner and self.interact: |
|
335 | if self.display_banner and self.interact: | |
333 | self.shell.show_banner() |
|
336 | self.shell.show_banner() | |
334 | # Make sure there is a space below the banner. |
|
337 | # Make sure there is a space below the banner. | |
335 | if self.log_level <= logging.INFO: print |
|
338 | if self.log_level <= logging.INFO: print | |
336 |
|
339 | |||
337 |
|
340 | |||
338 | def init_gui_pylab(self): |
|
341 | def init_gui_pylab(self): | |
339 | """Enable GUI event loop integration, taking pylab into account.""" |
|
342 | """Enable GUI event loop integration, taking pylab into account.""" | |
340 | gui = self.gui |
|
343 | gui = self.gui | |
341 |
|
344 | |||
342 | # Using `pylab` will also require gui activation, though which toolkit |
|
345 | # Using `pylab` will also require gui activation, though which toolkit | |
343 | # to use may be chosen automatically based on mpl configuration. |
|
346 | # to use may be chosen automatically based on mpl configuration. | |
344 | if self.pylab: |
|
347 | if self.pylab: | |
345 | activate = self.shell.enable_pylab |
|
348 | activate = self.shell.enable_pylab | |
346 | if self.pylab == 'auto': |
|
349 | if self.pylab == 'auto': | |
347 | gui = None |
|
350 | gui = None | |
348 | else: |
|
351 | else: | |
349 | gui = self.pylab |
|
352 | gui = self.pylab | |
350 | else: |
|
353 | else: | |
351 | # Enable only GUI integration, no pylab |
|
354 | # Enable only GUI integration, no pylab | |
352 | activate = inputhook.enable_gui |
|
355 | activate = inputhook.enable_gui | |
353 |
|
356 | |||
354 | if gui or self.pylab: |
|
357 | if gui or self.pylab: | |
355 | try: |
|
358 | try: | |
356 | self.log.info("Enabling GUI event loop integration, " |
|
359 | self.log.info("Enabling GUI event loop integration, " | |
357 | "toolkit=%s, pylab=%s" % (gui, self.pylab) ) |
|
360 | "toolkit=%s, pylab=%s" % (gui, self.pylab) ) | |
358 | if self.pylab: |
|
361 | if self.pylab: | |
359 | activate(gui, import_all=self.pylab_import_all) |
|
362 | activate(gui, import_all=self.pylab_import_all) | |
360 | else: |
|
363 | else: | |
361 | activate(gui) |
|
364 | activate(gui) | |
362 | except: |
|
365 | except: | |
363 | self.log.warn("Error in enabling GUI event loop integration:") |
|
366 | self.log.warn("Error in enabling GUI event loop integration:") | |
364 | self.shell.showtraceback() |
|
367 | self.shell.showtraceback() | |
365 |
|
368 | |||
366 | def start(self): |
|
369 | def start(self): | |
367 | if self.subapp is not None: |
|
370 | if self.subapp is not None: | |
368 | return self.subapp.start() |
|
371 | return self.subapp.start() | |
369 | # perform any prexec steps: |
|
372 | # perform any prexec steps: | |
370 | if self.interact: |
|
373 | if self.interact: | |
371 | self.log.debug("Starting IPython's mainloop...") |
|
374 | self.log.debug("Starting IPython's mainloop...") | |
372 | self.shell.mainloop() |
|
375 | self.shell.mainloop() | |
373 | else: |
|
376 | else: | |
374 | self.log.debug("IPython not interactive...") |
|
377 | self.log.debug("IPython not interactive...") | |
375 |
|
378 | |||
376 |
|
379 | |||
377 | def load_default_config(ipython_dir=None): |
|
380 | def load_default_config(ipython_dir=None): | |
378 | """Load the default config file from the default ipython_dir. |
|
381 | """Load the default config file from the default ipython_dir. | |
379 |
|
382 | |||
380 | This is useful for embedded shells. |
|
383 | This is useful for embedded shells. | |
381 | """ |
|
384 | """ | |
382 | if ipython_dir is None: |
|
385 | if ipython_dir is None: | |
383 | ipython_dir = get_ipython_dir() |
|
386 | ipython_dir = get_ipython_dir() | |
384 | profile_dir = os.path.join(ipython_dir, 'profile_default') |
|
387 | profile_dir = os.path.join(ipython_dir, 'profile_default') | |
385 | cl = PyFileConfigLoader(default_config_file_name, profile_dir) |
|
388 | cl = PyFileConfigLoader(default_config_file_name, profile_dir) | |
386 | try: |
|
389 | try: | |
387 | config = cl.load_config() |
|
390 | config = cl.load_config() | |
388 | except ConfigFileNotFound: |
|
391 | except ConfigFileNotFound: | |
389 | # no config found |
|
392 | # no config found | |
390 | config = Config() |
|
393 | config = Config() | |
391 | return config |
|
394 | return config | |
392 |
|
395 | |||
393 |
|
396 | |||
394 | def launch_new_instance(): |
|
397 | def launch_new_instance(): | |
395 | """Create and run a full blown IPython instance""" |
|
398 | """Create and run a full blown IPython instance""" | |
396 | app = TerminalIPythonApp.instance() |
|
399 | app = TerminalIPythonApp.instance() | |
397 | app.initialize() |
|
400 | app.initialize() | |
398 | app.start() |
|
401 | app.start() | |
399 |
|
402 | |||
400 |
|
403 | |||
401 | if __name__ == '__main__': |
|
404 | if __name__ == '__main__': | |
402 | launch_new_instance() |
|
405 | launch_new_instance() |
@@ -1,101 +1,120 b'' | |||||
1 | """ A minimal application using the ZMQ-based terminal IPython frontend. |
|
1 | """ A minimal application using the ZMQ-based terminal IPython frontend. | |
2 |
|
2 | |||
3 | This is not a complete console app, as subprocess will not be able to receive |
|
3 | This is not a complete console app, as subprocess will not be able to receive | |
4 | input, there is no real readline support, among other limitations. |
|
4 | input, there is no real readline support, among other limitations. | |
5 |
|
5 | |||
6 | Authors: |
|
6 | Authors: | |
7 |
|
7 | |||
8 | * Min RK |
|
8 | * Min RK | |
9 | * Paul Ivanov |
|
9 | * Paul Ivanov | |
10 |
|
10 | |||
11 | """ |
|
11 | """ | |
12 |
|
12 | |||
13 | #----------------------------------------------------------------------------- |
|
13 | #----------------------------------------------------------------------------- | |
14 | # Imports |
|
14 | # Imports | |
15 | #----------------------------------------------------------------------------- |
|
15 | #----------------------------------------------------------------------------- | |
16 | import signal |
|
16 | import signal | |
17 | import sys |
|
17 | import sys | |
18 | import time |
|
18 | import time | |
19 |
|
19 | |||
20 | from IPython.frontend.terminal.ipapp import TerminalIPythonApp |
|
20 | from IPython.frontend.terminal.ipapp import TerminalIPythonApp | |
21 |
|
21 | |||
22 | from IPython.utils.traitlets import ( |
|
22 | from IPython.utils.traitlets import ( | |
23 | Dict, List, Unicode, Int, CaselessStrEnum, CBool, Any |
|
23 | Dict, List, Unicode, Int, CaselessStrEnum, CBool, Any | |
24 | ) |
|
24 | ) | |
25 | from IPython.zmq.ipkernel import IPKernelApp |
|
25 | from IPython.zmq.ipkernel import IPKernelApp | |
26 | from IPython.zmq.session import Session, default_secure |
|
26 | from IPython.zmq.session import Session, default_secure | |
27 | from IPython.zmq.zmqshell import ZMQInteractiveShell |
|
27 | from IPython.zmq.zmqshell import ZMQInteractiveShell | |
28 | from IPython.frontend.kernelmixinapp import ( |
|
28 | from IPython.frontend.kernelmixinapp import ( | |
29 | IPythonMixinConsoleApp, app_aliases, app_flags |
|
29 | IPythonMixinConsoleApp, app_aliases, app_flags | |
30 | ) |
|
30 | ) | |
31 |
|
31 | |||
32 | from IPython.frontend.zmqterminal.interactiveshell import ZMQTerminalInteractiveShell |
|
32 | from IPython.frontend.zmqterminal.interactiveshell import ZMQTerminalInteractiveShell | |
33 |
|
33 | |||
34 | #----------------------------------------------------------------------------- |
|
34 | #----------------------------------------------------------------------------- | |
35 | # Globals |
|
35 | # Globals | |
36 | #----------------------------------------------------------------------------- |
|
36 | #----------------------------------------------------------------------------- | |
37 |
|
37 | |||
38 | _examples = """ |
|
38 | _examples = """ | |
39 | ipython console # start the ZMQ-based console |
|
39 | ipython console # start the ZMQ-based console | |
40 | ipython console --pylab # start with pylab plotting mode |
|
40 | ipython console --existing # connect to an existing ipython session | |
41 | """ |
|
41 | """ | |
42 |
|
42 | |||
43 | #----------------------------------------------------------------------------- |
|
43 | #----------------------------------------------------------------------------- | |
44 | # Flags and Aliases |
|
44 | # Flags and Aliases | |
45 | #----------------------------------------------------------------------------- |
|
45 | #----------------------------------------------------------------------------- | |
46 |
|
46 | |||
47 | # XXX: the app_flags should really be flags from the mixin |
|
47 | # XXX: the app_flags should really be flags from the mixin | |
48 | flags = dict(app_flags) |
|
48 | flags = dict(app_flags) | |
49 | frontend_flags = { } |
|
49 | frontend_flags = { } | |
50 | flags.update(frontend_flags) |
|
50 | flags.update(frontend_flags) | |
51 |
|
51 | |||
52 | frontend_flags = frontend_flags.keys() |
|
52 | frontend_flags = frontend_flags.keys() | |
53 |
|
53 | |||
54 | aliases = dict(app_aliases) |
|
54 | aliases = dict(app_aliases) | |
55 |
|
55 | |||
56 | frontend_aliases = dict() |
|
56 | frontend_aliases = dict() | |
57 |
|
57 | |||
58 | aliases.update(frontend_aliases) |
|
58 | aliases.update(frontend_aliases) | |
59 |
|
59 | |||
60 | #----------------------------------------------------------------------------- |
|
60 | #----------------------------------------------------------------------------- | |
61 | # Classes |
|
61 | # Classes | |
62 | #----------------------------------------------------------------------------- |
|
62 | #----------------------------------------------------------------------------- | |
63 |
|
63 | |||
64 |
|
64 | |||
65 | class ZMQTerminalIPythonApp(TerminalIPythonApp, IPythonMixinConsoleApp): |
|
65 | class ZMQTerminalIPythonApp(TerminalIPythonApp, IPythonMixinConsoleApp): | |
|
66 | name = "ipython console" | |||
66 | """Start a terminal frontend to the IPython zmq kernel.""" |
|
67 | """Start a terminal frontend to the IPython zmq kernel.""" | |
67 |
|
68 | |||
|
69 | description = """ | |||
|
70 | The IPython terminal-based Console. | |||
|
71 | ||||
|
72 | This launches a Console application inside a terminal. | |||
|
73 | ||||
|
74 | The Console supports various extra features beyond the traditional | |||
|
75 | single-process Terminal IPython shell, such as connecting to an | |||
|
76 | existing ipython session, via: | |||
|
77 | ||||
|
78 | ipython console --existing | |||
|
79 | ||||
|
80 | where the previous session could have been created by another ipython | |||
|
81 | console, an ipython qtconsole, or by opening an ipython notebook. | |||
|
82 | ||||
|
83 | """ | |||
|
84 | examples = _examples | |||
|
85 | ||||
68 | classes = List([IPKernelApp, ZMQTerminalInteractiveShell]) |
|
86 | classes = List([IPKernelApp, ZMQTerminalInteractiveShell]) | |
69 | flags = Dict(flags) |
|
87 | flags = Dict(flags) | |
70 | aliases = Dict(aliases) |
|
88 | aliases = Dict(aliases) | |
|
89 | subcommands = Dict() | |||
71 | def parse_command_line(self, argv=None): |
|
90 | def parse_command_line(self, argv=None): | |
72 | super(ZMQTerminalIPythonApp, self).parse_command_line(argv) |
|
91 | super(ZMQTerminalIPythonApp, self).parse_command_line(argv) | |
73 | IPythonMixinConsoleApp.parse_command_line(self,argv) |
|
92 | IPythonMixinConsoleApp.parse_command_line(self,argv) | |
74 | self.swallow_args(frontend_aliases,frontend_flags,argv=argv) |
|
93 | self.swallow_args(frontend_aliases,frontend_flags,argv=argv) | |
75 |
|
94 | |||
76 | def init_shell(self): |
|
95 | def init_shell(self): | |
77 | IPythonMixinConsoleApp.initialize(self) |
|
96 | IPythonMixinConsoleApp.initialize(self) | |
78 | # relay sigint to kernel |
|
97 | # relay sigint to kernel | |
79 | signal.signal(signal.SIGINT, self.handle_sigint) |
|
98 | signal.signal(signal.SIGINT, self.handle_sigint) | |
80 | self.shell = ZMQTerminalInteractiveShell.instance(config=self.config, |
|
99 | self.shell = ZMQTerminalInteractiveShell.instance(config=self.config, | |
81 | display_banner=False, profile_dir=self.profile_dir, |
|
100 | display_banner=False, profile_dir=self.profile_dir, | |
82 | ipython_dir=self.ipython_dir, kernel_manager=self.kernel_manager) |
|
101 | ipython_dir=self.ipython_dir, kernel_manager=self.kernel_manager) | |
83 |
|
102 | |||
84 | def handle_sigint(self, *args): |
|
103 | def handle_sigint(self, *args): | |
85 | self.shell.write('KeyboardInterrupt\n') |
|
104 | self.shell.write('KeyboardInterrupt\n') | |
86 | self.kernel_manager.interrupt_kernel() |
|
105 | self.kernel_manager.interrupt_kernel() | |
87 |
|
106 | |||
88 | def init_code(self): |
|
107 | def init_code(self): | |
89 | # no-op in the frontend, code gets run in the backend |
|
108 | # no-op in the frontend, code gets run in the backend | |
90 | pass |
|
109 | pass | |
91 |
|
110 | |||
92 | def launch_new_instance(): |
|
111 | def launch_new_instance(): | |
93 | """Create and run a full blown IPython instance""" |
|
112 | """Create and run a full blown IPython instance""" | |
94 | app = ZMQTerminalIPythonApp.instance() |
|
113 | app = ZMQTerminalIPythonApp.instance() | |
95 | app.initialize() |
|
114 | app.initialize() | |
96 | app.start() |
|
115 | app.start() | |
97 |
|
116 | |||
98 |
|
117 | |||
99 | if __name__ == '__main__': |
|
118 | if __name__ == '__main__': | |
100 | launch_new_instance() |
|
119 | launch_new_instance() | |
101 |
|
120 |
General Comments 0
You need to be logged in to leave comments.
Login now