Show More
The requested changes are too big and content was truncated. Show full diff
@@ -1,101 +1,102 b'' | |||||
1 | # -*- coding: utf-8 -*- |
|
1 | # -*- coding: utf-8 -*- | |
2 | """ IPython extension: add %rehashdir magic |
|
2 | """ IPython extension: add %rehashdir magic | |
3 |
|
3 | |||
4 | Usage: |
|
4 | Usage: | |
5 |
|
5 | |||
6 | %rehashdir c:/bin c:/tools |
|
6 | %rehashdir c:/bin c:/tools | |
7 | - Add all executables under c:/bin and c:/tools to alias table, in |
|
7 | - Add all executables under c:/bin and c:/tools to alias table, in | |
8 | order to make them directly executable from any directory. |
|
8 | order to make them directly executable from any directory. | |
9 |
|
9 | |||
10 | This also serves as an example on how to extend ipython |
|
10 | This also serves as an example on how to extend ipython | |
11 | with new magic functions. |
|
11 | with new magic functions. | |
12 |
|
12 | |||
13 | Unlike rest of ipython, this requires Python 2.4 (optional |
|
13 | Unlike rest of ipython, this requires Python 2.4 (optional | |
14 | extensions are allowed to do that). |
|
14 | extensions are allowed to do that). | |
15 |
|
15 | |||
16 | To install, add |
|
16 | To install, add | |
17 |
|
17 | |||
18 | "import_mod ext_rehashdir" |
|
18 | "import_mod ext_rehashdir" | |
19 |
|
19 | |||
20 | To your ipythonrc or just execute "import rehash_dir" in ipython |
|
20 | To your ipythonrc or just execute "import rehash_dir" in ipython | |
21 | prompt. |
|
21 | prompt. | |
22 |
|
22 | |||
23 |
|
23 | |||
24 | $Id: InterpreterExec.py 994 2006-01-08 08:29:44Z fperez $ |
|
24 | $Id: InterpreterExec.py 994 2006-01-08 08:29:44Z fperez $ | |
25 | """ |
|
25 | """ | |
26 |
|
26 | |||
27 |
import IPython.ipapi |
|
27 | import IPython.ipapi | |
|
28 | ip = IPython.ipapi.get() | |||
28 |
|
29 | |||
29 |
|
30 | |||
30 | import os,re,fnmatch |
|
31 | import os,re,fnmatch | |
31 |
|
32 | |||
32 | @ip.asmagic("rehashdir") |
|
|||
33 | def rehashdir_f(self,arg): |
|
33 | def rehashdir_f(self,arg): | |
34 | """ Add executables in all specified dirs to alias table |
|
34 | """ Add executables in all specified dirs to alias table | |
35 |
|
35 | |||
36 | Usage: |
|
36 | Usage: | |
37 |
|
37 | |||
38 | %rehashdir c:/bin c:/tools |
|
38 | %rehashdir c:/bin c:/tools | |
39 | - Add all executables under c:/bin and c:/tools to alias table, in |
|
39 | - Add all executables under c:/bin and c:/tools to alias table, in | |
40 | order to make them directly executable from any directory. |
|
40 | order to make them directly executable from any directory. | |
41 |
|
41 | |||
42 | Without arguments, add all executables in current directory. |
|
42 | Without arguments, add all executables in current directory. | |
43 |
|
43 | |||
44 | """ |
|
44 | """ | |
45 |
|
45 | |||
46 | # most of the code copied from Magic.magic_rehashx |
|
46 | # most of the code copied from Magic.magic_rehashx | |
47 |
|
47 | |||
48 | def isjunk(fname): |
|
48 | def isjunk(fname): | |
49 | junk = ['*~'] |
|
49 | junk = ['*~'] | |
50 | for j in junk: |
|
50 | for j in junk: | |
51 | if fnmatch.fnmatch(fname, j): |
|
51 | if fnmatch.fnmatch(fname, j): | |
52 | return True |
|
52 | return True | |
53 | return False |
|
53 | return False | |
54 |
|
54 | |||
55 | if not arg: |
|
55 | if not arg: | |
56 | arg = '.' |
|
56 | arg = '.' | |
57 | path = map(os.path.abspath,arg.split()) |
|
57 | path = map(os.path.abspath,arg.split()) | |
58 | alias_table = self.shell.alias_table |
|
58 | alias_table = self.shell.alias_table | |
59 |
|
59 | |||
60 | if os.name == 'posix': |
|
60 | if os.name == 'posix': | |
61 | isexec = lambda fname:os.path.isfile(fname) and \ |
|
61 | isexec = lambda fname:os.path.isfile(fname) and \ | |
62 | os.access(fname,os.X_OK) |
|
62 | os.access(fname,os.X_OK) | |
63 | else: |
|
63 | else: | |
64 |
|
64 | |||
65 | try: |
|
65 | try: | |
66 | winext = os.environ['pathext'].replace(';','|').replace('.','') |
|
66 | winext = os.environ['pathext'].replace(';','|').replace('.','') | |
67 | except KeyError: |
|
67 | except KeyError: | |
68 | winext = 'exe|com|bat|py' |
|
68 | winext = 'exe|com|bat|py' | |
69 |
|
69 | |||
70 | execre = re.compile(r'(.*)\.(%s)$' % winext,re.IGNORECASE) |
|
70 | execre = re.compile(r'(.*)\.(%s)$' % winext,re.IGNORECASE) | |
71 | isexec = lambda fname:os.path.isfile(fname) and execre.match(fname) |
|
71 | isexec = lambda fname:os.path.isfile(fname) and execre.match(fname) | |
72 | savedir = os.getcwd() |
|
72 | savedir = os.getcwd() | |
73 | try: |
|
73 | try: | |
74 | # write the whole loop for posix/Windows so we don't have an if in |
|
74 | # write the whole loop for posix/Windows so we don't have an if in | |
75 | # the innermost part |
|
75 | # the innermost part | |
76 | if os.name == 'posix': |
|
76 | if os.name == 'posix': | |
77 | for pdir in path: |
|
77 | for pdir in path: | |
78 | os.chdir(pdir) |
|
78 | os.chdir(pdir) | |
79 | for ff in os.listdir(pdir): |
|
79 | for ff in os.listdir(pdir): | |
80 | if isexec(ff) and not isjunk(ff): |
|
80 | if isexec(ff) and not isjunk(ff): | |
81 | # each entry in the alias table must be (N,name), |
|
81 | # each entry in the alias table must be (N,name), | |
82 | # where N is the number of positional arguments of the |
|
82 | # where N is the number of positional arguments of the | |
83 | # alias. |
|
83 | # alias. | |
84 | src,tgt = os.path.splitext(ff)[0], os.path.abspath(ff) |
|
84 | src,tgt = os.path.splitext(ff)[0], os.path.abspath(ff) | |
85 | print "Aliasing:",src,"->",tgt |
|
85 | print "Aliasing:",src,"->",tgt | |
86 | alias_table[src] = (0,tgt) |
|
86 | alias_table[src] = (0,tgt) | |
87 | else: |
|
87 | else: | |
88 | for pdir in path: |
|
88 | for pdir in path: | |
89 | os.chdir(pdir) |
|
89 | os.chdir(pdir) | |
90 | for ff in os.listdir(pdir): |
|
90 | for ff in os.listdir(pdir): | |
91 | if isexec(ff) and not isjunk(ff): |
|
91 | if isexec(ff) and not isjunk(ff): | |
92 | src, tgt = execre.sub(r'\1',ff), os.path.abspath(ff) |
|
92 | src, tgt = execre.sub(r'\1',ff), os.path.abspath(ff) | |
93 | print "Aliasing:",src,"->",tgt |
|
93 | print "Aliasing:",src,"->",tgt | |
94 | alias_table[src] = (0,tgt) |
|
94 | alias_table[src] = (0,tgt) | |
95 | # Make sure the alias table doesn't contain keywords or builtins |
|
95 | # Make sure the alias table doesn't contain keywords or builtins | |
96 | self.shell.alias_table_validate() |
|
96 | self.shell.alias_table_validate() | |
97 | # Call again init_auto_alias() so we get 'rm -i' and other |
|
97 | # Call again init_auto_alias() so we get 'rm -i' and other | |
98 | # modified aliases since %rehashx will probably clobber them |
|
98 | # modified aliases since %rehashx will probably clobber them | |
99 | self.shell.init_auto_alias() |
|
99 | self.shell.init_auto_alias() | |
100 | finally: |
|
100 | finally: | |
101 | os.chdir(savedir) |
|
101 | os.chdir(savedir) | |
|
102 | ip.expose_magic("rehashdir",rehashdir_f) |
@@ -1,955 +1,955 b'' | |||||
1 | # -*- coding: utf-8 -*- |
|
1 | # -*- coding: utf-8 -*- | |
2 | """IPython Shell classes. |
|
2 | """IPython Shell classes. | |
3 |
|
3 | |||
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 10 |
|
7 | $Id: Shell.py 1079 2006-01-24 21:52:31Z vivainio $""" | |
8 |
|
8 | |||
9 | #***************************************************************************** |
|
9 | #***************************************************************************** | |
10 | # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu> |
|
10 | # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu> | |
11 | # |
|
11 | # | |
12 | # Distributed under the terms of the BSD License. The full license is in |
|
12 | # Distributed under the terms of the BSD License. The full license is in | |
13 | # the file COPYING, distributed as part of this software. |
|
13 | # the file COPYING, distributed as part of this software. | |
14 | #***************************************************************************** |
|
14 | #***************************************************************************** | |
15 |
|
15 | |||
16 | from IPython import Release |
|
16 | from IPython import Release | |
17 | __author__ = '%s <%s>' % Release.authors['Fernando'] |
|
17 | __author__ = '%s <%s>' % Release.authors['Fernando'] | |
18 | __license__ = Release.license |
|
18 | __license__ = Release.license | |
19 |
|
19 | |||
20 | # Code begins |
|
20 | # Code begins | |
21 | import __builtin__ |
|
21 | import __builtin__ | |
22 | import __main__ |
|
22 | import __main__ | |
23 | import Queue |
|
23 | import Queue | |
24 | import os |
|
24 | import os | |
25 | import signal |
|
25 | import signal | |
26 | import sys |
|
26 | import sys | |
27 | import threading |
|
27 | import threading | |
28 | import time |
|
28 | import time | |
29 |
|
29 | |||
30 | import IPython |
|
30 | import IPython | |
31 | from IPython import ultraTB |
|
31 | from IPython import ultraTB | |
32 | from IPython.genutils import Term,warn,error,flag_calls |
|
32 | from IPython.genutils import Term,warn,error,flag_calls | |
33 | from IPython.iplib import InteractiveShell |
|
33 | from IPython.iplib import InteractiveShell | |
34 | from IPython.ipmaker import make_IPython |
|
34 | from IPython.ipmaker import make_IPython | |
35 | from IPython.Magic import Magic |
|
35 | from IPython.Magic import Magic | |
36 | from IPython.ipstruct import Struct |
|
36 | from IPython.ipstruct import Struct | |
37 |
|
37 | |||
38 | # global flag to pass around information about Ctrl-C without exceptions |
|
38 | # global flag to pass around information about Ctrl-C without exceptions | |
39 | KBINT = False |
|
39 | KBINT = False | |
40 |
|
40 | |||
41 | # global flag to turn on/off Tk support. |
|
41 | # global flag to turn on/off Tk support. | |
42 | USE_TK = False |
|
42 | USE_TK = False | |
43 |
|
43 | |||
44 | #----------------------------------------------------------------------------- |
|
44 | #----------------------------------------------------------------------------- | |
45 | # This class is trivial now, but I want to have it in to publish a clean |
|
45 | # This class is trivial now, but I want to have it in to publish a clean | |
46 | # interface. Later when the internals are reorganized, code that uses this |
|
46 | # interface. Later when the internals are reorganized, code that uses this | |
47 | # shouldn't have to change. |
|
47 | # shouldn't have to change. | |
48 |
|
48 | |||
49 | class IPShell: |
|
49 | class IPShell: | |
50 | """Create an IPython instance.""" |
|
50 | """Create an IPython instance.""" | |
51 |
|
51 | |||
52 | def __init__(self,argv=None,user_ns=None,user_global_ns=None, |
|
52 | def __init__(self,argv=None,user_ns=None,user_global_ns=None, | |
53 | debug=1,shell_class=InteractiveShell): |
|
53 | debug=1,shell_class=InteractiveShell): | |
54 | self.IP = make_IPython(argv,user_ns=user_ns,user_global_ns=user_global_ns, |
|
54 | self.IP = make_IPython(argv,user_ns=user_ns,user_global_ns=user_global_ns, | |
55 | debug=debug,shell_class=shell_class) |
|
55 | debug=debug,shell_class=shell_class) | |
56 |
|
56 | |||
57 | def mainloop(self,sys_exit=0,banner=None): |
|
57 | def mainloop(self,sys_exit=0,banner=None): | |
58 | self.IP.mainloop(banner) |
|
58 | self.IP.mainloop(banner) | |
59 | if sys_exit: |
|
59 | if sys_exit: | |
60 | sys.exit() |
|
60 | sys.exit() | |
61 |
|
61 | |||
62 | #----------------------------------------------------------------------------- |
|
62 | #----------------------------------------------------------------------------- | |
63 | class IPShellEmbed: |
|
63 | class IPShellEmbed: | |
64 | """Allow embedding an IPython shell into a running program. |
|
64 | """Allow embedding an IPython shell into a running program. | |
65 |
|
65 | |||
66 | Instances of this class are callable, with the __call__ method being an |
|
66 | Instances of this class are callable, with the __call__ method being an | |
67 | alias to the embed() method of an InteractiveShell instance. |
|
67 | alias to the embed() method of an InteractiveShell instance. | |
68 |
|
68 | |||
69 | Usage (see also the example-embed.py file for a running example): |
|
69 | Usage (see also the example-embed.py file for a running example): | |
70 |
|
70 | |||
71 | ipshell = IPShellEmbed([argv,banner,exit_msg,rc_override]) |
|
71 | ipshell = IPShellEmbed([argv,banner,exit_msg,rc_override]) | |
72 |
|
72 | |||
73 | - argv: list containing valid command-line options for IPython, as they |
|
73 | - argv: list containing valid command-line options for IPython, as they | |
74 | would appear in sys.argv[1:]. |
|
74 | would appear in sys.argv[1:]. | |
75 |
|
75 | |||
76 | For example, the following command-line options: |
|
76 | For example, the following command-line options: | |
77 |
|
77 | |||
78 | $ ipython -prompt_in1 'Input <\\#>' -colors LightBG |
|
78 | $ ipython -prompt_in1 'Input <\\#>' -colors LightBG | |
79 |
|
79 | |||
80 | would be passed in the argv list as: |
|
80 | would be passed in the argv list as: | |
81 |
|
81 | |||
82 | ['-prompt_in1','Input <\\#>','-colors','LightBG'] |
|
82 | ['-prompt_in1','Input <\\#>','-colors','LightBG'] | |
83 |
|
83 | |||
84 | - banner: string which gets printed every time the interpreter starts. |
|
84 | - banner: string which gets printed every time the interpreter starts. | |
85 |
|
85 | |||
86 | - exit_msg: string which gets printed every time the interpreter exits. |
|
86 | - exit_msg: string which gets printed every time the interpreter exits. | |
87 |
|
87 | |||
88 | - rc_override: a dict or Struct of configuration options such as those |
|
88 | - rc_override: a dict or Struct of configuration options such as those | |
89 | used by IPython. These options are read from your ~/.ipython/ipythonrc |
|
89 | used by IPython. These options are read from your ~/.ipython/ipythonrc | |
90 | file when the Shell object is created. Passing an explicit rc_override |
|
90 | file when the Shell object is created. Passing an explicit rc_override | |
91 | dict with any options you want allows you to override those values at |
|
91 | dict with any options you want allows you to override those values at | |
92 | creation time without having to modify the file. This way you can create |
|
92 | creation time without having to modify the file. This way you can create | |
93 | embeddable instances configured in any way you want without editing any |
|
93 | embeddable instances configured in any way you want without editing any | |
94 | global files (thus keeping your interactive IPython configuration |
|
94 | global files (thus keeping your interactive IPython configuration | |
95 | unchanged). |
|
95 | unchanged). | |
96 |
|
96 | |||
97 | Then the ipshell instance can be called anywhere inside your code: |
|
97 | Then the ipshell instance can be called anywhere inside your code: | |
98 |
|
98 | |||
99 | ipshell(header='') -> Opens up an IPython shell. |
|
99 | ipshell(header='') -> Opens up an IPython shell. | |
100 |
|
100 | |||
101 | - header: string printed by the IPython shell upon startup. This can let |
|
101 | - header: string printed by the IPython shell upon startup. This can let | |
102 | you know where in your code you are when dropping into the shell. Note |
|
102 | you know where in your code you are when dropping into the shell. Note | |
103 | that 'banner' gets prepended to all calls, so header is used for |
|
103 | that 'banner' gets prepended to all calls, so header is used for | |
104 | location-specific information. |
|
104 | location-specific information. | |
105 |
|
105 | |||
106 | For more details, see the __call__ method below. |
|
106 | For more details, see the __call__ method below. | |
107 |
|
107 | |||
108 | When the IPython shell is exited with Ctrl-D, normal program execution |
|
108 | When the IPython shell is exited with Ctrl-D, normal program execution | |
109 | resumes. |
|
109 | resumes. | |
110 |
|
110 | |||
111 | This functionality was inspired by a posting on comp.lang.python by cmkl |
|
111 | This functionality was inspired by a posting on comp.lang.python by cmkl | |
112 | <cmkleffner@gmx.de> on Dec. 06/01 concerning similar uses of pyrepl, and |
|
112 | <cmkleffner@gmx.de> on Dec. 06/01 concerning similar uses of pyrepl, and | |
113 | by the IDL stop/continue commands.""" |
|
113 | by the IDL stop/continue commands.""" | |
114 |
|
114 | |||
115 | def __init__(self,argv=None,banner='',exit_msg=None,rc_override=None): |
|
115 | def __init__(self,argv=None,banner='',exit_msg=None,rc_override=None): | |
116 | """Note that argv here is a string, NOT a list.""" |
|
116 | """Note that argv here is a string, NOT a list.""" | |
117 | self.set_banner(banner) |
|
117 | self.set_banner(banner) | |
118 | self.set_exit_msg(exit_msg) |
|
118 | self.set_exit_msg(exit_msg) | |
119 | self.set_dummy_mode(0) |
|
119 | self.set_dummy_mode(0) | |
120 |
|
120 | |||
121 | # sys.displayhook is a global, we need to save the user's original |
|
121 | # sys.displayhook is a global, we need to save the user's original | |
122 | # Don't rely on __displayhook__, as the user may have changed that. |
|
122 | # Don't rely on __displayhook__, as the user may have changed that. | |
123 | self.sys_displayhook_ori = sys.displayhook |
|
123 | self.sys_displayhook_ori = sys.displayhook | |
124 |
|
124 | |||
125 | # save readline completer status |
|
125 | # save readline completer status | |
126 | try: |
|
126 | try: | |
127 | #print 'Save completer',sys.ipcompleter # dbg |
|
127 | #print 'Save completer',sys.ipcompleter # dbg | |
128 | self.sys_ipcompleter_ori = sys.ipcompleter |
|
128 | self.sys_ipcompleter_ori = sys.ipcompleter | |
129 | except: |
|
129 | except: | |
130 | pass # not nested with IPython |
|
130 | pass # not nested with IPython | |
131 |
|
131 | |||
132 | # FIXME. Passing user_ns breaks namespace handling. |
|
132 | # FIXME. Passing user_ns breaks namespace handling. | |
133 | #self.IP = make_IPython(argv,user_ns=__main__.__dict__) |
|
133 | #self.IP = make_IPython(argv,user_ns=__main__.__dict__) | |
134 | self.IP = make_IPython(argv,rc_override=rc_override,embedded=True) |
|
134 | self.IP = make_IPython(argv,rc_override=rc_override,embedded=True) | |
135 |
|
135 | |||
136 | # copy our own displayhook also |
|
136 | # copy our own displayhook also | |
137 | self.sys_displayhook_embed = sys.displayhook |
|
137 | self.sys_displayhook_embed = sys.displayhook | |
138 | # and leave the system's display hook clean |
|
138 | # and leave the system's display hook clean | |
139 | sys.displayhook = self.sys_displayhook_ori |
|
139 | sys.displayhook = self.sys_displayhook_ori | |
140 | # don't use the ipython crash handler so that user exceptions aren't |
|
140 | # don't use the ipython crash handler so that user exceptions aren't | |
141 | # trapped |
|
141 | # trapped | |
142 | sys.excepthook = ultraTB.FormattedTB(color_scheme = self.IP.rc.colors, |
|
142 | sys.excepthook = ultraTB.FormattedTB(color_scheme = self.IP.rc.colors, | |
143 | mode = self.IP.rc.xmode, |
|
143 | mode = self.IP.rc.xmode, | |
144 | call_pdb = self.IP.rc.pdb) |
|
144 | call_pdb = self.IP.rc.pdb) | |
145 | self.restore_system_completer() |
|
145 | self.restore_system_completer() | |
146 |
|
146 | |||
147 | def restore_system_completer(self): |
|
147 | def restore_system_completer(self): | |
148 | """Restores the readline completer which was in place. |
|
148 | """Restores the readline completer which was in place. | |
149 |
|
149 | |||
150 | This allows embedded IPython within IPython not to disrupt the |
|
150 | This allows embedded IPython within IPython not to disrupt the | |
151 | parent's completion. |
|
151 | parent's completion. | |
152 | """ |
|
152 | """ | |
153 |
|
153 | |||
154 | try: |
|
154 | try: | |
155 | self.IP.readline.set_completer(self.sys_ipcompleter_ori) |
|
155 | self.IP.readline.set_completer(self.sys_ipcompleter_ori) | |
156 | sys.ipcompleter = self.sys_ipcompleter_ori |
|
156 | sys.ipcompleter = self.sys_ipcompleter_ori | |
157 | except: |
|
157 | except: | |
158 | pass |
|
158 | pass | |
159 |
|
159 | |||
160 | def __call__(self,header='',local_ns=None,global_ns=None,dummy=None): |
|
160 | def __call__(self,header='',local_ns=None,global_ns=None,dummy=None): | |
161 | """Activate the interactive interpreter. |
|
161 | """Activate the interactive interpreter. | |
162 |
|
162 | |||
163 | __call__(self,header='',local_ns=None,global_ns,dummy=None) -> Start |
|
163 | __call__(self,header='',local_ns=None,global_ns,dummy=None) -> Start | |
164 | the interpreter shell with the given local and global namespaces, and |
|
164 | the interpreter shell with the given local and global namespaces, and | |
165 | optionally print a header string at startup. |
|
165 | optionally print a header string at startup. | |
166 |
|
166 | |||
167 | The shell can be globally activated/deactivated using the |
|
167 | The shell can be globally activated/deactivated using the | |
168 | set/get_dummy_mode methods. This allows you to turn off a shell used |
|
168 | set/get_dummy_mode methods. This allows you to turn off a shell used | |
169 | for debugging globally. |
|
169 | for debugging globally. | |
170 |
|
170 | |||
171 | However, *each* time you call the shell you can override the current |
|
171 | However, *each* time you call the shell you can override the current | |
172 | state of dummy_mode with the optional keyword parameter 'dummy'. For |
|
172 | state of dummy_mode with the optional keyword parameter 'dummy'. For | |
173 | example, if you set dummy mode on with IPShell.set_dummy_mode(1), you |
|
173 | example, if you set dummy mode on with IPShell.set_dummy_mode(1), you | |
174 | can still have a specific call work by making it as IPShell(dummy=0). |
|
174 | can still have a specific call work by making it as IPShell(dummy=0). | |
175 |
|
175 | |||
176 | The optional keyword parameter dummy controls whether the call |
|
176 | The optional keyword parameter dummy controls whether the call | |
177 | actually does anything. """ |
|
177 | actually does anything. """ | |
178 |
|
178 | |||
179 | # Allow the dummy parameter to override the global __dummy_mode |
|
179 | # Allow the dummy parameter to override the global __dummy_mode | |
180 | if dummy or (dummy != 0 and self.__dummy_mode): |
|
180 | if dummy or (dummy != 0 and self.__dummy_mode): | |
181 | return |
|
181 | return | |
182 |
|
182 | |||
183 | # Set global subsystems (display,completions) to our values |
|
183 | # Set global subsystems (display,completions) to our values | |
184 | sys.displayhook = self.sys_displayhook_embed |
|
184 | sys.displayhook = self.sys_displayhook_embed | |
185 | if self.IP.has_readline: |
|
185 | if self.IP.has_readline: | |
186 | self.IP.readline.set_completer(self.IP.Completer.complete) |
|
186 | self.IP.readline.set_completer(self.IP.Completer.complete) | |
187 |
|
187 | |||
188 | if self.banner and header: |
|
188 | if self.banner and header: | |
189 | format = '%s\n%s\n' |
|
189 | format = '%s\n%s\n' | |
190 | else: |
|
190 | else: | |
191 | format = '%s%s\n' |
|
191 | format = '%s%s\n' | |
192 | banner = format % (self.banner,header) |
|
192 | banner = format % (self.banner,header) | |
193 |
|
193 | |||
194 | # Call the embedding code with a stack depth of 1 so it can skip over |
|
194 | # Call the embedding code with a stack depth of 1 so it can skip over | |
195 | # our call and get the original caller's namespaces. |
|
195 | # our call and get the original caller's namespaces. | |
196 | self.IP.embed_mainloop(banner,local_ns,global_ns,stack_depth=1) |
|
196 | self.IP.embed_mainloop(banner,local_ns,global_ns,stack_depth=1) | |
197 |
|
197 | |||
198 | if self.exit_msg: |
|
198 | if self.exit_msg: | |
199 | print self.exit_msg |
|
199 | print self.exit_msg | |
200 |
|
200 | |||
201 | # Restore global systems (display, completion) |
|
201 | # Restore global systems (display, completion) | |
202 | sys.displayhook = self.sys_displayhook_ori |
|
202 | sys.displayhook = self.sys_displayhook_ori | |
203 | self.restore_system_completer() |
|
203 | self.restore_system_completer() | |
204 |
|
204 | |||
205 | def set_dummy_mode(self,dummy): |
|
205 | def set_dummy_mode(self,dummy): | |
206 | """Sets the embeddable shell's dummy mode parameter. |
|
206 | """Sets the embeddable shell's dummy mode parameter. | |
207 |
|
207 | |||
208 | set_dummy_mode(dummy): dummy = 0 or 1. |
|
208 | set_dummy_mode(dummy): dummy = 0 or 1. | |
209 |
|
209 | |||
210 | This parameter is persistent and makes calls to the embeddable shell |
|
210 | This parameter is persistent and makes calls to the embeddable shell | |
211 | silently return without performing any action. This allows you to |
|
211 | silently return without performing any action. This allows you to | |
212 | globally activate or deactivate a shell you're using with a single call. |
|
212 | globally activate or deactivate a shell you're using with a single call. | |
213 |
|
213 | |||
214 | If you need to manually""" |
|
214 | If you need to manually""" | |
215 |
|
215 | |||
216 | if dummy not in [0,1,False,True]: |
|
216 | if dummy not in [0,1,False,True]: | |
217 | raise ValueError,'dummy parameter must be boolean' |
|
217 | raise ValueError,'dummy parameter must be boolean' | |
218 | self.__dummy_mode = dummy |
|
218 | self.__dummy_mode = dummy | |
219 |
|
219 | |||
220 | def get_dummy_mode(self): |
|
220 | def get_dummy_mode(self): | |
221 | """Return the current value of the dummy mode parameter. |
|
221 | """Return the current value of the dummy mode parameter. | |
222 | """ |
|
222 | """ | |
223 | return self.__dummy_mode |
|
223 | return self.__dummy_mode | |
224 |
|
224 | |||
225 | def set_banner(self,banner): |
|
225 | def set_banner(self,banner): | |
226 | """Sets the global banner. |
|
226 | """Sets the global banner. | |
227 |
|
227 | |||
228 | This banner gets prepended to every header printed when the shell |
|
228 | This banner gets prepended to every header printed when the shell | |
229 | instance is called.""" |
|
229 | instance is called.""" | |
230 |
|
230 | |||
231 | self.banner = banner |
|
231 | self.banner = banner | |
232 |
|
232 | |||
233 | def set_exit_msg(self,exit_msg): |
|
233 | def set_exit_msg(self,exit_msg): | |
234 | """Sets the global exit_msg. |
|
234 | """Sets the global exit_msg. | |
235 |
|
235 | |||
236 | This exit message gets printed upon exiting every time the embedded |
|
236 | This exit message gets printed upon exiting every time the embedded | |
237 | shell is called. It is None by default. """ |
|
237 | shell is called. It is None by default. """ | |
238 |
|
238 | |||
239 | self.exit_msg = exit_msg |
|
239 | self.exit_msg = exit_msg | |
240 |
|
240 | |||
241 | #----------------------------------------------------------------------------- |
|
241 | #----------------------------------------------------------------------------- | |
242 | def sigint_handler (signum,stack_frame): |
|
242 | def sigint_handler (signum,stack_frame): | |
243 | """Sigint handler for threaded apps. |
|
243 | """Sigint handler for threaded apps. | |
244 |
|
244 | |||
245 | This is a horrible hack to pass information about SIGINT _without_ using |
|
245 | This is a horrible hack to pass information about SIGINT _without_ using | |
246 | exceptions, since I haven't been able to properly manage cross-thread |
|
246 | exceptions, since I haven't been able to properly manage cross-thread | |
247 | exceptions in GTK/WX. In fact, I don't think it can be done (or at least |
|
247 | exceptions in GTK/WX. In fact, I don't think it can be done (or at least | |
248 | that's my understanding from a c.l.py thread where this was discussed).""" |
|
248 | that's my understanding from a c.l.py thread where this was discussed).""" | |
249 |
|
249 | |||
250 | global KBINT |
|
250 | global KBINT | |
251 |
|
251 | |||
252 | print '\nKeyboardInterrupt - Press <Enter> to continue.', |
|
252 | print '\nKeyboardInterrupt - Press <Enter> to continue.', | |
253 | Term.cout.flush() |
|
253 | Term.cout.flush() | |
254 | # Set global flag so that runsource can know that Ctrl-C was hit |
|
254 | # Set global flag so that runsource can know that Ctrl-C was hit | |
255 | KBINT = True |
|
255 | KBINT = True | |
256 |
|
256 | |||
257 | class MTInteractiveShell(InteractiveShell): |
|
257 | class MTInteractiveShell(InteractiveShell): | |
258 | """Simple multi-threaded shell.""" |
|
258 | """Simple multi-threaded shell.""" | |
259 |
|
259 | |||
260 | # Threading strategy taken from: |
|
260 | # Threading strategy taken from: | |
261 | # http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/65109, by Brian |
|
261 | # http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/65109, by Brian | |
262 | # McErlean and John Finlay. Modified with corrections by Antoon Pardon, |
|
262 | # McErlean and John Finlay. Modified with corrections by Antoon Pardon, | |
263 | # from the pygtk mailing list, to avoid lockups with system calls. |
|
263 | # from the pygtk mailing list, to avoid lockups with system calls. | |
264 |
|
264 | |||
265 | # class attribute to indicate whether the class supports threads or not. |
|
265 | # class attribute to indicate whether the class supports threads or not. | |
266 | # Subclasses with thread support should override this as needed. |
|
266 | # Subclasses with thread support should override this as needed. | |
267 | isthreaded = True |
|
267 | isthreaded = True | |
268 |
|
268 | |||
269 | def __init__(self,name,usage=None,rc=Struct(opts=None,args=None), |
|
269 | def __init__(self,name,usage=None,rc=Struct(opts=None,args=None), | |
270 | user_ns=None,user_global_ns=None,banner2='',**kw): |
|
270 | user_ns=None,user_global_ns=None,banner2='',**kw): | |
271 | """Similar to the normal InteractiveShell, but with threading control""" |
|
271 | """Similar to the normal InteractiveShell, but with threading control""" | |
272 |
|
272 | |||
273 | InteractiveShell.__init__(self,name,usage,rc,user_ns, |
|
273 | InteractiveShell.__init__(self,name,usage,rc,user_ns, | |
274 | user_global_ns,banner2) |
|
274 | user_global_ns,banner2) | |
275 |
|
275 | |||
276 | # Locking control variable. We need to use a norma lock, not an RLock |
|
276 | # Locking control variable. We need to use a norma lock, not an RLock | |
277 | # here. I'm not exactly sure why, it seems to me like it should be |
|
277 | # here. I'm not exactly sure why, it seems to me like it should be | |
278 | # the opposite, but we deadlock with an RLock. Puzzled... |
|
278 | # the opposite, but we deadlock with an RLock. Puzzled... | |
279 | self.thread_ready = threading.Condition(threading.Lock()) |
|
279 | self.thread_ready = threading.Condition(threading.Lock()) | |
280 |
|
280 | |||
281 | # A queue to hold the code to be executed. A scalar variable is NOT |
|
281 | # A queue to hold the code to be executed. A scalar variable is NOT | |
282 | # enough, because uses like macros cause reentrancy. |
|
282 | # enough, because uses like macros cause reentrancy. | |
283 | self.code_queue = Queue.Queue() |
|
283 | self.code_queue = Queue.Queue() | |
284 |
|
284 | |||
285 | # Stuff to do at closing time |
|
285 | # Stuff to do at closing time | |
286 | self._kill = False |
|
286 | self._kill = False | |
287 | on_kill = kw.get('on_kill') |
|
287 | on_kill = kw.get('on_kill') | |
288 | if on_kill is None: |
|
288 | if on_kill is None: | |
289 | on_kill = [] |
|
289 | on_kill = [] | |
290 | # Check that all things to kill are callable: |
|
290 | # Check that all things to kill are callable: | |
291 | for t in on_kill: |
|
291 | for t in on_kill: | |
292 | if not callable(t): |
|
292 | if not callable(t): | |
293 | raise TypeError,'on_kill must be a list of callables' |
|
293 | raise TypeError,'on_kill must be a list of callables' | |
294 | self.on_kill = on_kill |
|
294 | self.on_kill = on_kill | |
295 |
|
295 | |||
296 | def runsource(self, source, filename="<input>", symbol="single"): |
|
296 | def runsource(self, source, filename="<input>", symbol="single"): | |
297 | """Compile and run some source in the interpreter. |
|
297 | """Compile and run some source in the interpreter. | |
298 |
|
298 | |||
299 | Modified version of code.py's runsource(), to handle threading issues. |
|
299 | Modified version of code.py's runsource(), to handle threading issues. | |
300 | See the original for full docstring details.""" |
|
300 | See the original for full docstring details.""" | |
301 |
|
301 | |||
302 | global KBINT |
|
302 | global KBINT | |
303 |
|
303 | |||
304 | # If Ctrl-C was typed, we reset the flag and return right away |
|
304 | # If Ctrl-C was typed, we reset the flag and return right away | |
305 | if KBINT: |
|
305 | if KBINT: | |
306 | KBINT = False |
|
306 | KBINT = False | |
307 | return False |
|
307 | return False | |
308 |
|
308 | |||
309 | try: |
|
309 | try: | |
310 | code = self.compile(source, filename, symbol) |
|
310 | code = self.compile(source, filename, symbol) | |
311 | except (OverflowError, SyntaxError, ValueError): |
|
311 | except (OverflowError, SyntaxError, ValueError): | |
312 | # Case 1 |
|
312 | # Case 1 | |
313 | self.showsyntaxerror(filename) |
|
313 | self.showsyntaxerror(filename) | |
314 | return False |
|
314 | return False | |
315 |
|
315 | |||
316 | if code is None: |
|
316 | if code is None: | |
317 | # Case 2 |
|
317 | # Case 2 | |
318 | return True |
|
318 | return True | |
319 |
|
319 | |||
320 | # Case 3 |
|
320 | # Case 3 | |
321 | # Store code in queue, so the execution thread can handle it. |
|
321 | # Store code in queue, so the execution thread can handle it. | |
322 |
|
322 | |||
323 | # Note that with macros and other applications, we MAY re-enter this |
|
323 | # Note that with macros and other applications, we MAY re-enter this | |
324 | # section, so we have to acquire the lock with non-blocking semantics, |
|
324 | # section, so we have to acquire the lock with non-blocking semantics, | |
325 | # else we deadlock. |
|
325 | # else we deadlock. | |
326 | got_lock = self.thread_ready.acquire(False) |
|
326 | got_lock = self.thread_ready.acquire(False) | |
327 | self.code_queue.put(code) |
|
327 | self.code_queue.put(code) | |
328 | if got_lock: |
|
328 | if got_lock: | |
329 | self.thread_ready.wait() # Wait until processed in timeout interval |
|
329 | self.thread_ready.wait() # Wait until processed in timeout interval | |
330 | self.thread_ready.release() |
|
330 | self.thread_ready.release() | |
331 |
|
331 | |||
332 | return False |
|
332 | return False | |
333 |
|
333 | |||
334 | def runcode(self): |
|
334 | def runcode(self): | |
335 | """Execute a code object. |
|
335 | """Execute a code object. | |
336 |
|
336 | |||
337 | Multithreaded wrapper around IPython's runcode().""" |
|
337 | Multithreaded wrapper around IPython's runcode().""" | |
338 |
|
338 | |||
339 | # lock thread-protected stuff |
|
339 | # lock thread-protected stuff | |
340 | self.thread_ready.acquire(False) |
|
340 | self.thread_ready.acquire(False) | |
341 |
|
341 | |||
342 | # Install sigint handler |
|
342 | # Install sigint handler | |
343 | try: |
|
343 | try: | |
344 | signal.signal(signal.SIGINT, sigint_handler) |
|
344 | signal.signal(signal.SIGINT, sigint_handler) | |
345 | except SystemError: |
|
345 | except SystemError: | |
346 | # This happens under Windows, which seems to have all sorts |
|
346 | # This happens under Windows, which seems to have all sorts | |
347 | # of problems with signal handling. Oh well... |
|
347 | # of problems with signal handling. Oh well... | |
348 | pass |
|
348 | pass | |
349 |
|
349 | |||
350 | if self._kill: |
|
350 | if self._kill: | |
351 | print >>Term.cout, 'Closing threads...', |
|
351 | print >>Term.cout, 'Closing threads...', | |
352 | Term.cout.flush() |
|
352 | Term.cout.flush() | |
353 | for tokill in self.on_kill: |
|
353 | for tokill in self.on_kill: | |
354 | tokill() |
|
354 | tokill() | |
355 | print >>Term.cout, 'Done.' |
|
355 | print >>Term.cout, 'Done.' | |
356 |
|
356 | |||
357 | # Flush queue of pending code by calling the run methood of the parent |
|
357 | # Flush queue of pending code by calling the run methood of the parent | |
358 | # class with all items which may be in the queue. |
|
358 | # class with all items which may be in the queue. | |
359 | while 1: |
|
359 | while 1: | |
360 | try: |
|
360 | try: | |
361 | code_to_run = self.code_queue.get_nowait() |
|
361 | code_to_run = self.code_queue.get_nowait() | |
362 | except Queue.Empty: |
|
362 | except Queue.Empty: | |
363 | break |
|
363 | break | |
364 | self.thread_ready.notify() |
|
364 | self.thread_ready.notify() | |
365 | InteractiveShell.runcode(self,code_to_run) |
|
365 | InteractiveShell.runcode(self,code_to_run) | |
366 |
|
366 | |||
367 | # We're done with thread-protected variables |
|
367 | # We're done with thread-protected variables | |
368 | self.thread_ready.release() |
|
368 | self.thread_ready.release() | |
369 | # This MUST return true for gtk threading to work |
|
369 | # This MUST return true for gtk threading to work | |
370 | return True |
|
370 | return True | |
371 |
|
371 | |||
372 | def kill (self): |
|
372 | def kill (self): | |
373 | """Kill the thread, returning when it has been shut down.""" |
|
373 | """Kill the thread, returning when it has been shut down.""" | |
374 | self.thread_ready.acquire(False) |
|
374 | self.thread_ready.acquire(False) | |
375 | self._kill = True |
|
375 | self._kill = True | |
376 | self.thread_ready.release() |
|
376 | self.thread_ready.release() | |
377 |
|
377 | |||
378 | class MatplotlibShellBase: |
|
378 | class MatplotlibShellBase: | |
379 | """Mixin class to provide the necessary modifications to regular IPython |
|
379 | """Mixin class to provide the necessary modifications to regular IPython | |
380 | shell classes for matplotlib support. |
|
380 | shell classes for matplotlib support. | |
381 |
|
381 | |||
382 | Given Python's MRO, this should be used as the FIRST class in the |
|
382 | Given Python's MRO, this should be used as the FIRST class in the | |
383 | inheritance hierarchy, so that it overrides the relevant methods.""" |
|
383 | inheritance hierarchy, so that it overrides the relevant methods.""" | |
384 |
|
384 | |||
385 | def _matplotlib_config(self,name): |
|
385 | def _matplotlib_config(self,name): | |
386 | """Return items needed to setup the user's shell with matplotlib""" |
|
386 | """Return items needed to setup the user's shell with matplotlib""" | |
387 |
|
387 | |||
388 | # Initialize matplotlib to interactive mode always |
|
388 | # Initialize matplotlib to interactive mode always | |
389 | import matplotlib |
|
389 | import matplotlib | |
390 | from matplotlib import backends |
|
390 | from matplotlib import backends | |
391 | matplotlib.interactive(True) |
|
391 | matplotlib.interactive(True) | |
392 |
|
392 | |||
393 | def use(arg): |
|
393 | def use(arg): | |
394 | """IPython wrapper for matplotlib's backend switcher. |
|
394 | """IPython wrapper for matplotlib's backend switcher. | |
395 |
|
395 | |||
396 | In interactive use, we can not allow switching to a different |
|
396 | In interactive use, we can not allow switching to a different | |
397 | interactive backend, since thread conflicts will most likely crash |
|
397 | interactive backend, since thread conflicts will most likely crash | |
398 | the python interpreter. This routine does a safety check first, |
|
398 | the python interpreter. This routine does a safety check first, | |
399 | and refuses to perform a dangerous switch. It still allows |
|
399 | and refuses to perform a dangerous switch. It still allows | |
400 | switching to non-interactive backends.""" |
|
400 | switching to non-interactive backends.""" | |
401 |
|
401 | |||
402 | if arg in backends.interactive_bk and arg != self.mpl_backend: |
|
402 | if arg in backends.interactive_bk and arg != self.mpl_backend: | |
403 | m=('invalid matplotlib backend switch.\n' |
|
403 | m=('invalid matplotlib backend switch.\n' | |
404 | 'This script attempted to switch to the interactive ' |
|
404 | 'This script attempted to switch to the interactive ' | |
405 | 'backend: `%s`\n' |
|
405 | 'backend: `%s`\n' | |
406 | 'Your current choice of interactive backend is: `%s`\n\n' |
|
406 | 'Your current choice of interactive backend is: `%s`\n\n' | |
407 | 'Switching interactive matplotlib backends at runtime\n' |
|
407 | 'Switching interactive matplotlib backends at runtime\n' | |
408 | 'would crash the python interpreter, ' |
|
408 | 'would crash the python interpreter, ' | |
409 | 'and IPython has blocked it.\n\n' |
|
409 | 'and IPython has blocked it.\n\n' | |
410 | 'You need to either change your choice of matplotlib backend\n' |
|
410 | 'You need to either change your choice of matplotlib backend\n' | |
411 | 'by editing your .matplotlibrc file, or run this script as a \n' |
|
411 | 'by editing your .matplotlibrc file, or run this script as a \n' | |
412 | 'standalone file from the command line, not using IPython.\n' % |
|
412 | 'standalone file from the command line, not using IPython.\n' % | |
413 | (arg,self.mpl_backend) ) |
|
413 | (arg,self.mpl_backend) ) | |
414 | raise RuntimeError, m |
|
414 | raise RuntimeError, m | |
415 | else: |
|
415 | else: | |
416 | self.mpl_use(arg) |
|
416 | self.mpl_use(arg) | |
417 | self.mpl_use._called = True |
|
417 | self.mpl_use._called = True | |
418 |
|
418 | |||
419 | self.matplotlib = matplotlib |
|
419 | self.matplotlib = matplotlib | |
420 | self.mpl_backend = matplotlib.rcParams['backend'] |
|
420 | self.mpl_backend = matplotlib.rcParams['backend'] | |
421 |
|
421 | |||
422 | # we also need to block switching of interactive backends by use() |
|
422 | # we also need to block switching of interactive backends by use() | |
423 | self.mpl_use = matplotlib.use |
|
423 | self.mpl_use = matplotlib.use | |
424 | self.mpl_use._called = False |
|
424 | self.mpl_use._called = False | |
425 | # overwrite the original matplotlib.use with our wrapper |
|
425 | # overwrite the original matplotlib.use with our wrapper | |
426 | matplotlib.use = use |
|
426 | matplotlib.use = use | |
427 |
|
427 | |||
428 | # This must be imported last in the matplotlib series, after |
|
428 | # This must be imported last in the matplotlib series, after | |
429 | # backend/interactivity choices have been made |
|
429 | # backend/interactivity choices have been made | |
430 | try: |
|
430 | try: | |
431 | import matplotlib.pylab as pylab |
|
431 | import matplotlib.pylab as pylab | |
432 | self.pylab = pylab |
|
432 | self.pylab = pylab | |
433 | self.pylab_name = 'pylab' |
|
433 | self.pylab_name = 'pylab' | |
434 | except ImportError: |
|
434 | except ImportError: | |
435 | import matplotlib.matlab as matlab |
|
435 | import matplotlib.matlab as matlab | |
436 | self.pylab = matlab |
|
436 | self.pylab = matlab | |
437 | self.pylab_name = 'matlab' |
|
437 | self.pylab_name = 'matlab' | |
438 |
|
438 | |||
439 | self.pylab.show._needmain = False |
|
439 | self.pylab.show._needmain = False | |
440 | # We need to detect at runtime whether show() is called by the user. |
|
440 | # We need to detect at runtime whether show() is called by the user. | |
441 | # For this, we wrap it into a decorator which adds a 'called' flag. |
|
441 | # For this, we wrap it into a decorator which adds a 'called' flag. | |
442 | self.pylab.draw_if_interactive = flag_calls(self.pylab.draw_if_interactive) |
|
442 | self.pylab.draw_if_interactive = flag_calls(self.pylab.draw_if_interactive) | |
443 |
|
443 | |||
444 | # Build a user namespace initialized with matplotlib/matlab features. |
|
444 | # Build a user namespace initialized with matplotlib/matlab features. | |
445 | user_ns = {'__name__':'__main__', |
|
445 | user_ns = {'__name__':'__main__', | |
446 | '__builtins__' : __builtin__ } |
|
446 | '__builtins__' : __builtin__ } | |
447 |
|
447 | |||
448 | # Be careful not to remove the final \n in the code string below, or |
|
448 | # Be careful not to remove the final \n in the code string below, or | |
449 | # things will break badly with py22 (I think it's a python bug, 2.3 is |
|
449 | # things will break badly with py22 (I think it's a python bug, 2.3 is | |
450 | # OK). |
|
450 | # OK). | |
451 | pname = self.pylab_name # Python can't interpolate dotted var names |
|
451 | pname = self.pylab_name # Python can't interpolate dotted var names | |
452 | exec ("import matplotlib\n" |
|
452 | exec ("import matplotlib\n" | |
453 | "import matplotlib.%(pname)s as %(pname)s\n" |
|
453 | "import matplotlib.%(pname)s as %(pname)s\n" | |
454 | "from matplotlib.%(pname)s import *\n" % locals()) in user_ns |
|
454 | "from matplotlib.%(pname)s import *\n" % locals()) in user_ns | |
455 |
|
455 | |||
456 | # Build matplotlib info banner |
|
456 | # Build matplotlib info banner | |
457 | b=""" |
|
457 | b=""" | |
458 | Welcome to pylab, a matplotlib-based Python environment. |
|
458 | Welcome to pylab, a matplotlib-based Python environment. | |
459 | For more information, type 'help(pylab)'. |
|
459 | For more information, type 'help(pylab)'. | |
460 | """ |
|
460 | """ | |
461 | return user_ns,b |
|
461 | return user_ns,b | |
462 |
|
462 | |||
463 | def mplot_exec(self,fname,*where,**kw): |
|
463 | def mplot_exec(self,fname,*where,**kw): | |
464 | """Execute a matplotlib script. |
|
464 | """Execute a matplotlib script. | |
465 |
|
465 | |||
466 | This is a call to execfile(), but wrapped in safeties to properly |
|
466 | This is a call to execfile(), but wrapped in safeties to properly | |
467 | handle interactive rendering and backend switching.""" |
|
467 | handle interactive rendering and backend switching.""" | |
468 |
|
468 | |||
469 | #print '*** Matplotlib runner ***' # dbg |
|
469 | #print '*** Matplotlib runner ***' # dbg | |
470 | # turn off rendering until end of script |
|
470 | # turn off rendering until end of script | |
471 | isInteractive = self.matplotlib.rcParams['interactive'] |
|
471 | isInteractive = self.matplotlib.rcParams['interactive'] | |
472 | self.matplotlib.interactive(False) |
|
472 | self.matplotlib.interactive(False) | |
473 | self.safe_execfile(fname,*where,**kw) |
|
473 | self.safe_execfile(fname,*where,**kw) | |
474 | self.matplotlib.interactive(isInteractive) |
|
474 | self.matplotlib.interactive(isInteractive) | |
475 | # make rendering call now, if the user tried to do it |
|
475 | # make rendering call now, if the user tried to do it | |
476 | if self.pylab.draw_if_interactive.called: |
|
476 | if self.pylab.draw_if_interactive.called: | |
477 | self.pylab.draw() |
|
477 | self.pylab.draw() | |
478 | self.pylab.draw_if_interactive.called = False |
|
478 | self.pylab.draw_if_interactive.called = False | |
479 |
|
479 | |||
480 | # if a backend switch was performed, reverse it now |
|
480 | # if a backend switch was performed, reverse it now | |
481 | if self.mpl_use._called: |
|
481 | if self.mpl_use._called: | |
482 | self.matplotlib.rcParams['backend'] = self.mpl_backend |
|
482 | self.matplotlib.rcParams['backend'] = self.mpl_backend | |
483 |
|
483 | |||
484 | def magic_run(self,parameter_s=''): |
|
484 | def magic_run(self,parameter_s=''): | |
485 | Magic.magic_run(self,parameter_s,runner=self.mplot_exec) |
|
485 | Magic.magic_run(self,parameter_s,runner=self.mplot_exec) | |
486 |
|
486 | |||
487 | # Fix the docstring so users see the original as well |
|
487 | # Fix the docstring so users see the original as well | |
488 | magic_run.__doc__ = "%s\n%s" % (Magic.magic_run.__doc__, |
|
488 | magic_run.__doc__ = "%s\n%s" % (Magic.magic_run.__doc__, | |
489 | "\n *** Modified %run for Matplotlib," |
|
489 | "\n *** Modified %run for Matplotlib," | |
490 | " with proper interactive handling ***") |
|
490 | " with proper interactive handling ***") | |
491 |
|
491 | |||
492 | # Now we provide 2 versions of a matplotlib-aware IPython base shells, single |
|
492 | # Now we provide 2 versions of a matplotlib-aware IPython base shells, single | |
493 | # and multithreaded. Note that these are meant for internal use, the IPShell* |
|
493 | # and multithreaded. Note that these are meant for internal use, the IPShell* | |
494 | # classes below are the ones meant for public consumption. |
|
494 | # classes below are the ones meant for public consumption. | |
495 |
|
495 | |||
496 | class MatplotlibShell(MatplotlibShellBase,InteractiveShell): |
|
496 | class MatplotlibShell(MatplotlibShellBase,InteractiveShell): | |
497 | """Single-threaded shell with matplotlib support.""" |
|
497 | """Single-threaded shell with matplotlib support.""" | |
498 |
|
498 | |||
499 | def __init__(self,name,usage=None,rc=Struct(opts=None,args=None), |
|
499 | def __init__(self,name,usage=None,rc=Struct(opts=None,args=None), | |
500 | user_ns=None,user_global_ns=None,**kw): |
|
500 | user_ns=None,user_global_ns=None,**kw): | |
501 | user_ns,b2 = self._matplotlib_config(name) |
|
501 | user_ns,b2 = self._matplotlib_config(name) | |
502 | InteractiveShell.__init__(self,name,usage,rc,user_ns,user_global_ns, |
|
502 | InteractiveShell.__init__(self,name,usage,rc,user_ns,user_global_ns, | |
503 | banner2=b2,**kw) |
|
503 | banner2=b2,**kw) | |
504 |
|
504 | |||
505 | class MatplotlibMTShell(MatplotlibShellBase,MTInteractiveShell): |
|
505 | class MatplotlibMTShell(MatplotlibShellBase,MTInteractiveShell): | |
506 | """Multi-threaded shell with matplotlib support.""" |
|
506 | """Multi-threaded shell with matplotlib support.""" | |
507 |
|
507 | |||
508 | def __init__(self,name,usage=None,rc=Struct(opts=None,args=None), |
|
508 | def __init__(self,name,usage=None,rc=Struct(opts=None,args=None), | |
509 | user_ns=None,user_global_ns=None, **kw): |
|
509 | user_ns=None,user_global_ns=None, **kw): | |
510 | user_ns,b2 = self._matplotlib_config(name) |
|
510 | user_ns,b2 = self._matplotlib_config(name) | |
511 | MTInteractiveShell.__init__(self,name,usage,rc,user_ns,user_global_ns, |
|
511 | MTInteractiveShell.__init__(self,name,usage,rc,user_ns,user_global_ns, | |
512 | banner2=b2,**kw) |
|
512 | banner2=b2,**kw) | |
513 |
|
513 | |||
514 | #----------------------------------------------------------------------------- |
|
514 | #----------------------------------------------------------------------------- | |
515 | # Utility functions for the different GUI enabled IPShell* classes. |
|
515 | # Utility functions for the different GUI enabled IPShell* classes. | |
516 |
|
516 | |||
517 | def get_tk(): |
|
517 | def get_tk(): | |
518 | """Tries to import Tkinter and returns a withdrawn Tkinter root |
|
518 | """Tries to import Tkinter and returns a withdrawn Tkinter root | |
519 | window. If Tkinter is already imported or not available, this |
|
519 | window. If Tkinter is already imported or not available, this | |
520 | returns None. This function calls `hijack_tk` underneath. |
|
520 | returns None. This function calls `hijack_tk` underneath. | |
521 | """ |
|
521 | """ | |
522 | if not USE_TK or sys.modules.has_key('Tkinter'): |
|
522 | if not USE_TK or sys.modules.has_key('Tkinter'): | |
523 | return None |
|
523 | return None | |
524 | else: |
|
524 | else: | |
525 | try: |
|
525 | try: | |
526 | import Tkinter |
|
526 | import Tkinter | |
527 | except ImportError: |
|
527 | except ImportError: | |
528 | return None |
|
528 | return None | |
529 | else: |
|
529 | else: | |
530 | hijack_tk() |
|
530 | hijack_tk() | |
531 | r = Tkinter.Tk() |
|
531 | r = Tkinter.Tk() | |
532 | r.withdraw() |
|
532 | r.withdraw() | |
533 | return r |
|
533 | return r | |
534 |
|
534 | |||
535 | def hijack_tk(): |
|
535 | def hijack_tk(): | |
536 | """Modifies Tkinter's mainloop with a dummy so when a module calls |
|
536 | """Modifies Tkinter's mainloop with a dummy so when a module calls | |
537 | mainloop, it does not block. |
|
537 | mainloop, it does not block. | |
538 |
|
538 | |||
539 | """ |
|
539 | """ | |
540 | def misc_mainloop(self, n=0): |
|
540 | def misc_mainloop(self, n=0): | |
541 | pass |
|
541 | pass | |
542 | def tkinter_mainloop(n=0): |
|
542 | def tkinter_mainloop(n=0): | |
543 | pass |
|
543 | pass | |
544 |
|
544 | |||
545 | import Tkinter |
|
545 | import Tkinter | |
546 | Tkinter.Misc.mainloop = misc_mainloop |
|
546 | Tkinter.Misc.mainloop = misc_mainloop | |
547 | Tkinter.mainloop = tkinter_mainloop |
|
547 | Tkinter.mainloop = tkinter_mainloop | |
548 |
|
548 | |||
549 | def update_tk(tk): |
|
549 | def update_tk(tk): | |
550 | """Updates the Tkinter event loop. This is typically called from |
|
550 | """Updates the Tkinter event loop. This is typically called from | |
551 | the respective WX or GTK mainloops. |
|
551 | the respective WX or GTK mainloops. | |
552 | """ |
|
552 | """ | |
553 | if tk: |
|
553 | if tk: | |
554 | tk.update() |
|
554 | tk.update() | |
555 |
|
555 | |||
556 | def hijack_wx(): |
|
556 | def hijack_wx(): | |
557 | """Modifies wxPython's MainLoop with a dummy so user code does not |
|
557 | """Modifies wxPython's MainLoop with a dummy so user code does not | |
558 | block IPython. The hijacked mainloop function is returned. |
|
558 | block IPython. The hijacked mainloop function is returned. | |
559 | """ |
|
559 | """ | |
560 | def dummy_mainloop(*args, **kw): |
|
560 | def dummy_mainloop(*args, **kw): | |
561 | pass |
|
561 | pass | |
562 | import wxPython |
|
562 | import wxPython | |
563 | ver = wxPython.__version__ |
|
563 | ver = wxPython.__version__ | |
564 | orig_mainloop = None |
|
564 | orig_mainloop = None | |
565 | if ver[:3] >= '2.5': |
|
565 | if ver[:3] >= '2.5': | |
566 | import wx |
|
566 | import wx | |
567 | if hasattr(wx, '_core_'): core = getattr(wx, '_core_') |
|
567 | if hasattr(wx, '_core_'): core = getattr(wx, '_core_') | |
568 | elif hasattr(wx, '_core'): core = getattr(wx, '_core') |
|
568 | elif hasattr(wx, '_core'): core = getattr(wx, '_core') | |
569 | else: raise AttributeError('Could not find wx core module') |
|
569 | else: raise AttributeError('Could not find wx core module') | |
570 | orig_mainloop = core.PyApp_MainLoop |
|
570 | orig_mainloop = core.PyApp_MainLoop | |
571 | core.PyApp_MainLoop = dummy_mainloop |
|
571 | core.PyApp_MainLoop = dummy_mainloop | |
572 | elif ver[:3] == '2.4': |
|
572 | elif ver[:3] == '2.4': | |
573 | orig_mainloop = wxPython.wxc.wxPyApp_MainLoop |
|
573 | orig_mainloop = wxPython.wxc.wxPyApp_MainLoop | |
574 | wxPython.wxc.wxPyApp_MainLoop = dummy_mainloop |
|
574 | wxPython.wxc.wxPyApp_MainLoop = dummy_mainloop | |
575 | else: |
|
575 | else: | |
576 | warn("Unable to find either wxPython version 2.4 or >= 2.5.") |
|
576 | warn("Unable to find either wxPython version 2.4 or >= 2.5.") | |
577 | return orig_mainloop |
|
577 | return orig_mainloop | |
578 |
|
578 | |||
579 | def hijack_gtk(): |
|
579 | def hijack_gtk(): | |
580 | """Modifies pyGTK's mainloop with a dummy so user code does not |
|
580 | """Modifies pyGTK's mainloop with a dummy so user code does not | |
581 | block IPython. This function returns the original `gtk.mainloop` |
|
581 | block IPython. This function returns the original `gtk.mainloop` | |
582 | function that has been hijacked. |
|
582 | function that has been hijacked. | |
583 | """ |
|
583 | """ | |
584 | def dummy_mainloop(*args, **kw): |
|
584 | def dummy_mainloop(*args, **kw): | |
585 | pass |
|
585 | pass | |
586 | import gtk |
|
586 | import gtk | |
587 | if gtk.pygtk_version >= (2,4,0): orig_mainloop = gtk.main |
|
587 | if gtk.pygtk_version >= (2,4,0): orig_mainloop = gtk.main | |
588 | else: orig_mainloop = gtk.mainloop |
|
588 | else: orig_mainloop = gtk.mainloop | |
589 | gtk.mainloop = dummy_mainloop |
|
589 | gtk.mainloop = dummy_mainloop | |
590 | gtk.main = dummy_mainloop |
|
590 | gtk.main = dummy_mainloop | |
591 | return orig_mainloop |
|
591 | return orig_mainloop | |
592 |
|
592 | |||
593 | #----------------------------------------------------------------------------- |
|
593 | #----------------------------------------------------------------------------- | |
594 | # The IPShell* classes below are the ones meant to be run by external code as |
|
594 | # The IPShell* classes below are the ones meant to be run by external code as | |
595 | # IPython instances. Note that unless a specific threading strategy is |
|
595 | # IPython instances. Note that unless a specific threading strategy is | |
596 | # desired, the factory function start() below should be used instead (it |
|
596 | # desired, the factory function start() below should be used instead (it | |
597 | # selects the proper threaded class). |
|
597 | # selects the proper threaded class). | |
598 |
|
598 | |||
599 | class IPShellGTK(threading.Thread): |
|
599 | class IPShellGTK(threading.Thread): | |
600 | """Run a gtk mainloop() in a separate thread. |
|
600 | """Run a gtk mainloop() in a separate thread. | |
601 |
|
601 | |||
602 | Python commands can be passed to the thread where they will be executed. |
|
602 | Python commands can be passed to the thread where they will be executed. | |
603 | This is implemented by periodically checking for passed code using a |
|
603 | This is implemented by periodically checking for passed code using a | |
604 | GTK timeout callback.""" |
|
604 | GTK timeout callback.""" | |
605 |
|
605 | |||
606 | TIMEOUT = 100 # Millisecond interval between timeouts. |
|
606 | TIMEOUT = 100 # Millisecond interval between timeouts. | |
607 |
|
607 | |||
608 | def __init__(self,argv=None,user_ns=None,user_global_ns=None, |
|
608 | def __init__(self,argv=None,user_ns=None,user_global_ns=None, | |
609 | debug=1,shell_class=MTInteractiveShell): |
|
609 | debug=1,shell_class=MTInteractiveShell): | |
610 |
|
610 | |||
611 | import gtk |
|
611 | import gtk | |
612 |
|
612 | |||
613 | self.gtk = gtk |
|
613 | self.gtk = gtk | |
614 | self.gtk_mainloop = hijack_gtk() |
|
614 | self.gtk_mainloop = hijack_gtk() | |
615 |
|
615 | |||
616 | # Allows us to use both Tk and GTK. |
|
616 | # Allows us to use both Tk and GTK. | |
617 | self.tk = get_tk() |
|
617 | self.tk = get_tk() | |
618 |
|
618 | |||
619 | if gtk.pygtk_version >= (2,4,0): mainquit = self.gtk.main_quit |
|
619 | if gtk.pygtk_version >= (2,4,0): mainquit = self.gtk.main_quit | |
620 | else: mainquit = self.gtk.mainquit |
|
620 | else: mainquit = self.gtk.mainquit | |
621 |
|
621 | |||
622 | self.IP = make_IPython(argv,user_ns=user_ns, |
|
622 | self.IP = make_IPython(argv,user_ns=user_ns, | |
623 | user_global_ns=user_global_ns, |
|
623 | user_global_ns=user_global_ns, | |
624 | debug=debug, |
|
624 | debug=debug, | |
625 | shell_class=shell_class, |
|
625 | shell_class=shell_class, | |
626 | on_kill=[mainquit]) |
|
626 | on_kill=[mainquit]) | |
627 |
|
627 | |||
628 | # HACK: slot for banner in self; it will be passed to the mainloop |
|
628 | # HACK: slot for banner in self; it will be passed to the mainloop | |
629 | # method only and .run() needs it. The actual value will be set by |
|
629 | # method only and .run() needs it. The actual value will be set by | |
630 | # .mainloop(). |
|
630 | # .mainloop(). | |
631 | self._banner = None |
|
631 | self._banner = None | |
632 |
|
632 | |||
633 | threading.Thread.__init__(self) |
|
633 | threading.Thread.__init__(self) | |
634 |
|
634 | |||
635 | def run(self): |
|
635 | def run(self): | |
636 | self.IP.mainloop(self._banner) |
|
636 | self.IP.mainloop(self._banner) | |
637 | self.IP.kill() |
|
637 | self.IP.kill() | |
638 |
|
638 | |||
639 | def mainloop(self,sys_exit=0,banner=None): |
|
639 | def mainloop(self,sys_exit=0,banner=None): | |
640 |
|
640 | |||
641 | self._banner = banner |
|
641 | self._banner = banner | |
642 |
|
642 | |||
643 | if self.gtk.pygtk_version >= (2,4,0): |
|
643 | if self.gtk.pygtk_version >= (2,4,0): | |
644 | import gobject |
|
644 | import gobject | |
645 | gobject.idle_add(self.on_timer) |
|
645 | gobject.idle_add(self.on_timer) | |
646 | else: |
|
646 | else: | |
647 | self.gtk.idle_add(self.on_timer) |
|
647 | self.gtk.idle_add(self.on_timer) | |
648 |
|
648 | |||
649 | if sys.platform != 'win32': |
|
649 | if sys.platform != 'win32': | |
650 | try: |
|
650 | try: | |
651 | if self.gtk.gtk_version[0] >= 2: |
|
651 | if self.gtk.gtk_version[0] >= 2: | |
652 | self.gtk.threads_init() |
|
652 | self.gtk.threads_init() | |
653 | except AttributeError: |
|
653 | except AttributeError: | |
654 | pass |
|
654 | pass | |
655 | except RuntimeError: |
|
655 | except RuntimeError: | |
656 | error('Your pyGTK likely has not been compiled with ' |
|
656 | error('Your pyGTK likely has not been compiled with ' | |
657 | 'threading support.\n' |
|
657 | 'threading support.\n' | |
658 | 'The exception printout is below.\n' |
|
658 | 'The exception printout is below.\n' | |
659 | 'You can either rebuild pyGTK with threads, or ' |
|
659 | 'You can either rebuild pyGTK with threads, or ' | |
660 | 'try using \n' |
|
660 | 'try using \n' | |
661 | 'matplotlib with a different backend (like Tk or WX).\n' |
|
661 | 'matplotlib with a different backend (like Tk or WX).\n' | |
662 | 'Note that matplotlib will most likely not work in its ' |
|
662 | 'Note that matplotlib will most likely not work in its ' | |
663 | 'current state!') |
|
663 | 'current state!') | |
664 | self.IP.InteractiveTB() |
|
664 | self.IP.InteractiveTB() | |
665 | self.start() |
|
665 | self.start() | |
666 | self.gtk.threads_enter() |
|
666 | self.gtk.threads_enter() | |
667 | self.gtk_mainloop() |
|
667 | self.gtk_mainloop() | |
668 | self.gtk.threads_leave() |
|
668 | self.gtk.threads_leave() | |
669 | self.join() |
|
669 | self.join() | |
670 |
|
670 | |||
671 | def on_timer(self): |
|
671 | def on_timer(self): | |
672 | """Called when GTK is idle. |
|
672 | """Called when GTK is idle. | |
673 |
|
673 | |||
674 | Must return True always, otherwise GTK stops calling it""" |
|
674 | Must return True always, otherwise GTK stops calling it""" | |
675 |
|
675 | |||
676 | update_tk(self.tk) |
|
676 | update_tk(self.tk) | |
677 | self.IP.runcode() |
|
677 | self.IP.runcode() | |
678 | time.sleep(0.01) |
|
678 | time.sleep(0.01) | |
679 | return True |
|
679 | return True | |
680 |
|
680 | |||
681 | class IPShellWX(threading.Thread): |
|
681 | class IPShellWX(threading.Thread): | |
682 | """Run a wx mainloop() in a separate thread. |
|
682 | """Run a wx mainloop() in a separate thread. | |
683 |
|
683 | |||
684 | Python commands can be passed to the thread where they will be executed. |
|
684 | Python commands can be passed to the thread where they will be executed. | |
685 | This is implemented by periodically checking for passed code using a |
|
685 | This is implemented by periodically checking for passed code using a | |
686 | GTK timeout callback.""" |
|
686 | GTK timeout callback.""" | |
687 |
|
687 | |||
688 | TIMEOUT = 100 # Millisecond interval between timeouts. |
|
688 | TIMEOUT = 100 # Millisecond interval between timeouts. | |
689 |
|
689 | |||
690 | def __init__(self,argv=None,user_ns=None,user_global_ns=None, |
|
690 | def __init__(self,argv=None,user_ns=None,user_global_ns=None, | |
691 | debug=1,shell_class=MTInteractiveShell): |
|
691 | debug=1,shell_class=MTInteractiveShell): | |
692 |
|
692 | |||
693 | self.IP = make_IPython(argv,user_ns=user_ns, |
|
693 | self.IP = make_IPython(argv,user_ns=user_ns, | |
694 | user_global_ns=user_global_ns, |
|
694 | user_global_ns=user_global_ns, | |
695 | debug=debug, |
|
695 | debug=debug, | |
696 | shell_class=shell_class, |
|
696 | shell_class=shell_class, | |
697 | on_kill=[self.wxexit]) |
|
697 | on_kill=[self.wxexit]) | |
698 |
|
698 | |||
699 | wantedwxversion=self.IP.rc.wxversion |
|
699 | wantedwxversion=self.IP.rc.wxversion | |
700 | if wantedwxversion!="0": |
|
700 | if wantedwxversion!="0": | |
701 | try: |
|
701 | try: | |
702 | import wxversion |
|
702 | import wxversion | |
703 | except ImportError: |
|
703 | except ImportError: | |
704 | error('The wxversion module is needed for WX version selection') |
|
704 | error('The wxversion module is needed for WX version selection') | |
705 | else: |
|
705 | else: | |
706 | try: |
|
706 | try: | |
707 | wxversion.select(wantedwxversion) |
|
707 | wxversion.select(wantedwxversion) | |
708 | except: |
|
708 | except: | |
709 | self.IP.InteractiveTB() |
|
709 | self.IP.InteractiveTB() | |
710 | error('Requested wxPython version %s could not be loaded' % |
|
710 | error('Requested wxPython version %s could not be loaded' % | |
711 | wantedwxversion) |
|
711 | wantedwxversion) | |
712 |
|
712 | |||
713 | import wxPython.wx as wx |
|
713 | import wxPython.wx as wx | |
714 |
|
714 | |||
715 | threading.Thread.__init__(self) |
|
715 | threading.Thread.__init__(self) | |
716 | self.wx = wx |
|
716 | self.wx = wx | |
717 | self.wx_mainloop = hijack_wx() |
|
717 | self.wx_mainloop = hijack_wx() | |
718 |
|
718 | |||
719 | # Allows us to use both Tk and GTK. |
|
719 | # Allows us to use both Tk and GTK. | |
720 | self.tk = get_tk() |
|
720 | self.tk = get_tk() | |
721 |
|
721 | |||
722 |
|
722 | |||
723 | # HACK: slot for banner in self; it will be passed to the mainloop |
|
723 | # HACK: slot for banner in self; it will be passed to the mainloop | |
724 | # method only and .run() needs it. The actual value will be set by |
|
724 | # method only and .run() needs it. The actual value will be set by | |
725 | # .mainloop(). |
|
725 | # .mainloop(). | |
726 | self._banner = None |
|
726 | self._banner = None | |
727 |
|
727 | |||
728 | self.app = None |
|
728 | self.app = None | |
729 |
|
729 | |||
730 | def wxexit(self, *args): |
|
730 | def wxexit(self, *args): | |
731 | if self.app is not None: |
|
731 | if self.app is not None: | |
732 | self.app.agent.timer.Stop() |
|
732 | self.app.agent.timer.Stop() | |
733 | self.app.ExitMainLoop() |
|
733 | self.app.ExitMainLoop() | |
734 |
|
734 | |||
735 | def run(self): |
|
735 | def run(self): | |
736 | self.IP.mainloop(self._banner) |
|
736 | self.IP.mainloop(self._banner) | |
737 | self.IP.kill() |
|
737 | self.IP.kill() | |
738 |
|
738 | |||
739 | def mainloop(self,sys_exit=0,banner=None): |
|
739 | def mainloop(self,sys_exit=0,banner=None): | |
740 |
|
740 | |||
741 | self._banner = banner |
|
741 | self._banner = banner | |
742 |
|
742 | |||
743 | self.start() |
|
743 | self.start() | |
744 |
|
744 | |||
745 | class TimerAgent(self.wx.wxMiniFrame): |
|
745 | class TimerAgent(self.wx.wxMiniFrame): | |
746 | wx = self.wx |
|
746 | wx = self.wx | |
747 | IP = self.IP |
|
747 | IP = self.IP | |
748 | tk = self.tk |
|
748 | tk = self.tk | |
749 | def __init__(self, parent, interval): |
|
749 | def __init__(self, parent, interval): | |
750 | style = self.wx.wxDEFAULT_FRAME_STYLE | self.wx.wxTINY_CAPTION_HORIZ |
|
750 | style = self.wx.wxDEFAULT_FRAME_STYLE | self.wx.wxTINY_CAPTION_HORIZ | |
751 | self.wx.wxMiniFrame.__init__(self, parent, -1, ' ', pos=(200, 200), |
|
751 | self.wx.wxMiniFrame.__init__(self, parent, -1, ' ', pos=(200, 200), | |
752 | size=(100, 100),style=style) |
|
752 | size=(100, 100),style=style) | |
753 | self.Show(False) |
|
753 | self.Show(False) | |
754 | self.interval = interval |
|
754 | self.interval = interval | |
755 | self.timerId = self.wx.wxNewId() |
|
755 | self.timerId = self.wx.wxNewId() | |
756 |
|
756 | |||
757 | def StartWork(self): |
|
757 | def StartWork(self): | |
758 | self.timer = self.wx.wxTimer(self, self.timerId) |
|
758 | self.timer = self.wx.wxTimer(self, self.timerId) | |
759 | self.wx.EVT_TIMER(self, self.timerId, self.OnTimer) |
|
759 | self.wx.EVT_TIMER(self, self.timerId, self.OnTimer) | |
760 | self.timer.Start(self.interval) |
|
760 | self.timer.Start(self.interval) | |
761 |
|
761 | |||
762 | def OnTimer(self, event): |
|
762 | def OnTimer(self, event): | |
763 | update_tk(self.tk) |
|
763 | update_tk(self.tk) | |
764 | self.IP.runcode() |
|
764 | self.IP.runcode() | |
765 |
|
765 | |||
766 | class App(self.wx.wxApp): |
|
766 | class App(self.wx.wxApp): | |
767 | wx = self.wx |
|
767 | wx = self.wx | |
768 | TIMEOUT = self.TIMEOUT |
|
768 | TIMEOUT = self.TIMEOUT | |
769 | def OnInit(self): |
|
769 | def OnInit(self): | |
770 | 'Create the main window and insert the custom frame' |
|
770 | 'Create the main window and insert the custom frame' | |
771 | self.agent = TimerAgent(None, self.TIMEOUT) |
|
771 | self.agent = TimerAgent(None, self.TIMEOUT) | |
772 | self.agent.Show(self.wx.false) |
|
772 | self.agent.Show(self.wx.false) | |
773 | self.agent.StartWork() |
|
773 | self.agent.StartWork() | |
774 | return self.wx.true |
|
774 | return self.wx.true | |
775 |
|
775 | |||
776 | self.app = App(redirect=False) |
|
776 | self.app = App(redirect=False) | |
777 | self.wx_mainloop(self.app) |
|
777 | self.wx_mainloop(self.app) | |
778 | self.join() |
|
778 | self.join() | |
779 |
|
779 | |||
780 |
|
780 | |||
781 | class IPShellQt(threading.Thread): |
|
781 | class IPShellQt(threading.Thread): | |
782 | """Run a Qt event loop in a separate thread. |
|
782 | """Run a Qt event loop in a separate thread. | |
783 |
|
783 | |||
784 | Python commands can be passed to the thread where they will be executed. |
|
784 | Python commands can be passed to the thread where they will be executed. | |
785 | This is implemented by periodically checking for passed code using a |
|
785 | This is implemented by periodically checking for passed code using a | |
786 | Qt timer / slot.""" |
|
786 | Qt timer / slot.""" | |
787 |
|
787 | |||
788 | TIMEOUT = 100 # Millisecond interval between timeouts. |
|
788 | TIMEOUT = 100 # Millisecond interval between timeouts. | |
789 |
|
789 | |||
790 | def __init__(self,argv=None,user_ns=None,user_global_ns=None, |
|
790 | def __init__(self,argv=None,user_ns=None,user_global_ns=None, | |
791 | debug=0,shell_class=MTInteractiveShell): |
|
791 | debug=0,shell_class=MTInteractiveShell): | |
792 |
|
792 | |||
793 | import qt |
|
793 | import qt | |
794 |
|
794 | |||
795 | class newQApplication: |
|
795 | class newQApplication: | |
796 | def __init__( self ): |
|
796 | def __init__( self ): | |
797 | self.QApplication = qt.QApplication |
|
797 | self.QApplication = qt.QApplication | |
798 |
|
798 | |||
799 | def __call__( *args, **kwargs ): |
|
799 | def __call__( *args, **kwargs ): | |
800 | return qt.qApp |
|
800 | return qt.qApp | |
801 |
|
801 | |||
802 | def exec_loop( *args, **kwargs ): |
|
802 | def exec_loop( *args, **kwargs ): | |
803 | pass |
|
803 | pass | |
804 |
|
804 | |||
805 | def __getattr__( self, name ): |
|
805 | def __getattr__( self, name ): | |
806 | return getattr( self.QApplication, name ) |
|
806 | return getattr( self.QApplication, name ) | |
807 |
|
807 | |||
808 | qt.QApplication = newQApplication() |
|
808 | qt.QApplication = newQApplication() | |
809 |
|
809 | |||
810 | # Allows us to use both Tk and QT. |
|
810 | # Allows us to use both Tk and QT. | |
811 | self.tk = get_tk() |
|
811 | self.tk = get_tk() | |
812 |
|
812 | |||
813 | self.IP = make_IPython(argv,user_ns=user_ns, |
|
813 | self.IP = make_IPython(argv,user_ns=user_ns, | |
814 | user_global_ns=user_global_ns, |
|
814 | user_global_ns=user_global_ns, | |
815 | debug=debug, |
|
815 | debug=debug, | |
816 | shell_class=shell_class, |
|
816 | shell_class=shell_class, | |
817 | on_kill=[qt.qApp.exit]) |
|
817 | on_kill=[qt.qApp.exit]) | |
818 |
|
818 | |||
819 | # HACK: slot for banner in self; it will be passed to the mainloop |
|
819 | # HACK: slot for banner in self; it will be passed to the mainloop | |
820 | # method only and .run() needs it. The actual value will be set by |
|
820 | # method only and .run() needs it. The actual value will be set by | |
821 | # .mainloop(). |
|
821 | # .mainloop(). | |
822 | self._banner = None |
|
822 | self._banner = None | |
823 |
|
823 | |||
824 | threading.Thread.__init__(self) |
|
824 | threading.Thread.__init__(self) | |
825 |
|
825 | |||
826 | def run(self): |
|
826 | def run(self): | |
827 | self.IP.mainloop(self._banner) |
|
827 | self.IP.mainloop(self._banner) | |
828 | self.IP.kill() |
|
828 | self.IP.kill() | |
829 |
|
829 | |||
830 | def mainloop(self,sys_exit=0,banner=None): |
|
830 | def mainloop(self,sys_exit=0,banner=None): | |
831 |
|
831 | |||
832 | import qt |
|
832 | import qt | |
833 |
|
833 | |||
834 | self._banner = banner |
|
834 | self._banner = banner | |
835 |
|
835 | |||
836 | if qt.QApplication.startingUp(): |
|
836 | if qt.QApplication.startingUp(): | |
837 | a = qt.QApplication.QApplication(sys.argv) |
|
837 | a = qt.QApplication.QApplication(sys.argv) | |
838 | self.timer = qt.QTimer() |
|
838 | self.timer = qt.QTimer() | |
839 | qt.QObject.connect( self.timer, qt.SIGNAL( 'timeout()' ), self.on_timer ) |
|
839 | qt.QObject.connect( self.timer, qt.SIGNAL( 'timeout()' ), self.on_timer ) | |
840 |
|
840 | |||
841 | self.start() |
|
841 | self.start() | |
842 | self.timer.start( self.TIMEOUT, True ) |
|
842 | self.timer.start( self.TIMEOUT, True ) | |
843 | while True: |
|
843 | while True: | |
844 | if self.IP._kill: break |
|
844 | if self.IP._kill: break | |
845 | qt.qApp.exec_loop() |
|
845 | qt.qApp.exec_loop() | |
846 | self.join() |
|
846 | self.join() | |
847 |
|
847 | |||
848 | def on_timer(self): |
|
848 | def on_timer(self): | |
849 | update_tk(self.tk) |
|
849 | update_tk(self.tk) | |
850 | result = self.IP.runcode() |
|
850 | result = self.IP.runcode() | |
851 | self.timer.start( self.TIMEOUT, True ) |
|
851 | self.timer.start( self.TIMEOUT, True ) | |
852 | return result |
|
852 | return result | |
853 |
|
853 | |||
854 | # A set of matplotlib public IPython shell classes, for single-threaded |
|
854 | # A set of matplotlib public IPython shell classes, for single-threaded | |
855 | # (Tk* and FLTK* backends) and multithreaded (GTK* and WX* backends) use. |
|
855 | # (Tk* and FLTK* backends) and multithreaded (GTK* and WX* backends) use. | |
856 | class IPShellMatplotlib(IPShell): |
|
856 | class IPShellMatplotlib(IPShell): | |
857 | """Subclass IPShell with MatplotlibShell as the internal shell. |
|
857 | """Subclass IPShell with MatplotlibShell as the internal shell. | |
858 |
|
858 | |||
859 | Single-threaded class, meant for the Tk* and FLTK* backends. |
|
859 | Single-threaded class, meant for the Tk* and FLTK* backends. | |
860 |
|
860 | |||
861 | Having this on a separate class simplifies the external driver code.""" |
|
861 | Having this on a separate class simplifies the external driver code.""" | |
862 |
|
862 | |||
863 | def __init__(self,argv=None,user_ns=None,user_global_ns=None,debug=1): |
|
863 | def __init__(self,argv=None,user_ns=None,user_global_ns=None,debug=1): | |
864 | IPShell.__init__(self,argv,user_ns,user_global_ns,debug, |
|
864 | IPShell.__init__(self,argv,user_ns,user_global_ns,debug, | |
865 | shell_class=MatplotlibShell) |
|
865 | shell_class=MatplotlibShell) | |
866 |
|
866 | |||
867 | class IPShellMatplotlibGTK(IPShellGTK): |
|
867 | class IPShellMatplotlibGTK(IPShellGTK): | |
868 | """Subclass IPShellGTK with MatplotlibMTShell as the internal shell. |
|
868 | """Subclass IPShellGTK with MatplotlibMTShell as the internal shell. | |
869 |
|
869 | |||
870 | Multi-threaded class, meant for the GTK* backends.""" |
|
870 | Multi-threaded class, meant for the GTK* backends.""" | |
871 |
|
871 | |||
872 | def __init__(self,argv=None,user_ns=None,user_global_ns=None,debug=1): |
|
872 | def __init__(self,argv=None,user_ns=None,user_global_ns=None,debug=1): | |
873 | IPShellGTK.__init__(self,argv,user_ns,user_global_ns,debug, |
|
873 | IPShellGTK.__init__(self,argv,user_ns,user_global_ns,debug, | |
874 | shell_class=MatplotlibMTShell) |
|
874 | shell_class=MatplotlibMTShell) | |
875 |
|
875 | |||
876 | class IPShellMatplotlibWX(IPShellWX): |
|
876 | class IPShellMatplotlibWX(IPShellWX): | |
877 | """Subclass IPShellWX with MatplotlibMTShell as the internal shell. |
|
877 | """Subclass IPShellWX with MatplotlibMTShell as the internal shell. | |
878 |
|
878 | |||
879 | Multi-threaded class, meant for the WX* backends.""" |
|
879 | Multi-threaded class, meant for the WX* backends.""" | |
880 |
|
880 | |||
881 | def __init__(self,argv=None,user_ns=None,user_global_ns=None,debug=1): |
|
881 | def __init__(self,argv=None,user_ns=None,user_global_ns=None,debug=1): | |
882 | IPShellWX.__init__(self,argv,user_ns,user_global_ns,debug, |
|
882 | IPShellWX.__init__(self,argv,user_ns,user_global_ns,debug, | |
883 | shell_class=MatplotlibMTShell) |
|
883 | shell_class=MatplotlibMTShell) | |
884 |
|
884 | |||
885 | class IPShellMatplotlibQt(IPShellQt): |
|
885 | class IPShellMatplotlibQt(IPShellQt): | |
886 | """Subclass IPShellQt with MatplotlibMTShell as the internal shell. |
|
886 | """Subclass IPShellQt with MatplotlibMTShell as the internal shell. | |
887 |
|
887 | |||
888 | Multi-threaded class, meant for the Qt* backends.""" |
|
888 | Multi-threaded class, meant for the Qt* backends.""" | |
889 |
|
889 | |||
890 | def __init__(self,argv=None,user_ns=None,user_global_ns=None,debug=1): |
|
890 | def __init__(self,argv=None,user_ns=None,user_global_ns=None,debug=1): | |
891 | IPShellQt.__init__(self,argv,user_ns,user_global_ns,debug, |
|
891 | IPShellQt.__init__(self,argv,user_ns,user_global_ns,debug, | |
892 | shell_class=MatplotlibMTShell) |
|
892 | shell_class=MatplotlibMTShell) | |
893 |
|
893 | |||
894 | #----------------------------------------------------------------------------- |
|
894 | #----------------------------------------------------------------------------- | |
895 | # Factory functions to actually start the proper thread-aware shell |
|
895 | # Factory functions to actually start the proper thread-aware shell | |
896 |
|
896 | |||
897 | def _matplotlib_shell_class(): |
|
897 | def _matplotlib_shell_class(): | |
898 | """Factory function to handle shell class selection for matplotlib. |
|
898 | """Factory function to handle shell class selection for matplotlib. | |
899 |
|
899 | |||
900 | The proper shell class to use depends on the matplotlib backend, since |
|
900 | The proper shell class to use depends on the matplotlib backend, since | |
901 | each backend requires a different threading strategy.""" |
|
901 | each backend requires a different threading strategy.""" | |
902 |
|
902 | |||
903 | try: |
|
903 | try: | |
904 | import matplotlib |
|
904 | import matplotlib | |
905 | except ImportError: |
|
905 | except ImportError: | |
906 | error('matplotlib could NOT be imported! Starting normal IPython.') |
|
906 | error('matplotlib could NOT be imported! Starting normal IPython.') | |
907 | sh_class = IPShell |
|
907 | sh_class = IPShell | |
908 | else: |
|
908 | else: | |
909 | backend = matplotlib.rcParams['backend'] |
|
909 | backend = matplotlib.rcParams['backend'] | |
910 | if backend.startswith('GTK'): |
|
910 | if backend.startswith('GTK'): | |
911 | sh_class = IPShellMatplotlibGTK |
|
911 | sh_class = IPShellMatplotlibGTK | |
912 | elif backend.startswith('WX'): |
|
912 | elif backend.startswith('WX'): | |
913 | sh_class = IPShellMatplotlibWX |
|
913 | sh_class = IPShellMatplotlibWX | |
914 | elif backend.startswith('Qt'): |
|
914 | elif backend.startswith('Qt'): | |
915 | sh_class = IPShellMatplotlibQt |
|
915 | sh_class = IPShellMatplotlibQt | |
916 | else: |
|
916 | else: | |
917 | sh_class = IPShellMatplotlib |
|
917 | sh_class = IPShellMatplotlib | |
918 | #print 'Using %s with the %s backend.' % (sh_class,backend) # dbg |
|
918 | #print 'Using %s with the %s backend.' % (sh_class,backend) # dbg | |
919 | return sh_class |
|
919 | return sh_class | |
920 |
|
920 | |||
921 | # This is the one which should be called by external code. |
|
921 | # This is the one which should be called by external code. | |
922 | def start(): |
|
922 | def start(user_ns = None): | |
923 | """Return a running shell instance, dealing with threading options. |
|
923 | """Return a running shell instance, dealing with threading options. | |
924 |
|
924 | |||
925 | This is a factory function which will instantiate the proper IPython shell |
|
925 | This is a factory function which will instantiate the proper IPython shell | |
926 | based on the user's threading choice. Such a selector is needed because |
|
926 | based on the user's threading choice. Such a selector is needed because | |
927 | different GUI toolkits require different thread handling details.""" |
|
927 | different GUI toolkits require different thread handling details.""" | |
928 |
|
928 | |||
929 | global USE_TK |
|
929 | global USE_TK | |
930 | # Crude sys.argv hack to extract the threading options. |
|
930 | # Crude sys.argv hack to extract the threading options. | |
931 | argv = sys.argv |
|
931 | argv = sys.argv | |
932 | if len(argv) > 1: |
|
932 | if len(argv) > 1: | |
933 | if len(argv) > 2: |
|
933 | if len(argv) > 2: | |
934 | arg2 = argv[2] |
|
934 | arg2 = argv[2] | |
935 | if arg2.endswith('-tk'): |
|
935 | if arg2.endswith('-tk'): | |
936 | USE_TK = True |
|
936 | USE_TK = True | |
937 | arg1 = argv[1] |
|
937 | arg1 = argv[1] | |
938 | if arg1.endswith('-gthread'): |
|
938 | if arg1.endswith('-gthread'): | |
939 | shell = IPShellGTK |
|
939 | shell = IPShellGTK | |
940 | elif arg1.endswith( '-qthread' ): |
|
940 | elif arg1.endswith( '-qthread' ): | |
941 | shell = IPShellQt |
|
941 | shell = IPShellQt | |
942 | elif arg1.endswith('-wthread'): |
|
942 | elif arg1.endswith('-wthread'): | |
943 | shell = IPShellWX |
|
943 | shell = IPShellWX | |
944 | elif arg1.endswith('-pylab'): |
|
944 | elif arg1.endswith('-pylab'): | |
945 | shell = _matplotlib_shell_class() |
|
945 | shell = _matplotlib_shell_class() | |
946 | else: |
|
946 | else: | |
947 | shell = IPShell |
|
947 | shell = IPShell | |
948 | else: |
|
948 | else: | |
949 | shell = IPShell |
|
949 | shell = IPShell | |
950 | return shell() |
|
950 | return shell(user_ns = user_ns) | |
951 |
|
951 | |||
952 | # Some aliases for backwards compatibility |
|
952 | # Some aliases for backwards compatibility | |
953 | IPythonShell = IPShell |
|
953 | IPythonShell = IPShell | |
954 | IPythonShellEmbed = IPShellEmbed |
|
954 | IPythonShellEmbed = IPShellEmbed | |
955 | #************************ End of file <Shell.py> *************************** |
|
955 | #************************ End of file <Shell.py> *************************** |
@@ -1,50 +1,50 b'' | |||||
1 | """ User configuration file for IPython |
|
1 | """ User configuration file for IPython | |
2 |
|
2 | |||
3 | This is a more flexible and safe way to configure ipython than *rc files |
|
3 | This is a more flexible and safe way to configure ipython than *rc files | |
4 | (ipythonrc, ipythonrc-pysh etc.) |
|
4 | (ipythonrc, ipythonrc-pysh etc.) | |
5 |
|
5 | |||
6 | This file is always imported on ipython startup. You should import all the |
|
6 | This file is always imported on ipython startup. You should import all the | |
7 | ipython extensions you need here (see IPython/Extensions directory). |
|
7 | ipython extensions you need here (see IPython/Extensions directory). | |
8 |
|
8 | |||
9 | Feel free to edit this file to customize your ipython experience. If |
|
9 | Feel free to edit this file to customize your ipython experience. If | |
10 | you wish to only use the old config system, it's perfectly ok to make this file |
|
10 | you wish to only use the old config system, it's perfectly ok to make this file | |
11 | empty. |
|
11 | empty. | |
12 |
|
12 | |||
13 | """ |
|
13 | """ | |
14 |
|
14 | |||
15 | # Most of your config files and extensions will probably start with this import |
|
15 | # Most of your config files and extensions will probably start with this import | |
16 |
|
16 | |||
17 | import IPython.ipapi as ip |
|
17 | from IPython import ipapi | |
18 |
|
18 | ip = ipapi.get() | ||
19 | import os |
|
19 | import os | |
20 |
|
20 | |||
21 | o = ip.options() |
|
21 | o = ip.options() | |
22 | # autocall 1 ('smart') is default anyway, this is just an |
|
22 | # autocall 1 ('smart') is default anyway, this is just an | |
23 | # example on how to set an option |
|
23 | # example on how to set an option | |
24 | o.autocall = 1 |
|
24 | o.autocall = 1 | |
25 |
|
25 | |||
26 | if o.profile == 'pysh': |
|
26 | if o.profile == 'pysh': | |
27 | # Jason Orendorff's path class is handy to have in user namespace |
|
27 | # Jason Orendorff's path class is handy to have in user namespace | |
28 | # if you are doing shell-like stuff |
|
28 | # if you are doing shell-like stuff | |
29 | ip.ex("from IPython.path import path" ) |
|
29 | ip.ex("from IPython.path import path" ) | |
30 |
|
30 | |||
31 | # Uncomment these lines to get pysh-like prompt for all profiles. |
|
31 | # Uncomment these lines to get pysh-like prompt for all profiles. | |
32 |
|
32 | |||
33 | #o.prompt_in1= '\C_LightBlue[\C_LightCyan\Y1\C_LightBlue]\C_Green|\#> ' |
|
33 | #o.prompt_in1= '\C_LightBlue[\C_LightCyan\Y1\C_LightBlue]\C_Green|\#> ' | |
34 | #o.prompt_in2= '\C_Green|\C_LightGreen\D\C_Green> ' |
|
34 | #o.prompt_in2= '\C_Green|\C_LightGreen\D\C_Green> ' | |
35 | #o.prompt_out= '<\#> ' |
|
35 | #o.prompt_out= '<\#> ' | |
36 |
|
36 | |||
37 | # make 'd' an alias for ls -F |
|
37 | # make 'd' an alias for ls -F | |
38 |
|
38 | |||
39 | ip.magic('alias d ls -F --color=auto') |
|
39 | ip.magic('alias d ls -F --color=auto') | |
40 |
|
40 | |||
41 | # Make available all system commands through "rehashing" immediately. |
|
41 | # Make available all system commands through "rehashing" immediately. | |
42 | # You can comment these lines out to speed up startup on very slow |
|
42 | # You can comment these lines out to speed up startup on very slow | |
43 | # machines, and to conserve a bit of memory. Note that pysh profile does this |
|
43 | # machines, and to conserve a bit of memory. Note that pysh profile does this | |
44 | # automatically |
|
44 | # automatically | |
45 |
|
45 | |||
46 | #if os.name=='posix': |
|
46 | #if os.name=='posix': | |
47 | # ip.magic('rehash') |
|
47 | # ip.magic('rehash') | |
48 | #else: |
|
48 | #else: | |
49 | # #slightly slower, but better results esp. with Windows |
|
49 | # #slightly slower, but better results esp. with Windows | |
50 | # ip.magic('rehashx') |
|
50 | # ip.magic('rehashx') |
@@ -1,174 +1,168 b'' | |||||
1 | ''' IPython customization API |
|
1 | ''' IPython customization API | |
2 |
|
2 | |||
3 | Your one-stop module for configuring & extending ipython |
|
3 | Your one-stop module for configuring & extending ipython | |
4 |
|
4 | |||
5 | The API will probably break when ipython 1.0 is released, but so |
|
5 | The API will probably break when ipython 1.0 is released, but so | |
6 | will the other configuration method (rc files). |
|
6 | will the other configuration method (rc files). | |
7 |
|
7 | |||
8 | All names prefixed by underscores are for internal use, not part |
|
8 | All names prefixed by underscores are for internal use, not part | |
9 | of the public api. |
|
9 | of the public api. | |
10 |
|
10 | |||
11 | Below is an example that you can just put to a module and import from ipython. |
|
11 | Below is an example that you can just put to a module and import from ipython. | |
12 |
|
12 | |||
13 | A good practice is to install the config script below as e.g. |
|
13 | A good practice is to install the config script below as e.g. | |
14 |
|
14 | |||
15 | ~/.ipython/my_private_conf.py |
|
15 | ~/.ipython/my_private_conf.py | |
16 |
|
16 | |||
17 | And do |
|
17 | And do | |
18 |
|
18 | |||
19 | import_mod my_private_conf |
|
19 | import_mod my_private_conf | |
20 |
|
20 | |||
21 | in ~/.ipython/ipythonrc |
|
21 | in ~/.ipython/ipythonrc | |
22 |
|
22 | |||
23 | That way the module is imported at startup and you can have all your |
|
23 | That way the module is imported at startup and you can have all your | |
24 | personal configuration (as opposed to boilerplate ipythonrc-PROFILENAME |
|
24 | personal configuration (as opposed to boilerplate ipythonrc-PROFILENAME | |
25 | stuff) in there. |
|
25 | stuff) in there. | |
26 |
|
26 | |||
27 | ----------------------------------------------- |
|
27 | ----------------------------------------------- | |
28 | import IPython.ipapi as ip |
|
28 | import IPython.ipapi as ip | |
29 |
|
29 | |||
30 | def ankka_f(self, arg): |
|
30 | def ankka_f(self, arg): | |
31 | print "Ankka",self,"says uppercase:",arg.upper() |
|
31 | print "Ankka",self,"says uppercase:",arg.upper() | |
32 |
|
32 | |||
33 | ip.expose_magic("ankka",ankka_f) |
|
33 | ip.expose_magic("ankka",ankka_f) | |
34 |
|
34 | |||
35 | ip.magic('alias sayhi echo "Testing, hi ok"') |
|
35 | ip.magic('alias sayhi echo "Testing, hi ok"') | |
36 | ip.magic('alias helloworld echo "Hello world"') |
|
36 | ip.magic('alias helloworld echo "Hello world"') | |
37 | ip.system('pwd') |
|
37 | ip.system('pwd') | |
38 |
|
38 | |||
39 | ip.ex('import re') |
|
39 | ip.ex('import re') | |
40 | ip.ex(""" |
|
40 | ip.ex(""" | |
41 | def funcci(a,b): |
|
41 | def funcci(a,b): | |
42 | print a+b |
|
42 | print a+b | |
43 | print funcci(3,4) |
|
43 | print funcci(3,4) | |
44 | """) |
|
44 | """) | |
45 | ip.ex("funcci(348,9)") |
|
45 | ip.ex("funcci(348,9)") | |
46 |
|
46 | |||
47 | def jed_editor(self,filename, linenum=None): |
|
47 | def jed_editor(self,filename, linenum=None): | |
48 | print "Calling my own editor, jed ... via hook!" |
|
48 | print "Calling my own editor, jed ... via hook!" | |
49 | import os |
|
49 | import os | |
50 | if linenum is None: linenum = 0 |
|
50 | if linenum is None: linenum = 0 | |
51 | os.system('jed +%d %s' % (linenum, filename)) |
|
51 | os.system('jed +%d %s' % (linenum, filename)) | |
52 | print "exiting jed" |
|
52 | print "exiting jed" | |
53 |
|
53 | |||
54 | ip.set_hook('editor',jed_editor) |
|
54 | ip.set_hook('editor',jed_editor) | |
55 |
|
55 | |||
56 | o = ip.options() |
|
56 | o = ip.options() | |
57 | o.autocall = 2 # FULL autocall mode |
|
57 | o.autocall = 2 # FULL autocall mode | |
58 |
|
58 | |||
59 | print "done!" |
|
59 | print "done!" | |
60 |
|
60 | |||
61 | ''' |
|
61 | ''' | |
62 |
|
62 | |||
63 |
|
63 | |||
64 | class TryNext(Exception): |
|
64 | class TryNext(Exception): | |
65 | """ Try next hook exception. |
|
65 | """ Try next hook exception. | |
66 |
|
66 | |||
67 | Raise this in your hook function to indicate that the next |
|
67 | Raise this in your hook function to indicate that the next | |
68 | hook handler should be used to handle the operation. |
|
68 | hook handler should be used to handle the operation. | |
69 | """ |
|
69 | """ | |
70 |
|
70 | |||
71 |
|
71 | |||
72 |
|
72 | # contains the most recently instantiated IPApi | ||
73 |
_ |
|
73 | _recent = None | |
74 |
|
||||
75 | def _init_with_shell(ip): |
|
|||
76 | global magic |
|
|||
77 | magic = ip.ipmagic |
|
|||
78 | global system |
|
|||
79 | system = ip.ipsystem |
|
|||
80 | global set_hook |
|
|||
81 | set_hook = ip.set_hook |
|
|||
82 |
|
||||
83 | global __IP |
|
|||
84 | __IP = ip |
|
|||
85 |
|
||||
86 | def options(): |
|
|||
87 | """ All configurable variables """ |
|
|||
88 | return __IP.rc |
|
|||
89 |
|
74 | |||
90 |
def |
|
75 | def get(): | |
91 | return __IP.user_ns |
|
76 | """ Get an IPApi object, or None if not running under ipython | |
92 |
|
|
77 | ||
93 | def expose_magic(magicname, func): |
|
78 | Running this should be the first thing you do when writing | |
94 | ''' Expose own function as magic function for ipython |
|
79 | extensions that can be imported as normal modules. You can then | |
|
80 | direct all the configuration operations against the returned | |||
|
81 | object. | |||
95 |
|
82 | |||
96 | def foo_impl(self,parameter_s=''): |
|
83 | """ | |
97 | """My very own magic!. (Use docstrings, IPython reads them).""" |
|
|||
98 | print 'Magic function. Passed parameter is between < >: <'+parameter_s+'>' |
|
|||
99 | print 'The self object is:',self |
|
|||
100 |
|
84 | |||
101 | ipapi.expose_magic("foo",foo_impl) |
|
85 | return _recent | |
102 | ''' |
|
|||
103 |
|
||||
104 | from IPython import Magic |
|
|||
105 | import new |
|
|||
106 | im = new.instancemethod(func,__IP, __IP.__class__) |
|
|||
107 | setattr(__IP, "magic_" + magicname, im) |
|
|||
108 |
|
86 | |||
109 | class asmagic: |
|
87 | ||
110 | """ Decorator for exposing magics in a friendly 2.4 decorator form |
|
88 | ||
|
89 | class IPApi: | |||
|
90 | """ The actual API class for configuring IPython | |||
111 |
|
91 | |||
112 | @ip.asmagic("foo") |
|
92 | You should do all of the IPython configuration by getting | |
113 | def f(self,arg): |
|
93 | an IPApi object with IPython.ipapi.get() and using the provided | |
114 | pring "arg given:",arg |
|
94 | methods. | |
115 |
|
95 | |||
116 | After this, %foo is a magic function. |
|
|||
117 | """ |
|
96 | """ | |
118 |
|
97 | def __init__(self,ip): | ||
119 | def __init__(self,magicname): |
|
98 | ||
120 |
self. |
|
99 | self.magic = ip.ipmagic | |
|
100 | ||||
|
101 | self.system = ip.ipsystem | |||
|
102 | ||||
|
103 | self.set_hook = ip.set_hook | |||
121 |
|
104 | |||
122 | def __call__(self,f): |
|
105 | self.IP = ip | |
123 | expose_magic(self.name, f) |
|
106 | global _recent | |
124 |
ret |
|
107 | _recent = self | |
125 |
|
108 | |||
126 | class ashook: |
|
109 | ||
127 | """ Decorator for exposing magics in a friendly 2.4 decorator form |
|
|||
128 |
|
110 | |||
129 | @ip.ashook("editor") |
|
111 | def options(self): | |
130 | def jed_editor(self,filename, linenum=None): |
|
112 | """ All configurable variables """ | |
131 | import os |
|
113 | return self.IP.rc | |
132 | if linenum is None: linenum = 0 |
|
|||
133 | os.system('jed +%d %s' % (linenum, filename)) |
|
|||
134 |
|
114 | |||
135 | """ |
|
115 | def user_ns(self): | |
|
116 | return self.IP.user_ns | |||
136 |
|
117 | |||
137 | def __init__(self,name,priority=50): |
|
118 | def expose_magic(self,magicname, func): | |
138 | self.name = name |
|
119 | ''' Expose own function as magic function for ipython | |
139 | self.prio = priority |
|
120 | ||
140 |
|
121 | def foo_impl(self,parameter_s=''): | ||
141 | def __call__(self,f): |
|
122 | """My very own magic!. (Use docstrings, IPython reads them).""" | |
142 | set_hook(self.name, f, self.prio) |
|
123 | print 'Magic function. Passed parameter is between < >: <'+parameter_s+'>' | |
143 | return f |
|
124 | print 'The self object is:',self | |
144 |
|
125 | |||
145 |
|
126 | ipapi.expose_magic("foo",foo_impl) | ||
146 | def ex(cmd): |
|
127 | ''' | |
147 | """ Execute a normal python statement in user namespace """ |
|
128 | ||
148 | exec cmd in user_ns() |
|
129 | import new | |
149 |
|
130 | im = new.instancemethod(func,self.IP, self.IP.__class__) | ||
150 | def ev(expr): |
|
131 | setattr(self.IP, "magic_" + magicname, im) | |
151 | """ Evaluate python expression expr in user namespace |
|
132 | ||
|
133 | ||||
|
134 | def ex(self,cmd): | |||
|
135 | """ Execute a normal python statement in user namespace """ | |||
|
136 | exec cmd in self.user_ns() | |||
152 |
|
137 | |||
153 | Returns the result """ |
|
138 | def ev(self,expr): | |
154 | return eval(expr,user_ns()) |
|
139 | """ Evaluate python expression expr in user namespace | |
|
140 | ||||
|
141 | Returns the result of evaluation""" | |||
|
142 | return eval(expr,self.user_ns()) | |||
155 |
|
143 | |||
156 | def launch_new_instance(): |
|
144 | def launch_new_instance(user_ns = None): | |
157 | """ Create and start a new ipython instance. |
|
145 | """ Create and start a new ipython instance. | |
158 |
|
146 | |||
159 | This can be called even without having an already initialized |
|
147 | This can be called even without having an already initialized | |
160 | ipython session running. |
|
148 | ipython session running. | |
161 |
|
149 | |||
|
150 | This is also used as the egg entry point for the 'ipython' script. | |||
|
151 | ||||
162 | """ |
|
152 | """ | |
163 | import IPython |
|
153 | ses = create_session(user_ns) | |
|
154 | ses.mainloop() | |||
164 |
|
155 | |||
165 | IPython.Shell.start().mainloop() |
|
|||
166 |
|
156 | |||
167 | def is_ipython_session(): |
|
157 | def create_session(user_ns = None): | |
168 | """ Return a true value if running inside IPython. |
|
158 | """ Creates, but does not launch an IPython session. | |
169 |
|
159 | |||
170 | """ |
|
160 | Later on you can call obj.mainloop() on the returned object. | |
171 |
|
|
161 | ||
172 | # Yes, this is the shell object or None - however, it's an implementation |
|
162 | This should *not* be run when a session exists already. | |
173 | # detail and should not be relied on, only truth value matters. |
|
163 | ||
174 | return __IP |
|
164 | """ | |
|
165 | if user_ns is not None: | |||
|
166 | user_ns["__name__"] = user_ns.get("__name__",'ipy_session') | |||
|
167 | import IPython | |||
|
168 | return IPython.Shell.start(user_ns = user_ns) No newline at end of file |
@@ -1,2234 +1,2235 b'' | |||||
1 | # -*- coding: utf-8 -*- |
|
1 | # -*- coding: utf-8 -*- | |
2 | """ |
|
2 | """ | |
3 | IPython -- An enhanced Interactive Python |
|
3 | IPython -- An enhanced Interactive Python | |
4 |
|
4 | |||
5 | Requires Python 2.3 or newer. |
|
5 | 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 107 |
|
9 | $Id: iplib.py 1079 2006-01-24 21:52:31Z vivainio $ | |
10 | """ |
|
10 | """ | |
11 |
|
11 | |||
12 | #***************************************************************************** |
|
12 | #***************************************************************************** | |
13 | # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and |
|
13 | # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and | |
14 | # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu> |
|
14 | # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu> | |
15 | # |
|
15 | # | |
16 | # Distributed under the terms of the BSD License. The full license is in |
|
16 | # Distributed under the terms of the BSD License. The full license is in | |
17 | # the file COPYING, distributed as part of this software. |
|
17 | # the file COPYING, distributed as part of this software. | |
18 | # |
|
18 | # | |
19 | # Note: this code originally subclassed code.InteractiveConsole from the |
|
19 | # Note: this code originally subclassed code.InteractiveConsole from the | |
20 | # Python standard library. Over time, all of that class has been copied |
|
20 | # Python standard library. Over time, all of that class has been copied | |
21 | # verbatim here for modifications which could not be accomplished by |
|
21 | # verbatim here for modifications which could not be accomplished by | |
22 | # subclassing. At this point, there are no dependencies at all on the code |
|
22 | # subclassing. At this point, there are no dependencies at all on the code | |
23 | # module anymore (it is not even imported). The Python License (sec. 2) |
|
23 | # module anymore (it is not even imported). The Python License (sec. 2) | |
24 | # allows for this, but it's always nice to acknowledge credit where credit is |
|
24 | # allows for this, but it's always nice to acknowledge credit where credit is | |
25 | # due. |
|
25 | # due. | |
26 | #***************************************************************************** |
|
26 | #***************************************************************************** | |
27 |
|
27 | |||
28 | #**************************************************************************** |
|
28 | #**************************************************************************** | |
29 | # Modules and globals |
|
29 | # Modules and globals | |
30 |
|
30 | |||
31 | from __future__ import generators # for 2.2 backwards-compatibility |
|
31 | from __future__ import generators # for 2.2 backwards-compatibility | |
32 |
|
32 | |||
33 | from IPython import Release |
|
33 | from IPython import Release | |
34 | __author__ = '%s <%s>\n%s <%s>' % \ |
|
34 | __author__ = '%s <%s>\n%s <%s>' % \ | |
35 | ( Release.authors['Janko'] + Release.authors['Fernando'] ) |
|
35 | ( Release.authors['Janko'] + Release.authors['Fernando'] ) | |
36 | __license__ = Release.license |
|
36 | __license__ = Release.license | |
37 | __version__ = Release.version |
|
37 | __version__ = Release.version | |
38 |
|
38 | |||
39 | # Python standard modules |
|
39 | # Python standard modules | |
40 | import __main__ |
|
40 | import __main__ | |
41 | import __builtin__ |
|
41 | import __builtin__ | |
42 | import StringIO |
|
42 | import StringIO | |
43 | import bdb |
|
43 | import bdb | |
44 | import cPickle as pickle |
|
44 | import cPickle as pickle | |
45 | import codeop |
|
45 | import codeop | |
46 | import exceptions |
|
46 | import exceptions | |
47 | import glob |
|
47 | import glob | |
48 | import inspect |
|
48 | import inspect | |
49 | import keyword |
|
49 | import keyword | |
50 | import new |
|
50 | import new | |
51 | import os |
|
51 | import os | |
52 | import pdb |
|
52 | import pdb | |
53 | import pydoc |
|
53 | import pydoc | |
54 | import re |
|
54 | import re | |
55 | import shutil |
|
55 | import shutil | |
56 | import string |
|
56 | import string | |
57 | import sys |
|
57 | import sys | |
58 | import tempfile |
|
58 | import tempfile | |
59 | import traceback |
|
59 | import traceback | |
60 | import types |
|
60 | import types | |
61 |
|
61 | |||
62 | from pprint import pprint, pformat |
|
62 | from pprint import pprint, pformat | |
63 |
|
63 | |||
64 | # IPython's own modules |
|
64 | # IPython's own modules | |
65 | import IPython |
|
65 | import IPython | |
66 | from IPython import OInspect,PyColorize,ultraTB |
|
66 | from IPython import OInspect,PyColorize,ultraTB | |
67 | from IPython.ColorANSI import ColorScheme,ColorSchemeTable # too long names |
|
67 | from IPython.ColorANSI import ColorScheme,ColorSchemeTable # too long names | |
68 | from IPython.FakeModule import FakeModule |
|
68 | from IPython.FakeModule import FakeModule | |
69 | from IPython.Itpl import Itpl,itpl,printpl,ItplNS,itplns |
|
69 | from IPython.Itpl import Itpl,itpl,printpl,ItplNS,itplns | |
70 | from IPython.Logger import Logger |
|
70 | from IPython.Logger import Logger | |
71 | from IPython.Magic import Magic |
|
71 | from IPython.Magic import Magic | |
72 | from IPython.Prompts import CachedOutput |
|
72 | from IPython.Prompts import CachedOutput | |
73 | from IPython.ipstruct import Struct |
|
73 | from IPython.ipstruct import Struct | |
74 | from IPython.background_jobs import BackgroundJobManager |
|
74 | from IPython.background_jobs import BackgroundJobManager | |
75 | from IPython.usage import cmd_line_usage,interactive_usage |
|
75 | from IPython.usage import cmd_line_usage,interactive_usage | |
76 | from IPython.genutils import * |
|
76 | from IPython.genutils import * | |
77 | import IPython.ipapi |
|
77 | import IPython.ipapi | |
78 |
|
78 | |||
79 | # Globals |
|
79 | # Globals | |
80 |
|
80 | |||
81 | # store the builtin raw_input globally, and use this always, in case user code |
|
81 | # store the builtin raw_input globally, and use this always, in case user code | |
82 | # overwrites it (like wx.py.PyShell does) |
|
82 | # overwrites it (like wx.py.PyShell does) | |
83 | raw_input_original = raw_input |
|
83 | raw_input_original = raw_input | |
84 |
|
84 | |||
85 | # compiled regexps for autoindent management |
|
85 | # compiled regexps for autoindent management | |
86 | dedent_re = re.compile(r'^\s+raise|^\s+return|^\s+pass') |
|
86 | dedent_re = re.compile(r'^\s+raise|^\s+return|^\s+pass') | |
87 |
|
87 | |||
88 |
|
88 | |||
89 | #**************************************************************************** |
|
89 | #**************************************************************************** | |
90 | # Some utility function definitions |
|
90 | # Some utility function definitions | |
91 |
|
91 | |||
92 | ini_spaces_re = re.compile(r'^(\s+)') |
|
92 | ini_spaces_re = re.compile(r'^(\s+)') | |
93 |
|
93 | |||
94 | def num_ini_spaces(strng): |
|
94 | def num_ini_spaces(strng): | |
95 | """Return the number of initial spaces in a string""" |
|
95 | """Return the number of initial spaces in a string""" | |
96 |
|
96 | |||
97 | ini_spaces = ini_spaces_re.match(strng) |
|
97 | ini_spaces = ini_spaces_re.match(strng) | |
98 | if ini_spaces: |
|
98 | if ini_spaces: | |
99 | return ini_spaces.end() |
|
99 | return ini_spaces.end() | |
100 | else: |
|
100 | else: | |
101 | return 0 |
|
101 | return 0 | |
102 |
|
102 | |||
103 | def softspace(file, newvalue): |
|
103 | def softspace(file, newvalue): | |
104 | """Copied from code.py, to remove the dependency""" |
|
104 | """Copied from code.py, to remove the dependency""" | |
105 |
|
105 | |||
106 | oldvalue = 0 |
|
106 | oldvalue = 0 | |
107 | try: |
|
107 | try: | |
108 | oldvalue = file.softspace |
|
108 | oldvalue = file.softspace | |
109 | except AttributeError: |
|
109 | except AttributeError: | |
110 | pass |
|
110 | pass | |
111 | try: |
|
111 | try: | |
112 | file.softspace = newvalue |
|
112 | file.softspace = newvalue | |
113 | except (AttributeError, TypeError): |
|
113 | except (AttributeError, TypeError): | |
114 | # "attribute-less object" or "read-only attributes" |
|
114 | # "attribute-less object" or "read-only attributes" | |
115 | pass |
|
115 | pass | |
116 | return oldvalue |
|
116 | return oldvalue | |
117 |
|
117 | |||
118 |
|
118 | |||
119 | #**************************************************************************** |
|
119 | #**************************************************************************** | |
120 | # Local use exceptions |
|
120 | # Local use exceptions | |
121 | class SpaceInInput(exceptions.Exception): pass |
|
121 | class SpaceInInput(exceptions.Exception): pass | |
122 |
|
122 | |||
123 |
|
123 | |||
124 | #**************************************************************************** |
|
124 | #**************************************************************************** | |
125 | # Local use classes |
|
125 | # Local use classes | |
126 | class Bunch: pass |
|
126 | class Bunch: pass | |
127 |
|
127 | |||
128 | class Undefined: pass |
|
128 | class Undefined: pass | |
129 |
|
129 | |||
130 | class InputList(list): |
|
130 | class InputList(list): | |
131 | """Class to store user input. |
|
131 | """Class to store user input. | |
132 |
|
132 | |||
133 | It's basically a list, but slices return a string instead of a list, thus |
|
133 | It's basically a list, but slices return a string instead of a list, thus | |
134 | allowing things like (assuming 'In' is an instance): |
|
134 | allowing things like (assuming 'In' is an instance): | |
135 |
|
135 | |||
136 | exec In[4:7] |
|
136 | exec In[4:7] | |
137 |
|
137 | |||
138 | or |
|
138 | or | |
139 |
|
139 | |||
140 | exec In[5:9] + In[14] + In[21:25]""" |
|
140 | exec In[5:9] + In[14] + In[21:25]""" | |
141 |
|
141 | |||
142 | def __getslice__(self,i,j): |
|
142 | def __getslice__(self,i,j): | |
143 | return ''.join(list.__getslice__(self,i,j)) |
|
143 | return ''.join(list.__getslice__(self,i,j)) | |
144 |
|
144 | |||
145 | class SyntaxTB(ultraTB.ListTB): |
|
145 | class SyntaxTB(ultraTB.ListTB): | |
146 | """Extension which holds some state: the last exception value""" |
|
146 | """Extension which holds some state: the last exception value""" | |
147 |
|
147 | |||
148 | def __init__(self,color_scheme = 'NoColor'): |
|
148 | def __init__(self,color_scheme = 'NoColor'): | |
149 | ultraTB.ListTB.__init__(self,color_scheme) |
|
149 | ultraTB.ListTB.__init__(self,color_scheme) | |
150 | self.last_syntax_error = None |
|
150 | self.last_syntax_error = None | |
151 |
|
151 | |||
152 | def __call__(self, etype, value, elist): |
|
152 | def __call__(self, etype, value, elist): | |
153 | self.last_syntax_error = value |
|
153 | self.last_syntax_error = value | |
154 | ultraTB.ListTB.__call__(self,etype,value,elist) |
|
154 | ultraTB.ListTB.__call__(self,etype,value,elist) | |
155 |
|
155 | |||
156 | def clear_err_state(self): |
|
156 | def clear_err_state(self): | |
157 | """Return the current error state and clear it""" |
|
157 | """Return the current error state and clear it""" | |
158 | e = self.last_syntax_error |
|
158 | e = self.last_syntax_error | |
159 | self.last_syntax_error = None |
|
159 | self.last_syntax_error = None | |
160 | return e |
|
160 | return e | |
161 |
|
161 | |||
162 | #**************************************************************************** |
|
162 | #**************************************************************************** | |
163 | # Main IPython class |
|
163 | # Main IPython class | |
164 |
|
164 | |||
165 | # FIXME: the Magic class is a mixin for now, and will unfortunately remain so |
|
165 | # FIXME: the Magic class is a mixin for now, and will unfortunately remain so | |
166 | # until a full rewrite is made. I've cleaned all cross-class uses of |
|
166 | # until a full rewrite is made. I've cleaned all cross-class uses of | |
167 | # attributes and methods, but too much user code out there relies on the |
|
167 | # attributes and methods, but too much user code out there relies on the | |
168 | # equlity %foo == __IP.magic_foo, so I can't actually remove the mixin usage. |
|
168 | # equlity %foo == __IP.magic_foo, so I can't actually remove the mixin usage. | |
169 | # |
|
169 | # | |
170 | # But at least now, all the pieces have been separated and we could, in |
|
170 | # But at least now, all the pieces have been separated and we could, in | |
171 | # principle, stop using the mixin. This will ease the transition to the |
|
171 | # principle, stop using the mixin. This will ease the transition to the | |
172 | # chainsaw branch. |
|
172 | # chainsaw branch. | |
173 |
|
173 | |||
174 | # For reference, the following is the list of 'self.foo' uses in the Magic |
|
174 | # For reference, the following is the list of 'self.foo' uses in the Magic | |
175 | # class as of 2005-12-28. These are names we CAN'T use in the main ipython |
|
175 | # class as of 2005-12-28. These are names we CAN'T use in the main ipython | |
176 | # class, to prevent clashes. |
|
176 | # class, to prevent clashes. | |
177 |
|
177 | |||
178 | # ['self.__class__', 'self.__dict__', 'self._inspect', 'self._ofind', |
|
178 | # ['self.__class__', 'self.__dict__', 'self._inspect', 'self._ofind', | |
179 | # 'self.arg_err', 'self.extract_input', 'self.format_', 'self.lsmagic', |
|
179 | # 'self.arg_err', 'self.extract_input', 'self.format_', 'self.lsmagic', | |
180 | # 'self.magic_', 'self.options_table', 'self.parse', 'self.shell', |
|
180 | # 'self.magic_', 'self.options_table', 'self.parse', 'self.shell', | |
181 | # 'self.value'] |
|
181 | # 'self.value'] | |
182 |
|
182 | |||
183 | class InteractiveShell(object,Magic): |
|
183 | class InteractiveShell(object,Magic): | |
184 | """An enhanced console for Python.""" |
|
184 | """An enhanced console for Python.""" | |
185 |
|
185 | |||
186 | # class attribute to indicate whether the class supports threads or not. |
|
186 | # class attribute to indicate whether the class supports threads or not. | |
187 | # Subclasses with thread support should override this as needed. |
|
187 | # Subclasses with thread support should override this as needed. | |
188 | isthreaded = False |
|
188 | isthreaded = False | |
189 |
|
189 | |||
190 | def __init__(self,name,usage=None,rc=Struct(opts=None,args=None), |
|
190 | def __init__(self,name,usage=None,rc=Struct(opts=None,args=None), | |
191 | user_ns = None,user_global_ns=None,banner2='', |
|
191 | user_ns = None,user_global_ns=None,banner2='', | |
192 | custom_exceptions=((),None),embedded=False): |
|
192 | custom_exceptions=((),None),embedded=False): | |
193 |
|
193 | |||
194 | # log system |
|
194 | # log system | |
195 | self.logger = Logger(self,logfname='ipython_log.py',logmode='rotate') |
|
195 | self.logger = Logger(self,logfname='ipython_log.py',logmode='rotate') | |
196 |
|
196 | |||
197 | # introduce ourselves to IPython.ipapi which is uncallable |
|
197 | # Produce a public API instance | |
198 | # before it knows an InteractiveShell object. |
|
198 | ||
199 |
IPython.ipapi. |
|
199 | self.api = IPython.ipapi.IPApi(self) | |
|
200 | ||||
200 |
|
201 | |||
201 | # some minimal strict typechecks. For some core data structures, I |
|
202 | # some minimal strict typechecks. For some core data structures, I | |
202 | # want actual basic python types, not just anything that looks like |
|
203 | # want actual basic python types, not just anything that looks like | |
203 | # one. This is especially true for namespaces. |
|
204 | # one. This is especially true for namespaces. | |
204 | for ns in (user_ns,user_global_ns): |
|
205 | for ns in (user_ns,user_global_ns): | |
205 | if ns is not None and type(ns) != types.DictType: |
|
206 | if ns is not None and type(ns) != types.DictType: | |
206 | raise TypeError,'namespace must be a dictionary' |
|
207 | raise TypeError,'namespace must be a dictionary' | |
207 |
|
208 | |||
208 | # Job manager (for jobs run as background threads) |
|
209 | # Job manager (for jobs run as background threads) | |
209 | self.jobs = BackgroundJobManager() |
|
210 | self.jobs = BackgroundJobManager() | |
210 |
|
211 | |||
211 | # track which builtins we add, so we can clean up later |
|
212 | # track which builtins we add, so we can clean up later | |
212 | self.builtins_added = {} |
|
213 | self.builtins_added = {} | |
213 | # This method will add the necessary builtins for operation, but |
|
214 | # This method will add the necessary builtins for operation, but | |
214 | # tracking what it did via the builtins_added dict. |
|
215 | # tracking what it did via the builtins_added dict. | |
215 | self.add_builtins() |
|
216 | self.add_builtins() | |
216 |
|
217 | |||
217 | # Do the intuitively correct thing for quit/exit: we remove the |
|
218 | # Do the intuitively correct thing for quit/exit: we remove the | |
218 | # builtins if they exist, and our own magics will deal with this |
|
219 | # builtins if they exist, and our own magics will deal with this | |
219 | try: |
|
220 | try: | |
220 | del __builtin__.exit, __builtin__.quit |
|
221 | del __builtin__.exit, __builtin__.quit | |
221 | except AttributeError: |
|
222 | except AttributeError: | |
222 | pass |
|
223 | pass | |
223 |
|
224 | |||
224 | # Store the actual shell's name |
|
225 | # Store the actual shell's name | |
225 | self.name = name |
|
226 | self.name = name | |
226 |
|
227 | |||
227 | # We need to know whether the instance is meant for embedding, since |
|
228 | # We need to know whether the instance is meant for embedding, since | |
228 | # global/local namespaces need to be handled differently in that case |
|
229 | # global/local namespaces need to be handled differently in that case | |
229 | self.embedded = embedded |
|
230 | self.embedded = embedded | |
230 |
|
231 | |||
231 | # command compiler |
|
232 | # command compiler | |
232 | self.compile = codeop.CommandCompiler() |
|
233 | self.compile = codeop.CommandCompiler() | |
233 |
|
234 | |||
234 | # User input buffer |
|
235 | # User input buffer | |
235 | self.buffer = [] |
|
236 | self.buffer = [] | |
236 |
|
237 | |||
237 | # Default name given in compilation of code |
|
238 | # Default name given in compilation of code | |
238 | self.filename = '<ipython console>' |
|
239 | self.filename = '<ipython console>' | |
239 |
|
240 | |||
240 | # Make an empty namespace, which extension writers can rely on both |
|
241 | # Make an empty namespace, which extension writers can rely on both | |
241 | # existing and NEVER being used by ipython itself. This gives them a |
|
242 | # existing and NEVER being used by ipython itself. This gives them a | |
242 | # convenient location for storing additional information and state |
|
243 | # convenient location for storing additional information and state | |
243 | # their extensions may require, without fear of collisions with other |
|
244 | # their extensions may require, without fear of collisions with other | |
244 | # ipython names that may develop later. |
|
245 | # ipython names that may develop later. | |
245 | self.meta = Bunch() |
|
246 | self.meta = Bunch() | |
246 |
|
247 | |||
247 | # Create the namespace where the user will operate. user_ns is |
|
248 | # Create the namespace where the user will operate. user_ns is | |
248 | # normally the only one used, and it is passed to the exec calls as |
|
249 | # normally the only one used, and it is passed to the exec calls as | |
249 | # the locals argument. But we do carry a user_global_ns namespace |
|
250 | # the locals argument. But we do carry a user_global_ns namespace | |
250 | # given as the exec 'globals' argument, This is useful in embedding |
|
251 | # given as the exec 'globals' argument, This is useful in embedding | |
251 | # situations where the ipython shell opens in a context where the |
|
252 | # situations where the ipython shell opens in a context where the | |
252 | # distinction between locals and globals is meaningful. |
|
253 | # distinction between locals and globals is meaningful. | |
253 |
|
254 | |||
254 | # FIXME. For some strange reason, __builtins__ is showing up at user |
|
255 | # FIXME. For some strange reason, __builtins__ is showing up at user | |
255 | # level as a dict instead of a module. This is a manual fix, but I |
|
256 | # level as a dict instead of a module. This is a manual fix, but I | |
256 | # should really track down where the problem is coming from. Alex |
|
257 | # should really track down where the problem is coming from. Alex | |
257 | # Schmolck reported this problem first. |
|
258 | # Schmolck reported this problem first. | |
258 |
|
259 | |||
259 | # A useful post by Alex Martelli on this topic: |
|
260 | # A useful post by Alex Martelli on this topic: | |
260 | # Re: inconsistent value from __builtins__ |
|
261 | # Re: inconsistent value from __builtins__ | |
261 | # Von: Alex Martelli <aleaxit@yahoo.com> |
|
262 | # Von: Alex Martelli <aleaxit@yahoo.com> | |
262 | # Datum: Freitag 01 Oktober 2004 04:45:34 nachmittags/abends |
|
263 | # Datum: Freitag 01 Oktober 2004 04:45:34 nachmittags/abends | |
263 | # Gruppen: comp.lang.python |
|
264 | # Gruppen: comp.lang.python | |
264 |
|
265 | |||
265 | # Michael Hohn <hohn@hooknose.lbl.gov> wrote: |
|
266 | # Michael Hohn <hohn@hooknose.lbl.gov> wrote: | |
266 | # > >>> print type(builtin_check.get_global_binding('__builtins__')) |
|
267 | # > >>> print type(builtin_check.get_global_binding('__builtins__')) | |
267 | # > <type 'dict'> |
|
268 | # > <type 'dict'> | |
268 | # > >>> print type(__builtins__) |
|
269 | # > >>> print type(__builtins__) | |
269 | # > <type 'module'> |
|
270 | # > <type 'module'> | |
270 | # > Is this difference in return value intentional? |
|
271 | # > Is this difference in return value intentional? | |
271 |
|
272 | |||
272 | # Well, it's documented that '__builtins__' can be either a dictionary |
|
273 | # Well, it's documented that '__builtins__' can be either a dictionary | |
273 | # or a module, and it's been that way for a long time. Whether it's |
|
274 | # or a module, and it's been that way for a long time. Whether it's | |
274 | # intentional (or sensible), I don't know. In any case, the idea is |
|
275 | # intentional (or sensible), I don't know. In any case, the idea is | |
275 | # that if you need to access the built-in namespace directly, you |
|
276 | # that if you need to access the built-in namespace directly, you | |
276 | # should start with "import __builtin__" (note, no 's') which will |
|
277 | # should start with "import __builtin__" (note, no 's') which will | |
277 | # definitely give you a module. Yeah, it's somewhat confusing:-(. |
|
278 | # definitely give you a module. Yeah, it's somewhat confusing:-(. | |
278 |
|
279 | |||
279 | if user_ns is None: |
|
280 | if user_ns is None: | |
280 | # Set __name__ to __main__ to better match the behavior of the |
|
281 | # Set __name__ to __main__ to better match the behavior of the | |
281 | # normal interpreter. |
|
282 | # normal interpreter. | |
282 | user_ns = {'__name__' :'__main__', |
|
283 | user_ns = {'__name__' :'__main__', | |
283 | '__builtins__' : __builtin__, |
|
284 | '__builtins__' : __builtin__, | |
284 | } |
|
285 | } | |
285 |
|
286 | |||
286 | if user_global_ns is None: |
|
287 | if user_global_ns is None: | |
287 | user_global_ns = {} |
|
288 | user_global_ns = {} | |
288 |
|
289 | |||
289 | # Assign namespaces |
|
290 | # Assign namespaces | |
290 | # This is the namespace where all normal user variables live |
|
291 | # This is the namespace where all normal user variables live | |
291 | self.user_ns = user_ns |
|
292 | self.user_ns = user_ns | |
292 | # Embedded instances require a separate namespace for globals. |
|
293 | # Embedded instances require a separate namespace for globals. | |
293 | # Normally this one is unused by non-embedded instances. |
|
294 | # Normally this one is unused by non-embedded instances. | |
294 | self.user_global_ns = user_global_ns |
|
295 | self.user_global_ns = user_global_ns | |
295 | # A namespace to keep track of internal data structures to prevent |
|
296 | # A namespace to keep track of internal data structures to prevent | |
296 | # them from cluttering user-visible stuff. Will be updated later |
|
297 | # them from cluttering user-visible stuff. Will be updated later | |
297 | self.internal_ns = {} |
|
298 | self.internal_ns = {} | |
298 |
|
299 | |||
299 | # Namespace of system aliases. Each entry in the alias |
|
300 | # Namespace of system aliases. Each entry in the alias | |
300 | # table must be a 2-tuple of the form (N,name), where N is the number |
|
301 | # table must be a 2-tuple of the form (N,name), where N is the number | |
301 | # of positional arguments of the alias. |
|
302 | # of positional arguments of the alias. | |
302 | self.alias_table = {} |
|
303 | self.alias_table = {} | |
303 |
|
304 | |||
304 | # A table holding all the namespaces IPython deals with, so that |
|
305 | # A table holding all the namespaces IPython deals with, so that | |
305 | # introspection facilities can search easily. |
|
306 | # introspection facilities can search easily. | |
306 | self.ns_table = {'user':user_ns, |
|
307 | self.ns_table = {'user':user_ns, | |
307 | 'user_global':user_global_ns, |
|
308 | 'user_global':user_global_ns, | |
308 | 'alias':self.alias_table, |
|
309 | 'alias':self.alias_table, | |
309 | 'internal':self.internal_ns, |
|
310 | 'internal':self.internal_ns, | |
310 | 'builtin':__builtin__.__dict__ |
|
311 | 'builtin':__builtin__.__dict__ | |
311 | } |
|
312 | } | |
312 |
|
313 | |||
313 | # The user namespace MUST have a pointer to the shell itself. |
|
314 | # The user namespace MUST have a pointer to the shell itself. | |
314 | self.user_ns[name] = self |
|
315 | self.user_ns[name] = self | |
315 |
|
316 | |||
316 | # We need to insert into sys.modules something that looks like a |
|
317 | # We need to insert into sys.modules something that looks like a | |
317 | # module but which accesses the IPython namespace, for shelve and |
|
318 | # module but which accesses the IPython namespace, for shelve and | |
318 | # pickle to work interactively. Normally they rely on getting |
|
319 | # pickle to work interactively. Normally they rely on getting | |
319 | # everything out of __main__, but for embedding purposes each IPython |
|
320 | # everything out of __main__, but for embedding purposes each IPython | |
320 | # instance has its own private namespace, so we can't go shoving |
|
321 | # instance has its own private namespace, so we can't go shoving | |
321 | # everything into __main__. |
|
322 | # everything into __main__. | |
322 |
|
323 | |||
323 | # note, however, that we should only do this for non-embedded |
|
324 | # note, however, that we should only do this for non-embedded | |
324 | # ipythons, which really mimic the __main__.__dict__ with their own |
|
325 | # ipythons, which really mimic the __main__.__dict__ with their own | |
325 | # namespace. Embedded instances, on the other hand, should not do |
|
326 | # namespace. Embedded instances, on the other hand, should not do | |
326 | # this because they need to manage the user local/global namespaces |
|
327 | # this because they need to manage the user local/global namespaces | |
327 | # only, but they live within a 'normal' __main__ (meaning, they |
|
328 | # only, but they live within a 'normal' __main__ (meaning, they | |
328 | # shouldn't overtake the execution environment of the script they're |
|
329 | # shouldn't overtake the execution environment of the script they're | |
329 | # embedded in). |
|
330 | # embedded in). | |
330 |
|
331 | |||
331 | if not embedded: |
|
332 | if not embedded: | |
332 | try: |
|
333 | try: | |
333 | main_name = self.user_ns['__name__'] |
|
334 | main_name = self.user_ns['__name__'] | |
334 | except KeyError: |
|
335 | except KeyError: | |
335 | raise KeyError,'user_ns dictionary MUST have a "__name__" key' |
|
336 | raise KeyError,'user_ns dictionary MUST have a "__name__" key' | |
336 | else: |
|
337 | else: | |
337 | #print "pickle hack in place" # dbg |
|
338 | #print "pickle hack in place" # dbg | |
338 | #print 'main_name:',main_name # dbg |
|
339 | #print 'main_name:',main_name # dbg | |
339 | sys.modules[main_name] = FakeModule(self.user_ns) |
|
340 | sys.modules[main_name] = FakeModule(self.user_ns) | |
340 |
|
341 | |||
341 | # List of input with multi-line handling. |
|
342 | # List of input with multi-line handling. | |
342 | # Fill its zero entry, user counter starts at 1 |
|
343 | # Fill its zero entry, user counter starts at 1 | |
343 | self.input_hist = InputList(['\n']) |
|
344 | self.input_hist = InputList(['\n']) | |
344 | # This one will hold the 'raw' input history, without any |
|
345 | # This one will hold the 'raw' input history, without any | |
345 | # pre-processing. This will allow users to retrieve the input just as |
|
346 | # pre-processing. This will allow users to retrieve the input just as | |
346 | # it was exactly typed in by the user, with %hist -r. |
|
347 | # it was exactly typed in by the user, with %hist -r. | |
347 | self.input_hist_raw = InputList(['\n']) |
|
348 | self.input_hist_raw = InputList(['\n']) | |
348 |
|
349 | |||
349 | # list of visited directories |
|
350 | # list of visited directories | |
350 | try: |
|
351 | try: | |
351 | self.dir_hist = [os.getcwd()] |
|
352 | self.dir_hist = [os.getcwd()] | |
352 | except IOError, e: |
|
353 | except IOError, e: | |
353 | self.dir_hist = [] |
|
354 | self.dir_hist = [] | |
354 |
|
355 | |||
355 | # dict of output history |
|
356 | # dict of output history | |
356 | self.output_hist = {} |
|
357 | self.output_hist = {} | |
357 |
|
358 | |||
358 | # dict of things NOT to alias (keywords, builtins and some magics) |
|
359 | # dict of things NOT to alias (keywords, builtins and some magics) | |
359 | no_alias = {} |
|
360 | no_alias = {} | |
360 | no_alias_magics = ['cd','popd','pushd','dhist','alias','unalias'] |
|
361 | no_alias_magics = ['cd','popd','pushd','dhist','alias','unalias'] | |
361 | for key in keyword.kwlist + no_alias_magics: |
|
362 | for key in keyword.kwlist + no_alias_magics: | |
362 | no_alias[key] = 1 |
|
363 | no_alias[key] = 1 | |
363 | no_alias.update(__builtin__.__dict__) |
|
364 | no_alias.update(__builtin__.__dict__) | |
364 | self.no_alias = no_alias |
|
365 | self.no_alias = no_alias | |
365 |
|
366 | |||
366 | # make global variables for user access to these |
|
367 | # make global variables for user access to these | |
367 | self.user_ns['_ih'] = self.input_hist |
|
368 | self.user_ns['_ih'] = self.input_hist | |
368 | self.user_ns['_oh'] = self.output_hist |
|
369 | self.user_ns['_oh'] = self.output_hist | |
369 | self.user_ns['_dh'] = self.dir_hist |
|
370 | self.user_ns['_dh'] = self.dir_hist | |
370 |
|
371 | |||
371 | # user aliases to input and output histories |
|
372 | # user aliases to input and output histories | |
372 | self.user_ns['In'] = self.input_hist |
|
373 | self.user_ns['In'] = self.input_hist | |
373 | self.user_ns['Out'] = self.output_hist |
|
374 | self.user_ns['Out'] = self.output_hist | |
374 |
|
375 | |||
375 | # Object variable to store code object waiting execution. This is |
|
376 | # Object variable to store code object waiting execution. This is | |
376 | # used mainly by the multithreaded shells, but it can come in handy in |
|
377 | # used mainly by the multithreaded shells, but it can come in handy in | |
377 | # other situations. No need to use a Queue here, since it's a single |
|
378 | # other situations. No need to use a Queue here, since it's a single | |
378 | # item which gets cleared once run. |
|
379 | # item which gets cleared once run. | |
379 | self.code_to_run = None |
|
380 | self.code_to_run = None | |
380 |
|
381 | |||
381 | # escapes for automatic behavior on the command line |
|
382 | # escapes for automatic behavior on the command line | |
382 | self.ESC_SHELL = '!' |
|
383 | self.ESC_SHELL = '!' | |
383 | self.ESC_HELP = '?' |
|
384 | self.ESC_HELP = '?' | |
384 | self.ESC_MAGIC = '%' |
|
385 | self.ESC_MAGIC = '%' | |
385 | self.ESC_QUOTE = ',' |
|
386 | self.ESC_QUOTE = ',' | |
386 | self.ESC_QUOTE2 = ';' |
|
387 | self.ESC_QUOTE2 = ';' | |
387 | self.ESC_PAREN = '/' |
|
388 | self.ESC_PAREN = '/' | |
388 |
|
389 | |||
389 | # And their associated handlers |
|
390 | # And their associated handlers | |
390 | self.esc_handlers = {self.ESC_PAREN : self.handle_auto, |
|
391 | self.esc_handlers = {self.ESC_PAREN : self.handle_auto, | |
391 | self.ESC_QUOTE : self.handle_auto, |
|
392 | self.ESC_QUOTE : self.handle_auto, | |
392 | self.ESC_QUOTE2 : self.handle_auto, |
|
393 | self.ESC_QUOTE2 : self.handle_auto, | |
393 | self.ESC_MAGIC : self.handle_magic, |
|
394 | self.ESC_MAGIC : self.handle_magic, | |
394 | self.ESC_HELP : self.handle_help, |
|
395 | self.ESC_HELP : self.handle_help, | |
395 | self.ESC_SHELL : self.handle_shell_escape, |
|
396 | self.ESC_SHELL : self.handle_shell_escape, | |
396 | } |
|
397 | } | |
397 |
|
398 | |||
398 | # class initializations |
|
399 | # class initializations | |
399 | Magic.__init__(self,self) |
|
400 | Magic.__init__(self,self) | |
400 |
|
401 | |||
401 | # Python source parser/formatter for syntax highlighting |
|
402 | # Python source parser/formatter for syntax highlighting | |
402 | pyformat = PyColorize.Parser().format |
|
403 | pyformat = PyColorize.Parser().format | |
403 | self.pycolorize = lambda src: pyformat(src,'str',self.rc['colors']) |
|
404 | self.pycolorize = lambda src: pyformat(src,'str',self.rc['colors']) | |
404 |
|
405 | |||
405 | # hooks holds pointers used for user-side customizations |
|
406 | # hooks holds pointers used for user-side customizations | |
406 | self.hooks = Struct() |
|
407 | self.hooks = Struct() | |
407 |
|
408 | |||
408 | # Set all default hooks, defined in the IPython.hooks module. |
|
409 | # Set all default hooks, defined in the IPython.hooks module. | |
409 | hooks = IPython.hooks |
|
410 | hooks = IPython.hooks | |
410 | for hook_name in hooks.__all__: |
|
411 | for hook_name in hooks.__all__: | |
411 | # default hooks have priority 100, i.e. low; user hooks should have 0-100 priority |
|
412 | # default hooks have priority 100, i.e. low; user hooks should have 0-100 priority | |
412 | self.set_hook(hook_name,getattr(hooks,hook_name), 100) |
|
413 | self.set_hook(hook_name,getattr(hooks,hook_name), 100) | |
413 |
|
414 | |||
414 | # Flag to mark unconditional exit |
|
415 | # Flag to mark unconditional exit | |
415 | self.exit_now = False |
|
416 | self.exit_now = False | |
416 |
|
417 | |||
417 | self.usage_min = """\ |
|
418 | self.usage_min = """\ | |
418 | An enhanced console for Python. |
|
419 | An enhanced console for Python. | |
419 | Some of its features are: |
|
420 | Some of its features are: | |
420 | - Readline support if the readline library is present. |
|
421 | - Readline support if the readline library is present. | |
421 | - Tab completion in the local namespace. |
|
422 | - Tab completion in the local namespace. | |
422 | - Logging of input, see command-line options. |
|
423 | - Logging of input, see command-line options. | |
423 | - System shell escape via ! , eg !ls. |
|
424 | - System shell escape via ! , eg !ls. | |
424 | - Magic commands, starting with a % (like %ls, %pwd, %cd, etc.) |
|
425 | - Magic commands, starting with a % (like %ls, %pwd, %cd, etc.) | |
425 | - Keeps track of locally defined variables via %who, %whos. |
|
426 | - Keeps track of locally defined variables via %who, %whos. | |
426 | - Show object information with a ? eg ?x or x? (use ?? for more info). |
|
427 | - Show object information with a ? eg ?x or x? (use ?? for more info). | |
427 | """ |
|
428 | """ | |
428 | if usage: self.usage = usage |
|
429 | if usage: self.usage = usage | |
429 | else: self.usage = self.usage_min |
|
430 | else: self.usage = self.usage_min | |
430 |
|
431 | |||
431 | # Storage |
|
432 | # Storage | |
432 | self.rc = rc # This will hold all configuration information |
|
433 | self.rc = rc # This will hold all configuration information | |
433 | self.pager = 'less' |
|
434 | self.pager = 'less' | |
434 | # temporary files used for various purposes. Deleted at exit. |
|
435 | # temporary files used for various purposes. Deleted at exit. | |
435 | self.tempfiles = [] |
|
436 | self.tempfiles = [] | |
436 |
|
437 | |||
437 | # Keep track of readline usage (later set by init_readline) |
|
438 | # Keep track of readline usage (later set by init_readline) | |
438 | self.has_readline = False |
|
439 | self.has_readline = False | |
439 |
|
440 | |||
440 | # template for logfile headers. It gets resolved at runtime by the |
|
441 | # template for logfile headers. It gets resolved at runtime by the | |
441 | # logstart method. |
|
442 | # logstart method. | |
442 | self.loghead_tpl = \ |
|
443 | self.loghead_tpl = \ | |
443 | """#log# Automatic Logger file. *** THIS MUST BE THE FIRST LINE *** |
|
444 | """#log# Automatic Logger file. *** THIS MUST BE THE FIRST LINE *** | |
444 | #log# DO NOT CHANGE THIS LINE OR THE TWO BELOW |
|
445 | #log# DO NOT CHANGE THIS LINE OR THE TWO BELOW | |
445 | #log# opts = %s |
|
446 | #log# opts = %s | |
446 | #log# args = %s |
|
447 | #log# args = %s | |
447 | #log# It is safe to make manual edits below here. |
|
448 | #log# It is safe to make manual edits below here. | |
448 | #log#----------------------------------------------------------------------- |
|
449 | #log#----------------------------------------------------------------------- | |
449 | """ |
|
450 | """ | |
450 | # for pushd/popd management |
|
451 | # for pushd/popd management | |
451 | try: |
|
452 | try: | |
452 | self.home_dir = get_home_dir() |
|
453 | self.home_dir = get_home_dir() | |
453 | except HomeDirError,msg: |
|
454 | except HomeDirError,msg: | |
454 | fatal(msg) |
|
455 | fatal(msg) | |
455 |
|
456 | |||
456 | self.dir_stack = [os.getcwd().replace(self.home_dir,'~')] |
|
457 | self.dir_stack = [os.getcwd().replace(self.home_dir,'~')] | |
457 |
|
458 | |||
458 | # Functions to call the underlying shell. |
|
459 | # Functions to call the underlying shell. | |
459 |
|
460 | |||
460 | # utility to expand user variables via Itpl |
|
461 | # utility to expand user variables via Itpl | |
461 | self.var_expand = lambda cmd: str(ItplNS(cmd.replace('#','\#'), |
|
462 | self.var_expand = lambda cmd: str(ItplNS(cmd.replace('#','\#'), | |
462 | self.user_ns)) |
|
463 | self.user_ns)) | |
463 | # The first is similar to os.system, but it doesn't return a value, |
|
464 | # The first is similar to os.system, but it doesn't return a value, | |
464 | # and it allows interpolation of variables in the user's namespace. |
|
465 | # and it allows interpolation of variables in the user's namespace. | |
465 | self.system = lambda cmd: shell(self.var_expand(cmd), |
|
466 | self.system = lambda cmd: shell(self.var_expand(cmd), | |
466 | header='IPython system call: ', |
|
467 | header='IPython system call: ', | |
467 | verbose=self.rc.system_verbose) |
|
468 | verbose=self.rc.system_verbose) | |
468 | # These are for getoutput and getoutputerror: |
|
469 | # These are for getoutput and getoutputerror: | |
469 | self.getoutput = lambda cmd: \ |
|
470 | self.getoutput = lambda cmd: \ | |
470 | getoutput(self.var_expand(cmd), |
|
471 | getoutput(self.var_expand(cmd), | |
471 | header='IPython system call: ', |
|
472 | header='IPython system call: ', | |
472 | verbose=self.rc.system_verbose) |
|
473 | verbose=self.rc.system_verbose) | |
473 | self.getoutputerror = lambda cmd: \ |
|
474 | self.getoutputerror = lambda cmd: \ | |
474 | getoutputerror(str(ItplNS(cmd.replace('#','\#'), |
|
475 | getoutputerror(str(ItplNS(cmd.replace('#','\#'), | |
475 | self.user_ns)), |
|
476 | self.user_ns)), | |
476 | header='IPython system call: ', |
|
477 | header='IPython system call: ', | |
477 | verbose=self.rc.system_verbose) |
|
478 | verbose=self.rc.system_verbose) | |
478 |
|
479 | |||
479 | # RegExp for splitting line contents into pre-char//first |
|
480 | # RegExp for splitting line contents into pre-char//first | |
480 | # word-method//rest. For clarity, each group in on one line. |
|
481 | # word-method//rest. For clarity, each group in on one line. | |
481 |
|
482 | |||
482 | # WARNING: update the regexp if the above escapes are changed, as they |
|
483 | # WARNING: update the regexp if the above escapes are changed, as they | |
483 | # are hardwired in. |
|
484 | # are hardwired in. | |
484 |
|
485 | |||
485 | # Don't get carried away with trying to make the autocalling catch too |
|
486 | # Don't get carried away with trying to make the autocalling catch too | |
486 | # much: it's better to be conservative rather than to trigger hidden |
|
487 | # much: it's better to be conservative rather than to trigger hidden | |
487 | # evals() somewhere and end up causing side effects. |
|
488 | # evals() somewhere and end up causing side effects. | |
488 |
|
489 | |||
489 | self.line_split = re.compile(r'^([\s*,;/])' |
|
490 | self.line_split = re.compile(r'^([\s*,;/])' | |
490 | r'([\?\w\.]+\w*\s*)' |
|
491 | r'([\?\w\.]+\w*\s*)' | |
491 | r'(\(?.*$)') |
|
492 | r'(\(?.*$)') | |
492 |
|
493 | |||
493 | # Original re, keep around for a while in case changes break something |
|
494 | # Original re, keep around for a while in case changes break something | |
494 | #self.line_split = re.compile(r'(^[\s*!\?%,/]?)' |
|
495 | #self.line_split = re.compile(r'(^[\s*!\?%,/]?)' | |
495 | # r'(\s*[\?\w\.]+\w*\s*)' |
|
496 | # r'(\s*[\?\w\.]+\w*\s*)' | |
496 | # r'(\(?.*$)') |
|
497 | # r'(\(?.*$)') | |
497 |
|
498 | |||
498 | # RegExp to identify potential function names |
|
499 | # RegExp to identify potential function names | |
499 | self.re_fun_name = re.compile(r'[a-zA-Z_]([a-zA-Z0-9_.]*) *$') |
|
500 | self.re_fun_name = re.compile(r'[a-zA-Z_]([a-zA-Z0-9_.]*) *$') | |
500 |
|
501 | |||
501 | # RegExp to exclude strings with this start from autocalling. In |
|
502 | # RegExp to exclude strings with this start from autocalling. In | |
502 | # particular, all binary operators should be excluded, so that if foo |
|
503 | # particular, all binary operators should be excluded, so that if foo | |
503 | # is callable, foo OP bar doesn't become foo(OP bar), which is |
|
504 | # is callable, foo OP bar doesn't become foo(OP bar), which is | |
504 | # invalid. The characters '!=()' don't need to be checked for, as the |
|
505 | # invalid. The characters '!=()' don't need to be checked for, as the | |
505 | # _prefilter routine explicitely does so, to catch direct calls and |
|
506 | # _prefilter routine explicitely does so, to catch direct calls and | |
506 | # rebindings of existing names. |
|
507 | # rebindings of existing names. | |
507 |
|
508 | |||
508 | # Warning: the '-' HAS TO BE AT THE END of the first group, otherwise |
|
509 | # Warning: the '-' HAS TO BE AT THE END of the first group, otherwise | |
509 | # it affects the rest of the group in square brackets. |
|
510 | # it affects the rest of the group in square brackets. | |
510 | self.re_exclude_auto = re.compile(r'^[<>,&^\|\*/\+-]' |
|
511 | self.re_exclude_auto = re.compile(r'^[<>,&^\|\*/\+-]' | |
511 | '|^is |^not |^in |^and |^or ') |
|
512 | '|^is |^not |^in |^and |^or ') | |
512 |
|
513 | |||
513 | # try to catch also methods for stuff in lists/tuples/dicts: off |
|
514 | # try to catch also methods for stuff in lists/tuples/dicts: off | |
514 | # (experimental). For this to work, the line_split regexp would need |
|
515 | # (experimental). For this to work, the line_split regexp would need | |
515 | # to be modified so it wouldn't break things at '['. That line is |
|
516 | # to be modified so it wouldn't break things at '['. That line is | |
516 | # nasty enough that I shouldn't change it until I can test it _well_. |
|
517 | # nasty enough that I shouldn't change it until I can test it _well_. | |
517 | #self.re_fun_name = re.compile (r'[a-zA-Z_]([a-zA-Z0-9_.\[\]]*) ?$') |
|
518 | #self.re_fun_name = re.compile (r'[a-zA-Z_]([a-zA-Z0-9_.\[\]]*) ?$') | |
518 |
|
519 | |||
519 | # keep track of where we started running (mainly for crash post-mortem) |
|
520 | # keep track of where we started running (mainly for crash post-mortem) | |
520 | self.starting_dir = os.getcwd() |
|
521 | self.starting_dir = os.getcwd() | |
521 |
|
522 | |||
522 | # Various switches which can be set |
|
523 | # Various switches which can be set | |
523 | self.CACHELENGTH = 5000 # this is cheap, it's just text |
|
524 | self.CACHELENGTH = 5000 # this is cheap, it's just text | |
524 | self.BANNER = "Python %(version)s on %(platform)s\n" % sys.__dict__ |
|
525 | self.BANNER = "Python %(version)s on %(platform)s\n" % sys.__dict__ | |
525 | self.banner2 = banner2 |
|
526 | self.banner2 = banner2 | |
526 |
|
527 | |||
527 | # TraceBack handlers: |
|
528 | # TraceBack handlers: | |
528 |
|
529 | |||
529 | # Syntax error handler. |
|
530 | # Syntax error handler. | |
530 | self.SyntaxTB = SyntaxTB(color_scheme='NoColor') |
|
531 | self.SyntaxTB = SyntaxTB(color_scheme='NoColor') | |
531 |
|
532 | |||
532 | # The interactive one is initialized with an offset, meaning we always |
|
533 | # The interactive one is initialized with an offset, meaning we always | |
533 | # want to remove the topmost item in the traceback, which is our own |
|
534 | # want to remove the topmost item in the traceback, which is our own | |
534 | # internal code. Valid modes: ['Plain','Context','Verbose'] |
|
535 | # internal code. Valid modes: ['Plain','Context','Verbose'] | |
535 | self.InteractiveTB = ultraTB.AutoFormattedTB(mode = 'Plain', |
|
536 | self.InteractiveTB = ultraTB.AutoFormattedTB(mode = 'Plain', | |
536 | color_scheme='NoColor', |
|
537 | color_scheme='NoColor', | |
537 | tb_offset = 1) |
|
538 | tb_offset = 1) | |
538 |
|
539 | |||
539 | # IPython itself shouldn't crash. This will produce a detailed |
|
540 | # IPython itself shouldn't crash. This will produce a detailed | |
540 | # post-mortem if it does. But we only install the crash handler for |
|
541 | # post-mortem if it does. But we only install the crash handler for | |
541 | # non-threaded shells, the threaded ones use a normal verbose reporter |
|
542 | # non-threaded shells, the threaded ones use a normal verbose reporter | |
542 | # and lose the crash handler. This is because exceptions in the main |
|
543 | # and lose the crash handler. This is because exceptions in the main | |
543 | # thread (such as in GUI code) propagate directly to sys.excepthook, |
|
544 | # thread (such as in GUI code) propagate directly to sys.excepthook, | |
544 | # and there's no point in printing crash dumps for every user exception. |
|
545 | # and there's no point in printing crash dumps for every user exception. | |
545 | if self.isthreaded: |
|
546 | if self.isthreaded: | |
546 | sys.excepthook = ultraTB.FormattedTB() |
|
547 | sys.excepthook = ultraTB.FormattedTB() | |
547 | else: |
|
548 | else: | |
548 | from IPython import CrashHandler |
|
549 | from IPython import CrashHandler | |
549 | sys.excepthook = CrashHandler.CrashHandler(self) |
|
550 | sys.excepthook = CrashHandler.CrashHandler(self) | |
550 |
|
551 | |||
551 | # The instance will store a pointer to this, so that runtime code |
|
552 | # The instance will store a pointer to this, so that runtime code | |
552 | # (such as magics) can access it. This is because during the |
|
553 | # (such as magics) can access it. This is because during the | |
553 | # read-eval loop, it gets temporarily overwritten (to deal with GUI |
|
554 | # read-eval loop, it gets temporarily overwritten (to deal with GUI | |
554 | # frameworks). |
|
555 | # frameworks). | |
555 | self.sys_excepthook = sys.excepthook |
|
556 | self.sys_excepthook = sys.excepthook | |
556 |
|
557 | |||
557 | # and add any custom exception handlers the user may have specified |
|
558 | # and add any custom exception handlers the user may have specified | |
558 | self.set_custom_exc(*custom_exceptions) |
|
559 | self.set_custom_exc(*custom_exceptions) | |
559 |
|
560 | |||
560 | # Object inspector |
|
561 | # Object inspector | |
561 | self.inspector = OInspect.Inspector(OInspect.InspectColors, |
|
562 | self.inspector = OInspect.Inspector(OInspect.InspectColors, | |
562 | PyColorize.ANSICodeColors, |
|
563 | PyColorize.ANSICodeColors, | |
563 | 'NoColor') |
|
564 | 'NoColor') | |
564 | # indentation management |
|
565 | # indentation management | |
565 | self.autoindent = False |
|
566 | self.autoindent = False | |
566 | self.indent_current_nsp = 0 |
|
567 | self.indent_current_nsp = 0 | |
567 |
|
568 | |||
568 | # Make some aliases automatically |
|
569 | # Make some aliases automatically | |
569 | # Prepare list of shell aliases to auto-define |
|
570 | # Prepare list of shell aliases to auto-define | |
570 | if os.name == 'posix': |
|
571 | if os.name == 'posix': | |
571 | auto_alias = ('mkdir mkdir', 'rmdir rmdir', |
|
572 | auto_alias = ('mkdir mkdir', 'rmdir rmdir', | |
572 | 'mv mv -i','rm rm -i','cp cp -i', |
|
573 | 'mv mv -i','rm rm -i','cp cp -i', | |
573 | 'cat cat','less less','clear clear', |
|
574 | 'cat cat','less less','clear clear', | |
574 | # a better ls |
|
575 | # a better ls | |
575 | 'ls ls -F', |
|
576 | 'ls ls -F', | |
576 | # long ls |
|
577 | # long ls | |
577 | 'll ls -lF', |
|
578 | 'll ls -lF', | |
578 | # color ls |
|
579 | # color ls | |
579 | 'lc ls -F -o --color', |
|
580 | 'lc ls -F -o --color', | |
580 | # ls normal files only |
|
581 | # ls normal files only | |
581 | 'lf ls -F -o --color %l | grep ^-', |
|
582 | 'lf ls -F -o --color %l | grep ^-', | |
582 | # ls symbolic links |
|
583 | # ls symbolic links | |
583 | 'lk ls -F -o --color %l | grep ^l', |
|
584 | 'lk ls -F -o --color %l | grep ^l', | |
584 | # directories or links to directories, |
|
585 | # directories or links to directories, | |
585 | 'ldir ls -F -o --color %l | grep /$', |
|
586 | 'ldir ls -F -o --color %l | grep /$', | |
586 | # things which are executable |
|
587 | # things which are executable | |
587 | 'lx ls -F -o --color %l | grep ^-..x', |
|
588 | 'lx ls -F -o --color %l | grep ^-..x', | |
588 | ) |
|
589 | ) | |
589 | elif os.name in ['nt','dos']: |
|
590 | elif os.name in ['nt','dos']: | |
590 | auto_alias = ('dir dir /on', 'ls dir /on', |
|
591 | auto_alias = ('dir dir /on', 'ls dir /on', | |
591 | 'ddir dir /ad /on', 'ldir dir /ad /on', |
|
592 | 'ddir dir /ad /on', 'ldir dir /ad /on', | |
592 | 'mkdir mkdir','rmdir rmdir','echo echo', |
|
593 | 'mkdir mkdir','rmdir rmdir','echo echo', | |
593 | 'ren ren','cls cls','copy copy') |
|
594 | 'ren ren','cls cls','copy copy') | |
594 | else: |
|
595 | else: | |
595 | auto_alias = () |
|
596 | auto_alias = () | |
596 | self.auto_alias = map(lambda s:s.split(None,1),auto_alias) |
|
597 | self.auto_alias = map(lambda s:s.split(None,1),auto_alias) | |
597 | # Call the actual (public) initializer |
|
598 | # Call the actual (public) initializer | |
598 | self.init_auto_alias() |
|
599 | self.init_auto_alias() | |
599 | # end __init__ |
|
600 | # end __init__ | |
600 |
|
601 | |||
601 | def post_config_initialization(self): |
|
602 | def post_config_initialization(self): | |
602 | """Post configuration init method |
|
603 | """Post configuration init method | |
603 |
|
604 | |||
604 | This is called after the configuration files have been processed to |
|
605 | This is called after the configuration files have been processed to | |
605 | 'finalize' the initialization.""" |
|
606 | 'finalize' the initialization.""" | |
606 |
|
607 | |||
607 | rc = self.rc |
|
608 | rc = self.rc | |
608 |
|
609 | |||
609 | # Load readline proper |
|
610 | # Load readline proper | |
610 | if rc.readline: |
|
611 | if rc.readline: | |
611 | self.init_readline() |
|
612 | self.init_readline() | |
612 |
|
613 | |||
613 | # local shortcut, this is used a LOT |
|
614 | # local shortcut, this is used a LOT | |
614 | self.log = self.logger.log |
|
615 | self.log = self.logger.log | |
615 |
|
616 | |||
616 | # Initialize cache, set in/out prompts and printing system |
|
617 | # Initialize cache, set in/out prompts and printing system | |
617 | self.outputcache = CachedOutput(self, |
|
618 | self.outputcache = CachedOutput(self, | |
618 | rc.cache_size, |
|
619 | rc.cache_size, | |
619 | rc.pprint, |
|
620 | rc.pprint, | |
620 | input_sep = rc.separate_in, |
|
621 | input_sep = rc.separate_in, | |
621 | output_sep = rc.separate_out, |
|
622 | output_sep = rc.separate_out, | |
622 | output_sep2 = rc.separate_out2, |
|
623 | output_sep2 = rc.separate_out2, | |
623 | ps1 = rc.prompt_in1, |
|
624 | ps1 = rc.prompt_in1, | |
624 | ps2 = rc.prompt_in2, |
|
625 | ps2 = rc.prompt_in2, | |
625 | ps_out = rc.prompt_out, |
|
626 | ps_out = rc.prompt_out, | |
626 | pad_left = rc.prompts_pad_left) |
|
627 | pad_left = rc.prompts_pad_left) | |
627 |
|
628 | |||
628 | # user may have over-ridden the default print hook: |
|
629 | # user may have over-ridden the default print hook: | |
629 | try: |
|
630 | try: | |
630 | self.outputcache.__class__.display = self.hooks.display |
|
631 | self.outputcache.__class__.display = self.hooks.display | |
631 | except AttributeError: |
|
632 | except AttributeError: | |
632 | pass |
|
633 | pass | |
633 |
|
634 | |||
634 | # I don't like assigning globally to sys, because it means when embedding |
|
635 | # I don't like assigning globally to sys, because it means when embedding | |
635 | # instances, each embedded instance overrides the previous choice. But |
|
636 | # instances, each embedded instance overrides the previous choice. But | |
636 | # sys.displayhook seems to be called internally by exec, so I don't see a |
|
637 | # sys.displayhook seems to be called internally by exec, so I don't see a | |
637 | # way around it. |
|
638 | # way around it. | |
638 | sys.displayhook = self.outputcache |
|
639 | sys.displayhook = self.outputcache | |
639 |
|
640 | |||
640 | # Set user colors (don't do it in the constructor above so that it |
|
641 | # Set user colors (don't do it in the constructor above so that it | |
641 | # doesn't crash if colors option is invalid) |
|
642 | # doesn't crash if colors option is invalid) | |
642 | self.magic_colors(rc.colors) |
|
643 | self.magic_colors(rc.colors) | |
643 |
|
644 | |||
644 | # Set calling of pdb on exceptions |
|
645 | # Set calling of pdb on exceptions | |
645 | self.call_pdb = rc.pdb |
|
646 | self.call_pdb = rc.pdb | |
646 |
|
647 | |||
647 | # Load user aliases |
|
648 | # Load user aliases | |
648 | for alias in rc.alias: |
|
649 | for alias in rc.alias: | |
649 | self.magic_alias(alias) |
|
650 | self.magic_alias(alias) | |
650 |
|
651 | |||
651 | # dynamic data that survives through sessions |
|
652 | # dynamic data that survives through sessions | |
652 | # XXX make the filename a config option? |
|
653 | # XXX make the filename a config option? | |
653 | persist_base = 'persist' |
|
654 | persist_base = 'persist' | |
654 | if rc.profile: |
|
655 | if rc.profile: | |
655 | persist_base += '_%s' % rc.profile |
|
656 | persist_base += '_%s' % rc.profile | |
656 | self.persist_fname = os.path.join(rc.ipythondir,persist_base) |
|
657 | self.persist_fname = os.path.join(rc.ipythondir,persist_base) | |
657 |
|
658 | |||
658 | try: |
|
659 | try: | |
659 | self.persist = pickle.load(file(self.persist_fname)) |
|
660 | self.persist = pickle.load(file(self.persist_fname)) | |
660 | except: |
|
661 | except: | |
661 | self.persist = {} |
|
662 | self.persist = {} | |
662 |
|
663 | |||
663 |
|
664 | |||
664 | for (key, value) in [(k[2:],v) for (k,v) in self.persist.items() if k.startswith('S:')]: |
|
665 | for (key, value) in [(k[2:],v) for (k,v) in self.persist.items() if k.startswith('S:')]: | |
665 | try: |
|
666 | try: | |
666 | obj = pickle.loads(value) |
|
667 | obj = pickle.loads(value) | |
667 | except: |
|
668 | except: | |
668 |
|
669 | |||
669 | print "Unable to restore variable '%s', ignoring (use %%store -d to forget!)" % key |
|
670 | print "Unable to restore variable '%s', ignoring (use %%store -d to forget!)" % key | |
670 | print "The error was:",sys.exc_info()[0] |
|
671 | print "The error was:",sys.exc_info()[0] | |
671 | continue |
|
672 | continue | |
672 |
|
673 | |||
673 |
|
674 | |||
674 | self.user_ns[key] = obj |
|
675 | self.user_ns[key] = obj | |
675 |
|
676 | |||
676 | def add_builtins(self): |
|
677 | def add_builtins(self): | |
677 | """Store ipython references into the builtin namespace. |
|
678 | """Store ipython references into the builtin namespace. | |
678 |
|
679 | |||
679 | Some parts of ipython operate via builtins injected here, which hold a |
|
680 | Some parts of ipython operate via builtins injected here, which hold a | |
680 | reference to IPython itself.""" |
|
681 | reference to IPython itself.""" | |
681 |
|
682 | |||
682 | builtins_new = dict(__IPYTHON__ = self, |
|
683 | builtins_new = dict(__IPYTHON__ = self, | |
683 | ip_set_hook = self.set_hook, |
|
684 | ip_set_hook = self.set_hook, | |
684 | jobs = self.jobs, |
|
685 | jobs = self.jobs, | |
685 | ipmagic = self.ipmagic, |
|
686 | ipmagic = self.ipmagic, | |
686 | ipalias = self.ipalias, |
|
687 | ipalias = self.ipalias, | |
687 | ipsystem = self.ipsystem, |
|
688 | ipsystem = self.ipsystem, | |
688 | ) |
|
689 | ) | |
689 | for biname,bival in builtins_new.items(): |
|
690 | for biname,bival in builtins_new.items(): | |
690 | try: |
|
691 | try: | |
691 | # store the orignal value so we can restore it |
|
692 | # store the orignal value so we can restore it | |
692 | self.builtins_added[biname] = __builtin__.__dict__[biname] |
|
693 | self.builtins_added[biname] = __builtin__.__dict__[biname] | |
693 | except KeyError: |
|
694 | except KeyError: | |
694 | # or mark that it wasn't defined, and we'll just delete it at |
|
695 | # or mark that it wasn't defined, and we'll just delete it at | |
695 | # cleanup |
|
696 | # cleanup | |
696 | self.builtins_added[biname] = Undefined |
|
697 | self.builtins_added[biname] = Undefined | |
697 | __builtin__.__dict__[biname] = bival |
|
698 | __builtin__.__dict__[biname] = bival | |
698 |
|
699 | |||
699 | # Keep in the builtins a flag for when IPython is active. We set it |
|
700 | # Keep in the builtins a flag for when IPython is active. We set it | |
700 | # with setdefault so that multiple nested IPythons don't clobber one |
|
701 | # with setdefault so that multiple nested IPythons don't clobber one | |
701 | # another. Each will increase its value by one upon being activated, |
|
702 | # another. Each will increase its value by one upon being activated, | |
702 | # which also gives us a way to determine the nesting level. |
|
703 | # which also gives us a way to determine the nesting level. | |
703 | __builtin__.__dict__.setdefault('__IPYTHON__active',0) |
|
704 | __builtin__.__dict__.setdefault('__IPYTHON__active',0) | |
704 |
|
705 | |||
705 | def clean_builtins(self): |
|
706 | def clean_builtins(self): | |
706 | """Remove any builtins which might have been added by add_builtins, or |
|
707 | """Remove any builtins which might have been added by add_builtins, or | |
707 | restore overwritten ones to their previous values.""" |
|
708 | restore overwritten ones to their previous values.""" | |
708 | for biname,bival in self.builtins_added.items(): |
|
709 | for biname,bival in self.builtins_added.items(): | |
709 | if bival is Undefined: |
|
710 | if bival is Undefined: | |
710 | del __builtin__.__dict__[biname] |
|
711 | del __builtin__.__dict__[biname] | |
711 | else: |
|
712 | else: | |
712 | __builtin__.__dict__[biname] = bival |
|
713 | __builtin__.__dict__[biname] = bival | |
713 | self.builtins_added.clear() |
|
714 | self.builtins_added.clear() | |
714 |
|
715 | |||
715 | def set_hook(self,name,hook, priority = 50): |
|
716 | def set_hook(self,name,hook, priority = 50): | |
716 | """set_hook(name,hook) -> sets an internal IPython hook. |
|
717 | """set_hook(name,hook) -> sets an internal IPython hook. | |
717 |
|
718 | |||
718 | IPython exposes some of its internal API as user-modifiable hooks. By |
|
719 | IPython exposes some of its internal API as user-modifiable hooks. By | |
719 | adding your function to one of these hooks, you can modify IPython's |
|
720 | adding your function to one of these hooks, you can modify IPython's | |
720 | behavior to call at runtime your own routines.""" |
|
721 | behavior to call at runtime your own routines.""" | |
721 |
|
722 | |||
722 | # At some point in the future, this should validate the hook before it |
|
723 | # At some point in the future, this should validate the hook before it | |
723 | # accepts it. Probably at least check that the hook takes the number |
|
724 | # accepts it. Probably at least check that the hook takes the number | |
724 | # of args it's supposed to. |
|
725 | # of args it's supposed to. | |
725 | dp = getattr(self.hooks, name, None) |
|
726 | dp = getattr(self.hooks, name, None) | |
726 | if not dp: |
|
727 | if not dp: | |
727 | dp = IPython.hooks.CommandChainDispatcher() |
|
728 | dp = IPython.hooks.CommandChainDispatcher() | |
728 |
|
729 | |||
729 | f = new.instancemethod(hook,self,self.__class__) |
|
730 | f = new.instancemethod(hook,self,self.__class__) | |
730 | try: |
|
731 | try: | |
731 | dp.add(f,priority) |
|
732 | dp.add(f,priority) | |
732 | except AttributeError: |
|
733 | except AttributeError: | |
733 | # it was not commandchain, plain old func - replace |
|
734 | # it was not commandchain, plain old func - replace | |
734 | dp = f |
|
735 | dp = f | |
735 |
|
736 | |||
736 | setattr(self.hooks,name, dp) |
|
737 | setattr(self.hooks,name, dp) | |
737 |
|
738 | |||
738 |
|
739 | |||
739 | #setattr(self.hooks,name,new.instancemethod(hook,self,self.__class__)) |
|
740 | #setattr(self.hooks,name,new.instancemethod(hook,self,self.__class__)) | |
740 |
|
741 | |||
741 | def set_custom_exc(self,exc_tuple,handler): |
|
742 | def set_custom_exc(self,exc_tuple,handler): | |
742 | """set_custom_exc(exc_tuple,handler) |
|
743 | """set_custom_exc(exc_tuple,handler) | |
743 |
|
744 | |||
744 | Set a custom exception handler, which will be called if any of the |
|
745 | Set a custom exception handler, which will be called if any of the | |
745 | exceptions in exc_tuple occur in the mainloop (specifically, in the |
|
746 | exceptions in exc_tuple occur in the mainloop (specifically, in the | |
746 | runcode() method. |
|
747 | runcode() method. | |
747 |
|
748 | |||
748 | Inputs: |
|
749 | Inputs: | |
749 |
|
750 | |||
750 | - exc_tuple: a *tuple* of valid exceptions to call the defined |
|
751 | - exc_tuple: a *tuple* of valid exceptions to call the defined | |
751 | handler for. It is very important that you use a tuple, and NOT A |
|
752 | handler for. It is very important that you use a tuple, and NOT A | |
752 | LIST here, because of the way Python's except statement works. If |
|
753 | LIST here, because of the way Python's except statement works. If | |
753 | you only want to trap a single exception, use a singleton tuple: |
|
754 | you only want to trap a single exception, use a singleton tuple: | |
754 |
|
755 | |||
755 | exc_tuple == (MyCustomException,) |
|
756 | exc_tuple == (MyCustomException,) | |
756 |
|
757 | |||
757 | - handler: this must be defined as a function with the following |
|
758 | - handler: this must be defined as a function with the following | |
758 | basic interface: def my_handler(self,etype,value,tb). |
|
759 | basic interface: def my_handler(self,etype,value,tb). | |
759 |
|
760 | |||
760 | This will be made into an instance method (via new.instancemethod) |
|
761 | This will be made into an instance method (via new.instancemethod) | |
761 | of IPython itself, and it will be called if any of the exceptions |
|
762 | of IPython itself, and it will be called if any of the exceptions | |
762 | listed in the exc_tuple are caught. If the handler is None, an |
|
763 | listed in the exc_tuple are caught. If the handler is None, an | |
763 | internal basic one is used, which just prints basic info. |
|
764 | internal basic one is used, which just prints basic info. | |
764 |
|
765 | |||
765 | WARNING: by putting in your own exception handler into IPython's main |
|
766 | WARNING: by putting in your own exception handler into IPython's main | |
766 | execution loop, you run a very good chance of nasty crashes. This |
|
767 | execution loop, you run a very good chance of nasty crashes. This | |
767 | facility should only be used if you really know what you are doing.""" |
|
768 | facility should only be used if you really know what you are doing.""" | |
768 |
|
769 | |||
769 | assert type(exc_tuple)==type(()) , \ |
|
770 | assert type(exc_tuple)==type(()) , \ | |
770 | "The custom exceptions must be given AS A TUPLE." |
|
771 | "The custom exceptions must be given AS A TUPLE." | |
771 |
|
772 | |||
772 | def dummy_handler(self,etype,value,tb): |
|
773 | def dummy_handler(self,etype,value,tb): | |
773 | print '*** Simple custom exception handler ***' |
|
774 | print '*** Simple custom exception handler ***' | |
774 | print 'Exception type :',etype |
|
775 | print 'Exception type :',etype | |
775 | print 'Exception value:',value |
|
776 | print 'Exception value:',value | |
776 | print 'Traceback :',tb |
|
777 | print 'Traceback :',tb | |
777 | print 'Source code :','\n'.join(self.buffer) |
|
778 | print 'Source code :','\n'.join(self.buffer) | |
778 |
|
779 | |||
779 | if handler is None: handler = dummy_handler |
|
780 | if handler is None: handler = dummy_handler | |
780 |
|
781 | |||
781 | self.CustomTB = new.instancemethod(handler,self,self.__class__) |
|
782 | self.CustomTB = new.instancemethod(handler,self,self.__class__) | |
782 | self.custom_exceptions = exc_tuple |
|
783 | self.custom_exceptions = exc_tuple | |
783 |
|
784 | |||
784 | def set_custom_completer(self,completer,pos=0): |
|
785 | def set_custom_completer(self,completer,pos=0): | |
785 | """set_custom_completer(completer,pos=0) |
|
786 | """set_custom_completer(completer,pos=0) | |
786 |
|
787 | |||
787 | Adds a new custom completer function. |
|
788 | Adds a new custom completer function. | |
788 |
|
789 | |||
789 | The position argument (defaults to 0) is the index in the completers |
|
790 | The position argument (defaults to 0) is the index in the completers | |
790 | list where you want the completer to be inserted.""" |
|
791 | list where you want the completer to be inserted.""" | |
791 |
|
792 | |||
792 | newcomp = new.instancemethod(completer,self.Completer, |
|
793 | newcomp = new.instancemethod(completer,self.Completer, | |
793 | self.Completer.__class__) |
|
794 | self.Completer.__class__) | |
794 | self.Completer.matchers.insert(pos,newcomp) |
|
795 | self.Completer.matchers.insert(pos,newcomp) | |
795 |
|
796 | |||
796 | def _get_call_pdb(self): |
|
797 | def _get_call_pdb(self): | |
797 | return self._call_pdb |
|
798 | return self._call_pdb | |
798 |
|
799 | |||
799 | def _set_call_pdb(self,val): |
|
800 | def _set_call_pdb(self,val): | |
800 |
|
801 | |||
801 | if val not in (0,1,False,True): |
|
802 | if val not in (0,1,False,True): | |
802 | raise ValueError,'new call_pdb value must be boolean' |
|
803 | raise ValueError,'new call_pdb value must be boolean' | |
803 |
|
804 | |||
804 | # store value in instance |
|
805 | # store value in instance | |
805 | self._call_pdb = val |
|
806 | self._call_pdb = val | |
806 |
|
807 | |||
807 | # notify the actual exception handlers |
|
808 | # notify the actual exception handlers | |
808 | self.InteractiveTB.call_pdb = val |
|
809 | self.InteractiveTB.call_pdb = val | |
809 | if self.isthreaded: |
|
810 | if self.isthreaded: | |
810 | try: |
|
811 | try: | |
811 | self.sys_excepthook.call_pdb = val |
|
812 | self.sys_excepthook.call_pdb = val | |
812 | except: |
|
813 | except: | |
813 | warn('Failed to activate pdb for threaded exception handler') |
|
814 | warn('Failed to activate pdb for threaded exception handler') | |
814 |
|
815 | |||
815 | call_pdb = property(_get_call_pdb,_set_call_pdb,None, |
|
816 | call_pdb = property(_get_call_pdb,_set_call_pdb,None, | |
816 | 'Control auto-activation of pdb at exceptions') |
|
817 | 'Control auto-activation of pdb at exceptions') | |
817 |
|
818 | |||
818 |
|
819 | |||
819 | # These special functions get installed in the builtin namespace, to |
|
820 | # These special functions get installed in the builtin namespace, to | |
820 | # provide programmatic (pure python) access to magics, aliases and system |
|
821 | # provide programmatic (pure python) access to magics, aliases and system | |
821 | # calls. This is important for logging, user scripting, and more. |
|
822 | # calls. This is important for logging, user scripting, and more. | |
822 |
|
823 | |||
823 | # We are basically exposing, via normal python functions, the three |
|
824 | # We are basically exposing, via normal python functions, the three | |
824 | # mechanisms in which ipython offers special call modes (magics for |
|
825 | # mechanisms in which ipython offers special call modes (magics for | |
825 | # internal control, aliases for direct system access via pre-selected |
|
826 | # internal control, aliases for direct system access via pre-selected | |
826 | # names, and !cmd for calling arbitrary system commands). |
|
827 | # names, and !cmd for calling arbitrary system commands). | |
827 |
|
828 | |||
828 | def ipmagic(self,arg_s): |
|
829 | def ipmagic(self,arg_s): | |
829 | """Call a magic function by name. |
|
830 | """Call a magic function by name. | |
830 |
|
831 | |||
831 | Input: a string containing the name of the magic function to call and any |
|
832 | Input: a string containing the name of the magic function to call and any | |
832 | additional arguments to be passed to the magic. |
|
833 | additional arguments to be passed to the magic. | |
833 |
|
834 | |||
834 | ipmagic('name -opt foo bar') is equivalent to typing at the ipython |
|
835 | ipmagic('name -opt foo bar') is equivalent to typing at the ipython | |
835 | prompt: |
|
836 | prompt: | |
836 |
|
837 | |||
837 | In[1]: %name -opt foo bar |
|
838 | In[1]: %name -opt foo bar | |
838 |
|
839 | |||
839 | To call a magic without arguments, simply use ipmagic('name'). |
|
840 | To call a magic without arguments, simply use ipmagic('name'). | |
840 |
|
841 | |||
841 | This provides a proper Python function to call IPython's magics in any |
|
842 | This provides a proper Python function to call IPython's magics in any | |
842 | valid Python code you can type at the interpreter, including loops and |
|
843 | valid Python code you can type at the interpreter, including loops and | |
843 | compound statements. It is added by IPython to the Python builtin |
|
844 | compound statements. It is added by IPython to the Python builtin | |
844 | namespace upon initialization.""" |
|
845 | namespace upon initialization.""" | |
845 |
|
846 | |||
846 | args = arg_s.split(' ',1) |
|
847 | args = arg_s.split(' ',1) | |
847 | magic_name = args[0] |
|
848 | magic_name = args[0] | |
848 | magic_name = magic_name.lstrip(self.ESC_MAGIC) |
|
849 | magic_name = magic_name.lstrip(self.ESC_MAGIC) | |
849 |
|
850 | |||
850 | try: |
|
851 | try: | |
851 | magic_args = args[1] |
|
852 | magic_args = args[1] | |
852 | except IndexError: |
|
853 | except IndexError: | |
853 | magic_args = '' |
|
854 | magic_args = '' | |
854 | fn = getattr(self,'magic_'+magic_name,None) |
|
855 | fn = getattr(self,'magic_'+magic_name,None) | |
855 | if fn is None: |
|
856 | if fn is None: | |
856 | error("Magic function `%s` not found." % magic_name) |
|
857 | error("Magic function `%s` not found." % magic_name) | |
857 | else: |
|
858 | else: | |
858 | magic_args = self.var_expand(magic_args) |
|
859 | magic_args = self.var_expand(magic_args) | |
859 | return fn(magic_args) |
|
860 | return fn(magic_args) | |
860 |
|
861 | |||
861 | def ipalias(self,arg_s): |
|
862 | def ipalias(self,arg_s): | |
862 | """Call an alias by name. |
|
863 | """Call an alias by name. | |
863 |
|
864 | |||
864 | Input: a string containing the name of the alias to call and any |
|
865 | Input: a string containing the name of the alias to call and any | |
865 | additional arguments to be passed to the magic. |
|
866 | additional arguments to be passed to the magic. | |
866 |
|
867 | |||
867 | ipalias('name -opt foo bar') is equivalent to typing at the ipython |
|
868 | ipalias('name -opt foo bar') is equivalent to typing at the ipython | |
868 | prompt: |
|
869 | prompt: | |
869 |
|
870 | |||
870 | In[1]: name -opt foo bar |
|
871 | In[1]: name -opt foo bar | |
871 |
|
872 | |||
872 | To call an alias without arguments, simply use ipalias('name'). |
|
873 | To call an alias without arguments, simply use ipalias('name'). | |
873 |
|
874 | |||
874 | This provides a proper Python function to call IPython's aliases in any |
|
875 | This provides a proper Python function to call IPython's aliases in any | |
875 | valid Python code you can type at the interpreter, including loops and |
|
876 | valid Python code you can type at the interpreter, including loops and | |
876 | compound statements. It is added by IPython to the Python builtin |
|
877 | compound statements. It is added by IPython to the Python builtin | |
877 | namespace upon initialization.""" |
|
878 | namespace upon initialization.""" | |
878 |
|
879 | |||
879 | args = arg_s.split(' ',1) |
|
880 | args = arg_s.split(' ',1) | |
880 | alias_name = args[0] |
|
881 | alias_name = args[0] | |
881 | try: |
|
882 | try: | |
882 | alias_args = args[1] |
|
883 | alias_args = args[1] | |
883 | except IndexError: |
|
884 | except IndexError: | |
884 | alias_args = '' |
|
885 | alias_args = '' | |
885 | if alias_name in self.alias_table: |
|
886 | if alias_name in self.alias_table: | |
886 | self.call_alias(alias_name,alias_args) |
|
887 | self.call_alias(alias_name,alias_args) | |
887 | else: |
|
888 | else: | |
888 | error("Alias `%s` not found." % alias_name) |
|
889 | error("Alias `%s` not found." % alias_name) | |
889 |
|
890 | |||
890 | def ipsystem(self,arg_s): |
|
891 | def ipsystem(self,arg_s): | |
891 | """Make a system call, using IPython.""" |
|
892 | """Make a system call, using IPython.""" | |
892 |
|
893 | |||
893 | self.system(arg_s) |
|
894 | self.system(arg_s) | |
894 |
|
895 | |||
895 | def complete(self,text): |
|
896 | def complete(self,text): | |
896 | """Return a sorted list of all possible completions on text. |
|
897 | """Return a sorted list of all possible completions on text. | |
897 |
|
898 | |||
898 | Inputs: |
|
899 | Inputs: | |
899 |
|
900 | |||
900 | - text: a string of text to be completed on. |
|
901 | - text: a string of text to be completed on. | |
901 |
|
902 | |||
902 | This is a wrapper around the completion mechanism, similar to what |
|
903 | This is a wrapper around the completion mechanism, similar to what | |
903 | readline does at the command line when the TAB key is hit. By |
|
904 | readline does at the command line when the TAB key is hit. By | |
904 | exposing it as a method, it can be used by other non-readline |
|
905 | exposing it as a method, it can be used by other non-readline | |
905 | environments (such as GUIs) for text completion. |
|
906 | environments (such as GUIs) for text completion. | |
906 |
|
907 | |||
907 | Simple usage example: |
|
908 | Simple usage example: | |
908 |
|
909 | |||
909 | In [1]: x = 'hello' |
|
910 | In [1]: x = 'hello' | |
910 |
|
911 | |||
911 | In [2]: __IP.complete('x.l') |
|
912 | In [2]: __IP.complete('x.l') | |
912 | Out[2]: ['x.ljust', 'x.lower', 'x.lstrip']""" |
|
913 | Out[2]: ['x.ljust', 'x.lower', 'x.lstrip']""" | |
913 |
|
914 | |||
914 | complete = self.Completer.complete |
|
915 | complete = self.Completer.complete | |
915 | state = 0 |
|
916 | state = 0 | |
916 | # use a dict so we get unique keys, since ipyhton's multiple |
|
917 | # use a dict so we get unique keys, since ipyhton's multiple | |
917 | # completers can return duplicates. |
|
918 | # completers can return duplicates. | |
918 | comps = {} |
|
919 | comps = {} | |
919 | while True: |
|
920 | while True: | |
920 | newcomp = complete(text,state) |
|
921 | newcomp = complete(text,state) | |
921 | if newcomp is None: |
|
922 | if newcomp is None: | |
922 | break |
|
923 | break | |
923 | comps[newcomp] = 1 |
|
924 | comps[newcomp] = 1 | |
924 | state += 1 |
|
925 | state += 1 | |
925 | outcomps = comps.keys() |
|
926 | outcomps = comps.keys() | |
926 | outcomps.sort() |
|
927 | outcomps.sort() | |
927 | return outcomps |
|
928 | return outcomps | |
928 |
|
929 | |||
929 | def set_completer_frame(self, frame=None): |
|
930 | def set_completer_frame(self, frame=None): | |
930 | if frame: |
|
931 | if frame: | |
931 | self.Completer.namespace = frame.f_locals |
|
932 | self.Completer.namespace = frame.f_locals | |
932 | self.Completer.global_namespace = frame.f_globals |
|
933 | self.Completer.global_namespace = frame.f_globals | |
933 | else: |
|
934 | else: | |
934 | self.Completer.namespace = self.user_ns |
|
935 | self.Completer.namespace = self.user_ns | |
935 | self.Completer.global_namespace = self.user_global_ns |
|
936 | self.Completer.global_namespace = self.user_global_ns | |
936 |
|
937 | |||
937 | def init_auto_alias(self): |
|
938 | def init_auto_alias(self): | |
938 | """Define some aliases automatically. |
|
939 | """Define some aliases automatically. | |
939 |
|
940 | |||
940 | These are ALL parameter-less aliases""" |
|
941 | These are ALL parameter-less aliases""" | |
941 |
|
942 | |||
942 | for alias,cmd in self.auto_alias: |
|
943 | for alias,cmd in self.auto_alias: | |
943 | self.alias_table[alias] = (0,cmd) |
|
944 | self.alias_table[alias] = (0,cmd) | |
944 |
|
945 | |||
945 | def alias_table_validate(self,verbose=0): |
|
946 | def alias_table_validate(self,verbose=0): | |
946 | """Update information about the alias table. |
|
947 | """Update information about the alias table. | |
947 |
|
948 | |||
948 | In particular, make sure no Python keywords/builtins are in it.""" |
|
949 | In particular, make sure no Python keywords/builtins are in it.""" | |
949 |
|
950 | |||
950 | no_alias = self.no_alias |
|
951 | no_alias = self.no_alias | |
951 | for k in self.alias_table.keys(): |
|
952 | for k in self.alias_table.keys(): | |
952 | if k in no_alias: |
|
953 | if k in no_alias: | |
953 | del self.alias_table[k] |
|
954 | del self.alias_table[k] | |
954 | if verbose: |
|
955 | if verbose: | |
955 | print ("Deleting alias <%s>, it's a Python " |
|
956 | print ("Deleting alias <%s>, it's a Python " | |
956 | "keyword or builtin." % k) |
|
957 | "keyword or builtin." % k) | |
957 |
|
958 | |||
958 | def set_autoindent(self,value=None): |
|
959 | def set_autoindent(self,value=None): | |
959 | """Set the autoindent flag, checking for readline support. |
|
960 | """Set the autoindent flag, checking for readline support. | |
960 |
|
961 | |||
961 | If called with no arguments, it acts as a toggle.""" |
|
962 | If called with no arguments, it acts as a toggle.""" | |
962 |
|
963 | |||
963 | if not self.has_readline: |
|
964 | if not self.has_readline: | |
964 | if os.name == 'posix': |
|
965 | if os.name == 'posix': | |
965 | warn("The auto-indent feature requires the readline library") |
|
966 | warn("The auto-indent feature requires the readline library") | |
966 | self.autoindent = 0 |
|
967 | self.autoindent = 0 | |
967 | return |
|
968 | return | |
968 | if value is None: |
|
969 | if value is None: | |
969 | self.autoindent = not self.autoindent |
|
970 | self.autoindent = not self.autoindent | |
970 | else: |
|
971 | else: | |
971 | self.autoindent = value |
|
972 | self.autoindent = value | |
972 |
|
973 | |||
973 | def rc_set_toggle(self,rc_field,value=None): |
|
974 | def rc_set_toggle(self,rc_field,value=None): | |
974 | """Set or toggle a field in IPython's rc config. structure. |
|
975 | """Set or toggle a field in IPython's rc config. structure. | |
975 |
|
976 | |||
976 | If called with no arguments, it acts as a toggle. |
|
977 | If called with no arguments, it acts as a toggle. | |
977 |
|
978 | |||
978 | If called with a non-existent field, the resulting AttributeError |
|
979 | If called with a non-existent field, the resulting AttributeError | |
979 | exception will propagate out.""" |
|
980 | exception will propagate out.""" | |
980 |
|
981 | |||
981 | rc_val = getattr(self.rc,rc_field) |
|
982 | rc_val = getattr(self.rc,rc_field) | |
982 | if value is None: |
|
983 | if value is None: | |
983 | value = not rc_val |
|
984 | value = not rc_val | |
984 | setattr(self.rc,rc_field,value) |
|
985 | setattr(self.rc,rc_field,value) | |
985 |
|
986 | |||
986 | def user_setup(self,ipythondir,rc_suffix,mode='install'): |
|
987 | def user_setup(self,ipythondir,rc_suffix,mode='install'): | |
987 | """Install the user configuration directory. |
|
988 | """Install the user configuration directory. | |
988 |
|
989 | |||
989 | Can be called when running for the first time or to upgrade the user's |
|
990 | Can be called when running for the first time or to upgrade the user's | |
990 | .ipython/ directory with the mode parameter. Valid modes are 'install' |
|
991 | .ipython/ directory with the mode parameter. Valid modes are 'install' | |
991 | and 'upgrade'.""" |
|
992 | and 'upgrade'.""" | |
992 |
|
993 | |||
993 | def wait(): |
|
994 | def wait(): | |
994 | try: |
|
995 | try: | |
995 | raw_input("Please press <RETURN> to start IPython.") |
|
996 | raw_input("Please press <RETURN> to start IPython.") | |
996 | except EOFError: |
|
997 | except EOFError: | |
997 | print >> Term.cout |
|
998 | print >> Term.cout | |
998 | print '*'*70 |
|
999 | print '*'*70 | |
999 |
|
1000 | |||
1000 | cwd = os.getcwd() # remember where we started |
|
1001 | cwd = os.getcwd() # remember where we started | |
1001 | glb = glob.glob |
|
1002 | glb = glob.glob | |
1002 | print '*'*70 |
|
1003 | print '*'*70 | |
1003 | if mode == 'install': |
|
1004 | if mode == 'install': | |
1004 | print \ |
|
1005 | print \ | |
1005 | """Welcome to IPython. I will try to create a personal configuration directory |
|
1006 | """Welcome to IPython. I will try to create a personal configuration directory | |
1006 | where you can customize many aspects of IPython's functionality in:\n""" |
|
1007 | where you can customize many aspects of IPython's functionality in:\n""" | |
1007 | else: |
|
1008 | else: | |
1008 | print 'I am going to upgrade your configuration in:' |
|
1009 | print 'I am going to upgrade your configuration in:' | |
1009 |
|
1010 | |||
1010 | print ipythondir |
|
1011 | print ipythondir | |
1011 |
|
1012 | |||
1012 | rcdirend = os.path.join('IPython','UserConfig') |
|
1013 | rcdirend = os.path.join('IPython','UserConfig') | |
1013 | cfg = lambda d: os.path.join(d,rcdirend) |
|
1014 | cfg = lambda d: os.path.join(d,rcdirend) | |
1014 | try: |
|
1015 | try: | |
1015 | rcdir = filter(os.path.isdir,map(cfg,sys.path))[0] |
|
1016 | rcdir = filter(os.path.isdir,map(cfg,sys.path))[0] | |
1016 | except IOError: |
|
1017 | except IOError: | |
1017 | warning = """ |
|
1018 | warning = """ | |
1018 | Installation error. IPython's directory was not found. |
|
1019 | Installation error. IPython's directory was not found. | |
1019 |
|
1020 | |||
1020 | Check the following: |
|
1021 | Check the following: | |
1021 |
|
1022 | |||
1022 | The ipython/IPython directory should be in a directory belonging to your |
|
1023 | The ipython/IPython directory should be in a directory belonging to your | |
1023 | PYTHONPATH environment variable (that is, it should be in a directory |
|
1024 | PYTHONPATH environment variable (that is, it should be in a directory | |
1024 | belonging to sys.path). You can copy it explicitly there or just link to it. |
|
1025 | belonging to sys.path). You can copy it explicitly there or just link to it. | |
1025 |
|
1026 | |||
1026 | IPython will proceed with builtin defaults. |
|
1027 | IPython will proceed with builtin defaults. | |
1027 | """ |
|
1028 | """ | |
1028 | warn(warning) |
|
1029 | warn(warning) | |
1029 | wait() |
|
1030 | wait() | |
1030 | return |
|
1031 | return | |
1031 |
|
1032 | |||
1032 | if mode == 'install': |
|
1033 | if mode == 'install': | |
1033 | try: |
|
1034 | try: | |
1034 | shutil.copytree(rcdir,ipythondir) |
|
1035 | shutil.copytree(rcdir,ipythondir) | |
1035 | os.chdir(ipythondir) |
|
1036 | os.chdir(ipythondir) | |
1036 | rc_files = glb("ipythonrc*") |
|
1037 | rc_files = glb("ipythonrc*") | |
1037 | for rc_file in rc_files: |
|
1038 | for rc_file in rc_files: | |
1038 | os.rename(rc_file,rc_file+rc_suffix) |
|
1039 | os.rename(rc_file,rc_file+rc_suffix) | |
1039 | except: |
|
1040 | except: | |
1040 | warning = """ |
|
1041 | warning = """ | |
1041 |
|
1042 | |||
1042 | There was a problem with the installation: |
|
1043 | There was a problem with the installation: | |
1043 | %s |
|
1044 | %s | |
1044 | Try to correct it or contact the developers if you think it's a bug. |
|
1045 | Try to correct it or contact the developers if you think it's a bug. | |
1045 | IPython will proceed with builtin defaults.""" % sys.exc_info()[1] |
|
1046 | IPython will proceed with builtin defaults.""" % sys.exc_info()[1] | |
1046 | warn(warning) |
|
1047 | warn(warning) | |
1047 | wait() |
|
1048 | wait() | |
1048 | return |
|
1049 | return | |
1049 |
|
1050 | |||
1050 | elif mode == 'upgrade': |
|
1051 | elif mode == 'upgrade': | |
1051 | try: |
|
1052 | try: | |
1052 | os.chdir(ipythondir) |
|
1053 | os.chdir(ipythondir) | |
1053 | except: |
|
1054 | except: | |
1054 | print """ |
|
1055 | print """ | |
1055 | Can not upgrade: changing to directory %s failed. Details: |
|
1056 | Can not upgrade: changing to directory %s failed. Details: | |
1056 | %s |
|
1057 | %s | |
1057 | """ % (ipythondir,sys.exc_info()[1]) |
|
1058 | """ % (ipythondir,sys.exc_info()[1]) | |
1058 | wait() |
|
1059 | wait() | |
1059 | return |
|
1060 | return | |
1060 | else: |
|
1061 | else: | |
1061 | sources = glb(os.path.join(rcdir,'[A-Za-z]*')) |
|
1062 | sources = glb(os.path.join(rcdir,'[A-Za-z]*')) | |
1062 | for new_full_path in sources: |
|
1063 | for new_full_path in sources: | |
1063 | new_filename = os.path.basename(new_full_path) |
|
1064 | new_filename = os.path.basename(new_full_path) | |
1064 | if new_filename.startswith('ipythonrc'): |
|
1065 | if new_filename.startswith('ipythonrc'): | |
1065 | new_filename = new_filename + rc_suffix |
|
1066 | new_filename = new_filename + rc_suffix | |
1066 | # The config directory should only contain files, skip any |
|
1067 | # The config directory should only contain files, skip any | |
1067 | # directories which may be there (like CVS) |
|
1068 | # directories which may be there (like CVS) | |
1068 | if os.path.isdir(new_full_path): |
|
1069 | if os.path.isdir(new_full_path): | |
1069 | continue |
|
1070 | continue | |
1070 | if os.path.exists(new_filename): |
|
1071 | if os.path.exists(new_filename): | |
1071 | old_file = new_filename+'.old' |
|
1072 | old_file = new_filename+'.old' | |
1072 | if os.path.exists(old_file): |
|
1073 | if os.path.exists(old_file): | |
1073 | os.remove(old_file) |
|
1074 | os.remove(old_file) | |
1074 | os.rename(new_filename,old_file) |
|
1075 | os.rename(new_filename,old_file) | |
1075 | shutil.copy(new_full_path,new_filename) |
|
1076 | shutil.copy(new_full_path,new_filename) | |
1076 | else: |
|
1077 | else: | |
1077 | raise ValueError,'unrecognized mode for install:',`mode` |
|
1078 | raise ValueError,'unrecognized mode for install:',`mode` | |
1078 |
|
1079 | |||
1079 | # Fix line-endings to those native to each platform in the config |
|
1080 | # Fix line-endings to those native to each platform in the config | |
1080 | # directory. |
|
1081 | # directory. | |
1081 | try: |
|
1082 | try: | |
1082 | os.chdir(ipythondir) |
|
1083 | os.chdir(ipythondir) | |
1083 | except: |
|
1084 | except: | |
1084 | print """ |
|
1085 | print """ | |
1085 | Problem: changing to directory %s failed. |
|
1086 | Problem: changing to directory %s failed. | |
1086 | Details: |
|
1087 | Details: | |
1087 | %s |
|
1088 | %s | |
1088 |
|
1089 | |||
1089 | Some configuration files may have incorrect line endings. This should not |
|
1090 | Some configuration files may have incorrect line endings. This should not | |
1090 | cause any problems during execution. """ % (ipythondir,sys.exc_info()[1]) |
|
1091 | cause any problems during execution. """ % (ipythondir,sys.exc_info()[1]) | |
1091 | wait() |
|
1092 | wait() | |
1092 | else: |
|
1093 | else: | |
1093 | for fname in glb('ipythonrc*'): |
|
1094 | for fname in glb('ipythonrc*'): | |
1094 | try: |
|
1095 | try: | |
1095 | native_line_ends(fname,backup=0) |
|
1096 | native_line_ends(fname,backup=0) | |
1096 | except IOError: |
|
1097 | except IOError: | |
1097 | pass |
|
1098 | pass | |
1098 |
|
1099 | |||
1099 | if mode == 'install': |
|
1100 | if mode == 'install': | |
1100 | print """ |
|
1101 | print """ | |
1101 | Successful installation! |
|
1102 | Successful installation! | |
1102 |
|
1103 | |||
1103 | Please read the sections 'Initial Configuration' and 'Quick Tips' in the |
|
1104 | Please read the sections 'Initial Configuration' and 'Quick Tips' in the | |
1104 | IPython manual (there are both HTML and PDF versions supplied with the |
|
1105 | IPython manual (there are both HTML and PDF versions supplied with the | |
1105 | distribution) to make sure that your system environment is properly configured |
|
1106 | distribution) to make sure that your system environment is properly configured | |
1106 | to take advantage of IPython's features. |
|
1107 | to take advantage of IPython's features. | |
1107 |
|
1108 | |||
1108 | Important note: the configuration system has changed! The old system is |
|
1109 | Important note: the configuration system has changed! The old system is | |
1109 | still in place, but its setting may be partly overridden by the settings in |
|
1110 | still in place, but its setting may be partly overridden by the settings in | |
1110 | "~/.ipython/ipy_user_conf.py" config file. Please take a look at the file |
|
1111 | "~/.ipython/ipy_user_conf.py" config file. Please take a look at the file | |
1111 | if some of the new settings bother you. |
|
1112 | if some of the new settings bother you. | |
1112 |
|
1113 | |||
1113 | """ |
|
1114 | """ | |
1114 | else: |
|
1115 | else: | |
1115 | print """ |
|
1116 | print """ | |
1116 | Successful upgrade! |
|
1117 | Successful upgrade! | |
1117 |
|
1118 | |||
1118 | All files in your directory: |
|
1119 | All files in your directory: | |
1119 | %(ipythondir)s |
|
1120 | %(ipythondir)s | |
1120 | which would have been overwritten by the upgrade were backed up with a .old |
|
1121 | which would have been overwritten by the upgrade were backed up with a .old | |
1121 | extension. If you had made particular customizations in those files you may |
|
1122 | extension. If you had made particular customizations in those files you may | |
1122 | want to merge them back into the new files.""" % locals() |
|
1123 | want to merge them back into the new files.""" % locals() | |
1123 | wait() |
|
1124 | wait() | |
1124 | os.chdir(cwd) |
|
1125 | os.chdir(cwd) | |
1125 | # end user_setup() |
|
1126 | # end user_setup() | |
1126 |
|
1127 | |||
1127 | def atexit_operations(self): |
|
1128 | def atexit_operations(self): | |
1128 | """This will be executed at the time of exit. |
|
1129 | """This will be executed at the time of exit. | |
1129 |
|
1130 | |||
1130 | Saving of persistent data should be performed here. """ |
|
1131 | Saving of persistent data should be performed here. """ | |
1131 |
|
1132 | |||
1132 | #print '*** IPython exit cleanup ***' # dbg |
|
1133 | #print '*** IPython exit cleanup ***' # dbg | |
1133 | # input history |
|
1134 | # input history | |
1134 | self.savehist() |
|
1135 | self.savehist() | |
1135 |
|
1136 | |||
1136 | # Cleanup all tempfiles left around |
|
1137 | # Cleanup all tempfiles left around | |
1137 | for tfile in self.tempfiles: |
|
1138 | for tfile in self.tempfiles: | |
1138 | try: |
|
1139 | try: | |
1139 | os.unlink(tfile) |
|
1140 | os.unlink(tfile) | |
1140 | except OSError: |
|
1141 | except OSError: | |
1141 | pass |
|
1142 | pass | |
1142 |
|
1143 | |||
1143 | # save the "persistent data" catch-all dictionary |
|
1144 | # save the "persistent data" catch-all dictionary | |
1144 | try: |
|
1145 | try: | |
1145 | pickle.dump(self.persist, open(self.persist_fname,"w")) |
|
1146 | pickle.dump(self.persist, open(self.persist_fname,"w")) | |
1146 | except: |
|
1147 | except: | |
1147 | print "*** ERROR *** persistent data saving failed." |
|
1148 | print "*** ERROR *** persistent data saving failed." | |
1148 |
|
1149 | |||
1149 | def savehist(self): |
|
1150 | def savehist(self): | |
1150 | """Save input history to a file (via readline library).""" |
|
1151 | """Save input history to a file (via readline library).""" | |
1151 | try: |
|
1152 | try: | |
1152 | self.readline.write_history_file(self.histfile) |
|
1153 | self.readline.write_history_file(self.histfile) | |
1153 | except: |
|
1154 | except: | |
1154 | print 'Unable to save IPython command history to file: ' + \ |
|
1155 | print 'Unable to save IPython command history to file: ' + \ | |
1155 | `self.histfile` |
|
1156 | `self.histfile` | |
1156 |
|
1157 | |||
1157 | def pre_readline(self): |
|
1158 | def pre_readline(self): | |
1158 | """readline hook to be used at the start of each line. |
|
1159 | """readline hook to be used at the start of each line. | |
1159 |
|
1160 | |||
1160 | Currently it handles auto-indent only.""" |
|
1161 | Currently it handles auto-indent only.""" | |
1161 |
|
1162 | |||
1162 | #debugx('self.indent_current_nsp','pre_readline:') |
|
1163 | #debugx('self.indent_current_nsp','pre_readline:') | |
1163 | self.readline.insert_text(self.indent_current_str()) |
|
1164 | self.readline.insert_text(self.indent_current_str()) | |
1164 |
|
1165 | |||
1165 | def init_readline(self): |
|
1166 | def init_readline(self): | |
1166 | """Command history completion/saving/reloading.""" |
|
1167 | """Command history completion/saving/reloading.""" | |
1167 | try: |
|
1168 | try: | |
1168 | import readline |
|
1169 | import readline | |
1169 | except ImportError: |
|
1170 | except ImportError: | |
1170 | self.has_readline = 0 |
|
1171 | self.has_readline = 0 | |
1171 | self.readline = None |
|
1172 | self.readline = None | |
1172 | # no point in bugging windows users with this every time: |
|
1173 | # no point in bugging windows users with this every time: | |
1173 | if os.name == 'posix': |
|
1174 | if os.name == 'posix': | |
1174 | warn('Readline services not available on this platform.') |
|
1175 | warn('Readline services not available on this platform.') | |
1175 | else: |
|
1176 | else: | |
1176 | import atexit |
|
1177 | import atexit | |
1177 | from IPython.completer import IPCompleter |
|
1178 | from IPython.completer import IPCompleter | |
1178 | self.Completer = IPCompleter(self, |
|
1179 | self.Completer = IPCompleter(self, | |
1179 | self.user_ns, |
|
1180 | self.user_ns, | |
1180 | self.user_global_ns, |
|
1181 | self.user_global_ns, | |
1181 | self.rc.readline_omit__names, |
|
1182 | self.rc.readline_omit__names, | |
1182 | self.alias_table) |
|
1183 | self.alias_table) | |
1183 |
|
1184 | |||
1184 | # Platform-specific configuration |
|
1185 | # Platform-specific configuration | |
1185 | if os.name == 'nt': |
|
1186 | if os.name == 'nt': | |
1186 | self.readline_startup_hook = readline.set_pre_input_hook |
|
1187 | self.readline_startup_hook = readline.set_pre_input_hook | |
1187 | else: |
|
1188 | else: | |
1188 | self.readline_startup_hook = readline.set_startup_hook |
|
1189 | self.readline_startup_hook = readline.set_startup_hook | |
1189 |
|
1190 | |||
1190 | # Load user's initrc file (readline config) |
|
1191 | # Load user's initrc file (readline config) | |
1191 | inputrc_name = os.environ.get('INPUTRC') |
|
1192 | inputrc_name = os.environ.get('INPUTRC') | |
1192 | if inputrc_name is None: |
|
1193 | if inputrc_name is None: | |
1193 | home_dir = get_home_dir() |
|
1194 | home_dir = get_home_dir() | |
1194 | if home_dir is not None: |
|
1195 | if home_dir is not None: | |
1195 | inputrc_name = os.path.join(home_dir,'.inputrc') |
|
1196 | inputrc_name = os.path.join(home_dir,'.inputrc') | |
1196 | if os.path.isfile(inputrc_name): |
|
1197 | if os.path.isfile(inputrc_name): | |
1197 | try: |
|
1198 | try: | |
1198 | readline.read_init_file(inputrc_name) |
|
1199 | readline.read_init_file(inputrc_name) | |
1199 | except: |
|
1200 | except: | |
1200 | warn('Problems reading readline initialization file <%s>' |
|
1201 | warn('Problems reading readline initialization file <%s>' | |
1201 | % inputrc_name) |
|
1202 | % inputrc_name) | |
1202 |
|
1203 | |||
1203 | self.has_readline = 1 |
|
1204 | self.has_readline = 1 | |
1204 | self.readline = readline |
|
1205 | self.readline = readline | |
1205 | # save this in sys so embedded copies can restore it properly |
|
1206 | # save this in sys so embedded copies can restore it properly | |
1206 | sys.ipcompleter = self.Completer.complete |
|
1207 | sys.ipcompleter = self.Completer.complete | |
1207 | readline.set_completer(self.Completer.complete) |
|
1208 | readline.set_completer(self.Completer.complete) | |
1208 |
|
1209 | |||
1209 | # Configure readline according to user's prefs |
|
1210 | # Configure readline according to user's prefs | |
1210 | for rlcommand in self.rc.readline_parse_and_bind: |
|
1211 | for rlcommand in self.rc.readline_parse_and_bind: | |
1211 | readline.parse_and_bind(rlcommand) |
|
1212 | readline.parse_and_bind(rlcommand) | |
1212 |
|
1213 | |||
1213 | # remove some chars from the delimiters list |
|
1214 | # remove some chars from the delimiters list | |
1214 | delims = readline.get_completer_delims() |
|
1215 | delims = readline.get_completer_delims() | |
1215 | delims = delims.translate(string._idmap, |
|
1216 | delims = delims.translate(string._idmap, | |
1216 | self.rc.readline_remove_delims) |
|
1217 | self.rc.readline_remove_delims) | |
1217 | readline.set_completer_delims(delims) |
|
1218 | readline.set_completer_delims(delims) | |
1218 | # otherwise we end up with a monster history after a while: |
|
1219 | # otherwise we end up with a monster history after a while: | |
1219 | readline.set_history_length(1000) |
|
1220 | readline.set_history_length(1000) | |
1220 | try: |
|
1221 | try: | |
1221 | #print '*** Reading readline history' # dbg |
|
1222 | #print '*** Reading readline history' # dbg | |
1222 | readline.read_history_file(self.histfile) |
|
1223 | readline.read_history_file(self.histfile) | |
1223 | except IOError: |
|
1224 | except IOError: | |
1224 | pass # It doesn't exist yet. |
|
1225 | pass # It doesn't exist yet. | |
1225 |
|
1226 | |||
1226 | atexit.register(self.atexit_operations) |
|
1227 | atexit.register(self.atexit_operations) | |
1227 | del atexit |
|
1228 | del atexit | |
1228 |
|
1229 | |||
1229 | # Configure auto-indent for all platforms |
|
1230 | # Configure auto-indent for all platforms | |
1230 | self.set_autoindent(self.rc.autoindent) |
|
1231 | self.set_autoindent(self.rc.autoindent) | |
1231 |
|
1232 | |||
1232 | def _should_recompile(self,e): |
|
1233 | def _should_recompile(self,e): | |
1233 | """Utility routine for edit_syntax_error""" |
|
1234 | """Utility routine for edit_syntax_error""" | |
1234 |
|
1235 | |||
1235 | if e.filename in ('<ipython console>','<input>','<string>', |
|
1236 | if e.filename in ('<ipython console>','<input>','<string>', | |
1236 | '<console>',None): |
|
1237 | '<console>',None): | |
1237 |
|
1238 | |||
1238 | return False |
|
1239 | return False | |
1239 | try: |
|
1240 | try: | |
1240 | if not ask_yes_no('Return to editor to correct syntax error? ' |
|
1241 | if not ask_yes_no('Return to editor to correct syntax error? ' | |
1241 | '[Y/n] ','y'): |
|
1242 | '[Y/n] ','y'): | |
1242 | return False |
|
1243 | return False | |
1243 | except EOFError: |
|
1244 | except EOFError: | |
1244 | return False |
|
1245 | return False | |
1245 |
|
1246 | |||
1246 | def int0(x): |
|
1247 | def int0(x): | |
1247 | try: |
|
1248 | try: | |
1248 | return int(x) |
|
1249 | return int(x) | |
1249 | except TypeError: |
|
1250 | except TypeError: | |
1250 | return 0 |
|
1251 | return 0 | |
1251 | # always pass integer line and offset values to editor hook |
|
1252 | # always pass integer line and offset values to editor hook | |
1252 | self.hooks.fix_error_editor(e.filename, |
|
1253 | self.hooks.fix_error_editor(e.filename, | |
1253 | int0(e.lineno),int0(e.offset),e.msg) |
|
1254 | int0(e.lineno),int0(e.offset),e.msg) | |
1254 | return True |
|
1255 | return True | |
1255 |
|
1256 | |||
1256 | def edit_syntax_error(self): |
|
1257 | def edit_syntax_error(self): | |
1257 | """The bottom half of the syntax error handler called in the main loop. |
|
1258 | """The bottom half of the syntax error handler called in the main loop. | |
1258 |
|
1259 | |||
1259 | Loop until syntax error is fixed or user cancels. |
|
1260 | Loop until syntax error is fixed or user cancels. | |
1260 | """ |
|
1261 | """ | |
1261 |
|
1262 | |||
1262 | while self.SyntaxTB.last_syntax_error: |
|
1263 | while self.SyntaxTB.last_syntax_error: | |
1263 | # copy and clear last_syntax_error |
|
1264 | # copy and clear last_syntax_error | |
1264 | err = self.SyntaxTB.clear_err_state() |
|
1265 | err = self.SyntaxTB.clear_err_state() | |
1265 | if not self._should_recompile(err): |
|
1266 | if not self._should_recompile(err): | |
1266 | return |
|
1267 | return | |
1267 | try: |
|
1268 | try: | |
1268 | # may set last_syntax_error again if a SyntaxError is raised |
|
1269 | # may set last_syntax_error again if a SyntaxError is raised | |
1269 | self.safe_execfile(err.filename,self.shell.user_ns) |
|
1270 | self.safe_execfile(err.filename,self.shell.user_ns) | |
1270 | except: |
|
1271 | except: | |
1271 | self.showtraceback() |
|
1272 | self.showtraceback() | |
1272 | else: |
|
1273 | else: | |
1273 | f = file(err.filename) |
|
1274 | f = file(err.filename) | |
1274 | try: |
|
1275 | try: | |
1275 | sys.displayhook(f.read()) |
|
1276 | sys.displayhook(f.read()) | |
1276 | finally: |
|
1277 | finally: | |
1277 | f.close() |
|
1278 | f.close() | |
1278 |
|
1279 | |||
1279 | def showsyntaxerror(self, filename=None): |
|
1280 | def showsyntaxerror(self, filename=None): | |
1280 | """Display the syntax error that just occurred. |
|
1281 | """Display the syntax error that just occurred. | |
1281 |
|
1282 | |||
1282 | This doesn't display a stack trace because there isn't one. |
|
1283 | This doesn't display a stack trace because there isn't one. | |
1283 |
|
1284 | |||
1284 | If a filename is given, it is stuffed in the exception instead |
|
1285 | If a filename is given, it is stuffed in the exception instead | |
1285 | of what was there before (because Python's parser always uses |
|
1286 | of what was there before (because Python's parser always uses | |
1286 | "<string>" when reading from a string). |
|
1287 | "<string>" when reading from a string). | |
1287 | """ |
|
1288 | """ | |
1288 | etype, value, last_traceback = sys.exc_info() |
|
1289 | etype, value, last_traceback = sys.exc_info() | |
1289 | if filename and etype is SyntaxError: |
|
1290 | if filename and etype is SyntaxError: | |
1290 | # Work hard to stuff the correct filename in the exception |
|
1291 | # Work hard to stuff the correct filename in the exception | |
1291 | try: |
|
1292 | try: | |
1292 | msg, (dummy_filename, lineno, offset, line) = value |
|
1293 | msg, (dummy_filename, lineno, offset, line) = value | |
1293 | except: |
|
1294 | except: | |
1294 | # Not the format we expect; leave it alone |
|
1295 | # Not the format we expect; leave it alone | |
1295 | pass |
|
1296 | pass | |
1296 | else: |
|
1297 | else: | |
1297 | # Stuff in the right filename |
|
1298 | # Stuff in the right filename | |
1298 | try: |
|
1299 | try: | |
1299 | # Assume SyntaxError is a class exception |
|
1300 | # Assume SyntaxError is a class exception | |
1300 | value = SyntaxError(msg, (filename, lineno, offset, line)) |
|
1301 | value = SyntaxError(msg, (filename, lineno, offset, line)) | |
1301 | except: |
|
1302 | except: | |
1302 | # If that failed, assume SyntaxError is a string |
|
1303 | # If that failed, assume SyntaxError is a string | |
1303 | value = msg, (filename, lineno, offset, line) |
|
1304 | value = msg, (filename, lineno, offset, line) | |
1304 | self.SyntaxTB(etype,value,[]) |
|
1305 | self.SyntaxTB(etype,value,[]) | |
1305 |
|
1306 | |||
1306 | def debugger(self): |
|
1307 | def debugger(self): | |
1307 | """Call the pdb debugger.""" |
|
1308 | """Call the pdb debugger.""" | |
1308 |
|
1309 | |||
1309 | if not self.rc.pdb: |
|
1310 | if not self.rc.pdb: | |
1310 | return |
|
1311 | return | |
1311 | pdb.pm() |
|
1312 | pdb.pm() | |
1312 |
|
1313 | |||
1313 | def showtraceback(self,exc_tuple = None,filename=None): |
|
1314 | def showtraceback(self,exc_tuple = None,filename=None): | |
1314 | """Display the exception that just occurred.""" |
|
1315 | """Display the exception that just occurred.""" | |
1315 |
|
1316 | |||
1316 | # Though this won't be called by syntax errors in the input line, |
|
1317 | # Though this won't be called by syntax errors in the input line, | |
1317 | # there may be SyntaxError cases whith imported code. |
|
1318 | # there may be SyntaxError cases whith imported code. | |
1318 | if exc_tuple is None: |
|
1319 | if exc_tuple is None: | |
1319 | type, value, tb = sys.exc_info() |
|
1320 | type, value, tb = sys.exc_info() | |
1320 | else: |
|
1321 | else: | |
1321 | type, value, tb = exc_tuple |
|
1322 | type, value, tb = exc_tuple | |
1322 | if type is SyntaxError: |
|
1323 | if type is SyntaxError: | |
1323 | self.showsyntaxerror(filename) |
|
1324 | self.showsyntaxerror(filename) | |
1324 | else: |
|
1325 | else: | |
1325 | self.InteractiveTB() |
|
1326 | self.InteractiveTB() | |
1326 | if self.InteractiveTB.call_pdb and self.has_readline: |
|
1327 | if self.InteractiveTB.call_pdb and self.has_readline: | |
1327 | # pdb mucks up readline, fix it back |
|
1328 | # pdb mucks up readline, fix it back | |
1328 | self.readline.set_completer(self.Completer.complete) |
|
1329 | self.readline.set_completer(self.Completer.complete) | |
1329 |
|
1330 | |||
1330 | def mainloop(self,banner=None): |
|
1331 | def mainloop(self,banner=None): | |
1331 | """Creates the local namespace and starts the mainloop. |
|
1332 | """Creates the local namespace and starts the mainloop. | |
1332 |
|
1333 | |||
1333 | If an optional banner argument is given, it will override the |
|
1334 | If an optional banner argument is given, it will override the | |
1334 | internally created default banner.""" |
|
1335 | internally created default banner.""" | |
1335 |
|
1336 | |||
1336 | if self.rc.c: # Emulate Python's -c option |
|
1337 | if self.rc.c: # Emulate Python's -c option | |
1337 | self.exec_init_cmd() |
|
1338 | self.exec_init_cmd() | |
1338 | if banner is None: |
|
1339 | if banner is None: | |
1339 | if self.rc.banner: |
|
1340 | if self.rc.banner: | |
1340 | banner = self.BANNER+self.banner2 |
|
1341 | banner = self.BANNER+self.banner2 | |
1341 | else: |
|
1342 | else: | |
1342 | banner = '' |
|
1343 | banner = '' | |
1343 | self.interact(banner) |
|
1344 | self.interact(banner) | |
1344 |
|
1345 | |||
1345 | def exec_init_cmd(self): |
|
1346 | def exec_init_cmd(self): | |
1346 | """Execute a command given at the command line. |
|
1347 | """Execute a command given at the command line. | |
1347 |
|
1348 | |||
1348 | This emulates Python's -c option.""" |
|
1349 | This emulates Python's -c option.""" | |
1349 |
|
1350 | |||
1350 | sys.argv = ['-c'] |
|
1351 | sys.argv = ['-c'] | |
1351 | self.push(self.rc.c) |
|
1352 | self.push(self.rc.c) | |
1352 |
|
1353 | |||
1353 | def embed_mainloop(self,header='',local_ns=None,global_ns=None,stack_depth=0): |
|
1354 | def embed_mainloop(self,header='',local_ns=None,global_ns=None,stack_depth=0): | |
1354 | """Embeds IPython into a running python program. |
|
1355 | """Embeds IPython into a running python program. | |
1355 |
|
1356 | |||
1356 | Input: |
|
1357 | Input: | |
1357 |
|
1358 | |||
1358 | - header: An optional header message can be specified. |
|
1359 | - header: An optional header message can be specified. | |
1359 |
|
1360 | |||
1360 | - local_ns, global_ns: working namespaces. If given as None, the |
|
1361 | - local_ns, global_ns: working namespaces. If given as None, the | |
1361 | IPython-initialized one is updated with __main__.__dict__, so that |
|
1362 | IPython-initialized one is updated with __main__.__dict__, so that | |
1362 | program variables become visible but user-specific configuration |
|
1363 | program variables become visible but user-specific configuration | |
1363 | remains possible. |
|
1364 | remains possible. | |
1364 |
|
1365 | |||
1365 | - stack_depth: specifies how many levels in the stack to go to |
|
1366 | - stack_depth: specifies how many levels in the stack to go to | |
1366 | looking for namespaces (when local_ns and global_ns are None). This |
|
1367 | looking for namespaces (when local_ns and global_ns are None). This | |
1367 | allows an intermediate caller to make sure that this function gets |
|
1368 | allows an intermediate caller to make sure that this function gets | |
1368 | the namespace from the intended level in the stack. By default (0) |
|
1369 | the namespace from the intended level in the stack. By default (0) | |
1369 | it will get its locals and globals from the immediate caller. |
|
1370 | it will get its locals and globals from the immediate caller. | |
1370 |
|
1371 | |||
1371 | Warning: it's possible to use this in a program which is being run by |
|
1372 | Warning: it's possible to use this in a program which is being run by | |
1372 | IPython itself (via %run), but some funny things will happen (a few |
|
1373 | IPython itself (via %run), but some funny things will happen (a few | |
1373 | globals get overwritten). In the future this will be cleaned up, as |
|
1374 | globals get overwritten). In the future this will be cleaned up, as | |
1374 | there is no fundamental reason why it can't work perfectly.""" |
|
1375 | there is no fundamental reason why it can't work perfectly.""" | |
1375 |
|
1376 | |||
1376 | # Get locals and globals from caller |
|
1377 | # Get locals and globals from caller | |
1377 | if local_ns is None or global_ns is None: |
|
1378 | if local_ns is None or global_ns is None: | |
1378 | call_frame = sys._getframe(stack_depth).f_back |
|
1379 | call_frame = sys._getframe(stack_depth).f_back | |
1379 |
|
1380 | |||
1380 | if local_ns is None: |
|
1381 | if local_ns is None: | |
1381 | local_ns = call_frame.f_locals |
|
1382 | local_ns = call_frame.f_locals | |
1382 | if global_ns is None: |
|
1383 | if global_ns is None: | |
1383 | global_ns = call_frame.f_globals |
|
1384 | global_ns = call_frame.f_globals | |
1384 |
|
1385 | |||
1385 | # Update namespaces and fire up interpreter |
|
1386 | # Update namespaces and fire up interpreter | |
1386 |
|
1387 | |||
1387 | # The global one is easy, we can just throw it in |
|
1388 | # The global one is easy, we can just throw it in | |
1388 | self.user_global_ns = global_ns |
|
1389 | self.user_global_ns = global_ns | |
1389 |
|
1390 | |||
1390 | # but the user/local one is tricky: ipython needs it to store internal |
|
1391 | # but the user/local one is tricky: ipython needs it to store internal | |
1391 | # data, but we also need the locals. We'll copy locals in the user |
|
1392 | # data, but we also need the locals. We'll copy locals in the user | |
1392 | # one, but will track what got copied so we can delete them at exit. |
|
1393 | # one, but will track what got copied so we can delete them at exit. | |
1393 | # This is so that a later embedded call doesn't see locals from a |
|
1394 | # This is so that a later embedded call doesn't see locals from a | |
1394 | # previous call (which most likely existed in a separate scope). |
|
1395 | # previous call (which most likely existed in a separate scope). | |
1395 | local_varnames = local_ns.keys() |
|
1396 | local_varnames = local_ns.keys() | |
1396 | self.user_ns.update(local_ns) |
|
1397 | self.user_ns.update(local_ns) | |
1397 |
|
1398 | |||
1398 | # Patch for global embedding to make sure that things don't overwrite |
|
1399 | # Patch for global embedding to make sure that things don't overwrite | |
1399 | # user globals accidentally. Thanks to Richard <rxe@renre-europe.com> |
|
1400 | # user globals accidentally. Thanks to Richard <rxe@renre-europe.com> | |
1400 | # FIXME. Test this a bit more carefully (the if.. is new) |
|
1401 | # FIXME. Test this a bit more carefully (the if.. is new) | |
1401 | if local_ns is None and global_ns is None: |
|
1402 | if local_ns is None and global_ns is None: | |
1402 | self.user_global_ns.update(__main__.__dict__) |
|
1403 | self.user_global_ns.update(__main__.__dict__) | |
1403 |
|
1404 | |||
1404 | # make sure the tab-completer has the correct frame information, so it |
|
1405 | # make sure the tab-completer has the correct frame information, so it | |
1405 | # actually completes using the frame's locals/globals |
|
1406 | # actually completes using the frame's locals/globals | |
1406 | self.set_completer_frame() |
|
1407 | self.set_completer_frame() | |
1407 |
|
1408 | |||
1408 | # before activating the interactive mode, we need to make sure that |
|
1409 | # before activating the interactive mode, we need to make sure that | |
1409 | # all names in the builtin namespace needed by ipython point to |
|
1410 | # all names in the builtin namespace needed by ipython point to | |
1410 | # ourselves, and not to other instances. |
|
1411 | # ourselves, and not to other instances. | |
1411 | self.add_builtins() |
|
1412 | self.add_builtins() | |
1412 |
|
1413 | |||
1413 | self.interact(header) |
|
1414 | self.interact(header) | |
1414 |
|
1415 | |||
1415 | # now, purge out the user namespace from anything we might have added |
|
1416 | # now, purge out the user namespace from anything we might have added | |
1416 | # from the caller's local namespace |
|
1417 | # from the caller's local namespace | |
1417 | delvar = self.user_ns.pop |
|
1418 | delvar = self.user_ns.pop | |
1418 | for var in local_varnames: |
|
1419 | for var in local_varnames: | |
1419 | delvar(var,None) |
|
1420 | delvar(var,None) | |
1420 | # and clean builtins we may have overridden |
|
1421 | # and clean builtins we may have overridden | |
1421 | self.clean_builtins() |
|
1422 | self.clean_builtins() | |
1422 |
|
1423 | |||
1423 | def interact(self, banner=None): |
|
1424 | def interact(self, banner=None): | |
1424 | """Closely emulate the interactive Python console. |
|
1425 | """Closely emulate the interactive Python console. | |
1425 |
|
1426 | |||
1426 | The optional banner argument specify the banner to print |
|
1427 | The optional banner argument specify the banner to print | |
1427 | before the first interaction; by default it prints a banner |
|
1428 | before the first interaction; by default it prints a banner | |
1428 | similar to the one printed by the real Python interpreter, |
|
1429 | similar to the one printed by the real Python interpreter, | |
1429 | followed by the current class name in parentheses (so as not |
|
1430 | followed by the current class name in parentheses (so as not | |
1430 | to confuse this with the real interpreter -- since it's so |
|
1431 | to confuse this with the real interpreter -- since it's so | |
1431 | close!). |
|
1432 | close!). | |
1432 |
|
1433 | |||
1433 | """ |
|
1434 | """ | |
1434 | cprt = 'Type "copyright", "credits" or "license" for more information.' |
|
1435 | cprt = 'Type "copyright", "credits" or "license" for more information.' | |
1435 | if banner is None: |
|
1436 | if banner is None: | |
1436 | self.write("Python %s on %s\n%s\n(%s)\n" % |
|
1437 | self.write("Python %s on %s\n%s\n(%s)\n" % | |
1437 | (sys.version, sys.platform, cprt, |
|
1438 | (sys.version, sys.platform, cprt, | |
1438 | self.__class__.__name__)) |
|
1439 | self.__class__.__name__)) | |
1439 | else: |
|
1440 | else: | |
1440 | self.write(banner) |
|
1441 | self.write(banner) | |
1441 |
|
1442 | |||
1442 | more = 0 |
|
1443 | more = 0 | |
1443 |
|
1444 | |||
1444 | # Mark activity in the builtins |
|
1445 | # Mark activity in the builtins | |
1445 | __builtin__.__dict__['__IPYTHON__active'] += 1 |
|
1446 | __builtin__.__dict__['__IPYTHON__active'] += 1 | |
1446 |
|
1447 | |||
1447 | # exit_now is set by a call to %Exit or %Quit |
|
1448 | # exit_now is set by a call to %Exit or %Quit | |
1448 | self.exit_now = False |
|
1449 | self.exit_now = False | |
1449 | while not self.exit_now: |
|
1450 | while not self.exit_now: | |
1450 |
|
1451 | |||
1451 | try: |
|
1452 | try: | |
1452 | if more: |
|
1453 | if more: | |
1453 | prompt = self.outputcache.prompt2 |
|
1454 | prompt = self.outputcache.prompt2 | |
1454 | if self.autoindent: |
|
1455 | if self.autoindent: | |
1455 | self.readline_startup_hook(self.pre_readline) |
|
1456 | self.readline_startup_hook(self.pre_readline) | |
1456 | else: |
|
1457 | else: | |
1457 | prompt = self.outputcache.prompt1 |
|
1458 | prompt = self.outputcache.prompt1 | |
1458 | try: |
|
1459 | try: | |
1459 | line = self.raw_input(prompt,more) |
|
1460 | line = self.raw_input(prompt,more) | |
1460 | if self.autoindent: |
|
1461 | if self.autoindent: | |
1461 | self.readline_startup_hook(None) |
|
1462 | self.readline_startup_hook(None) | |
1462 | except EOFError: |
|
1463 | except EOFError: | |
1463 | if self.autoindent: |
|
1464 | if self.autoindent: | |
1464 | self.readline_startup_hook(None) |
|
1465 | self.readline_startup_hook(None) | |
1465 | self.write("\n") |
|
1466 | self.write("\n") | |
1466 | self.exit() |
|
1467 | self.exit() | |
1467 | except: |
|
1468 | except: | |
1468 | # exceptions here are VERY RARE, but they can be triggered |
|
1469 | # exceptions here are VERY RARE, but they can be triggered | |
1469 | # asynchronously by signal handlers, for example. |
|
1470 | # asynchronously by signal handlers, for example. | |
1470 | self.showtraceback() |
|
1471 | self.showtraceback() | |
1471 | else: |
|
1472 | else: | |
1472 | more = self.push(line) |
|
1473 | more = self.push(line) | |
1473 |
|
1474 | |||
1474 | if (self.SyntaxTB.last_syntax_error and |
|
1475 | if (self.SyntaxTB.last_syntax_error and | |
1475 | self.rc.autoedit_syntax): |
|
1476 | self.rc.autoedit_syntax): | |
1476 | self.edit_syntax_error() |
|
1477 | self.edit_syntax_error() | |
1477 |
|
1478 | |||
1478 | except KeyboardInterrupt: |
|
1479 | except KeyboardInterrupt: | |
1479 | self.write("\nKeyboardInterrupt\n") |
|
1480 | self.write("\nKeyboardInterrupt\n") | |
1480 | self.resetbuffer() |
|
1481 | self.resetbuffer() | |
1481 | more = 0 |
|
1482 | more = 0 | |
1482 | # keep cache in sync with the prompt counter: |
|
1483 | # keep cache in sync with the prompt counter: | |
1483 | self.outputcache.prompt_count -= 1 |
|
1484 | self.outputcache.prompt_count -= 1 | |
1484 |
|
1485 | |||
1485 | if self.autoindent: |
|
1486 | if self.autoindent: | |
1486 | self.indent_current_nsp = 0 |
|
1487 | self.indent_current_nsp = 0 | |
1487 |
|
1488 | |||
1488 | except bdb.BdbQuit: |
|
1489 | except bdb.BdbQuit: | |
1489 | warn("The Python debugger has exited with a BdbQuit exception.\n" |
|
1490 | warn("The Python debugger has exited with a BdbQuit exception.\n" | |
1490 | "Because of how pdb handles the stack, it is impossible\n" |
|
1491 | "Because of how pdb handles the stack, it is impossible\n" | |
1491 | "for IPython to properly format this particular exception.\n" |
|
1492 | "for IPython to properly format this particular exception.\n" | |
1492 | "IPython will resume normal operation.") |
|
1493 | "IPython will resume normal operation.") | |
1493 |
|
1494 | |||
1494 | # We are off again... |
|
1495 | # We are off again... | |
1495 | __builtin__.__dict__['__IPYTHON__active'] -= 1 |
|
1496 | __builtin__.__dict__['__IPYTHON__active'] -= 1 | |
1496 |
|
1497 | |||
1497 | def excepthook(self, type, value, tb): |
|
1498 | def excepthook(self, type, value, tb): | |
1498 | """One more defense for GUI apps that call sys.excepthook. |
|
1499 | """One more defense for GUI apps that call sys.excepthook. | |
1499 |
|
1500 | |||
1500 | GUI frameworks like wxPython trap exceptions and call |
|
1501 | GUI frameworks like wxPython trap exceptions and call | |
1501 | sys.excepthook themselves. I guess this is a feature that |
|
1502 | sys.excepthook themselves. I guess this is a feature that | |
1502 | enables them to keep running after exceptions that would |
|
1503 | enables them to keep running after exceptions that would | |
1503 | otherwise kill their mainloop. This is a bother for IPython |
|
1504 | otherwise kill their mainloop. This is a bother for IPython | |
1504 | which excepts to catch all of the program exceptions with a try: |
|
1505 | which excepts to catch all of the program exceptions with a try: | |
1505 | except: statement. |
|
1506 | except: statement. | |
1506 |
|
1507 | |||
1507 | Normally, IPython sets sys.excepthook to a CrashHandler instance, so if |
|
1508 | Normally, IPython sets sys.excepthook to a CrashHandler instance, so if | |
1508 | any app directly invokes sys.excepthook, it will look to the user like |
|
1509 | any app directly invokes sys.excepthook, it will look to the user like | |
1509 | IPython crashed. In order to work around this, we can disable the |
|
1510 | IPython crashed. In order to work around this, we can disable the | |
1510 | CrashHandler and replace it with this excepthook instead, which prints a |
|
1511 | CrashHandler and replace it with this excepthook instead, which prints a | |
1511 | regular traceback using our InteractiveTB. In this fashion, apps which |
|
1512 | regular traceback using our InteractiveTB. In this fashion, apps which | |
1512 | call sys.excepthook will generate a regular-looking exception from |
|
1513 | call sys.excepthook will generate a regular-looking exception from | |
1513 | IPython, and the CrashHandler will only be triggered by real IPython |
|
1514 | IPython, and the CrashHandler will only be triggered by real IPython | |
1514 | crashes. |
|
1515 | crashes. | |
1515 |
|
1516 | |||
1516 | This hook should be used sparingly, only in places which are not likely |
|
1517 | This hook should be used sparingly, only in places which are not likely | |
1517 | to be true IPython errors. |
|
1518 | to be true IPython errors. | |
1518 | """ |
|
1519 | """ | |
1519 |
|
1520 | |||
1520 | self.InteractiveTB(type, value, tb, tb_offset=0) |
|
1521 | self.InteractiveTB(type, value, tb, tb_offset=0) | |
1521 | if self.InteractiveTB.call_pdb and self.has_readline: |
|
1522 | if self.InteractiveTB.call_pdb and self.has_readline: | |
1522 | self.readline.set_completer(self.Completer.complete) |
|
1523 | self.readline.set_completer(self.Completer.complete) | |
1523 |
|
1524 | |||
1524 | def call_alias(self,alias,rest=''): |
|
1525 | def call_alias(self,alias,rest=''): | |
1525 | """Call an alias given its name and the rest of the line. |
|
1526 | """Call an alias given its name and the rest of the line. | |
1526 |
|
1527 | |||
1527 | This function MUST be given a proper alias, because it doesn't make |
|
1528 | This function MUST be given a proper alias, because it doesn't make | |
1528 | any checks when looking up into the alias table. The caller is |
|
1529 | any checks when looking up into the alias table. The caller is | |
1529 | responsible for invoking it only with a valid alias.""" |
|
1530 | responsible for invoking it only with a valid alias.""" | |
1530 |
|
1531 | |||
1531 | #print 'ALIAS: <%s>+<%s>' % (alias,rest) # dbg |
|
1532 | #print 'ALIAS: <%s>+<%s>' % (alias,rest) # dbg | |
1532 | nargs,cmd = self.alias_table[alias] |
|
1533 | nargs,cmd = self.alias_table[alias] | |
1533 | # Expand the %l special to be the user's input line |
|
1534 | # Expand the %l special to be the user's input line | |
1534 | if cmd.find('%l') >= 0: |
|
1535 | if cmd.find('%l') >= 0: | |
1535 | cmd = cmd.replace('%l',rest) |
|
1536 | cmd = cmd.replace('%l',rest) | |
1536 | rest = '' |
|
1537 | rest = '' | |
1537 | if nargs==0: |
|
1538 | if nargs==0: | |
1538 | # Simple, argument-less aliases |
|
1539 | # Simple, argument-less aliases | |
1539 | cmd = '%s %s' % (cmd,rest) |
|
1540 | cmd = '%s %s' % (cmd,rest) | |
1540 | else: |
|
1541 | else: | |
1541 | # Handle aliases with positional arguments |
|
1542 | # Handle aliases with positional arguments | |
1542 | args = rest.split(None,nargs) |
|
1543 | args = rest.split(None,nargs) | |
1543 | if len(args)< nargs: |
|
1544 | if len(args)< nargs: | |
1544 | error('Alias <%s> requires %s arguments, %s given.' % |
|
1545 | error('Alias <%s> requires %s arguments, %s given.' % | |
1545 | (alias,nargs,len(args))) |
|
1546 | (alias,nargs,len(args))) | |
1546 | return |
|
1547 | return | |
1547 | cmd = '%s %s' % (cmd % tuple(args[:nargs]),' '.join(args[nargs:])) |
|
1548 | cmd = '%s %s' % (cmd % tuple(args[:nargs]),' '.join(args[nargs:])) | |
1548 | # Now call the macro, evaluating in the user's namespace |
|
1549 | # Now call the macro, evaluating in the user's namespace | |
1549 | try: |
|
1550 | try: | |
1550 | self.system(cmd) |
|
1551 | self.system(cmd) | |
1551 | except: |
|
1552 | except: | |
1552 | self.showtraceback() |
|
1553 | self.showtraceback() | |
1553 |
|
1554 | |||
1554 | def indent_current_str(self): |
|
1555 | def indent_current_str(self): | |
1555 | """return the current level of indentation as a string""" |
|
1556 | """return the current level of indentation as a string""" | |
1556 | return self.indent_current_nsp * ' ' |
|
1557 | return self.indent_current_nsp * ' ' | |
1557 |
|
1558 | |||
1558 | def autoindent_update(self,line): |
|
1559 | def autoindent_update(self,line): | |
1559 | """Keep track of the indent level.""" |
|
1560 | """Keep track of the indent level.""" | |
1560 |
|
1561 | |||
1561 | #debugx('line') |
|
1562 | #debugx('line') | |
1562 | #debugx('self.indent_current_nsp') |
|
1563 | #debugx('self.indent_current_nsp') | |
1563 | if self.autoindent: |
|
1564 | if self.autoindent: | |
1564 | if line: |
|
1565 | if line: | |
1565 | inisp = num_ini_spaces(line) |
|
1566 | inisp = num_ini_spaces(line) | |
1566 | if inisp < self.indent_current_nsp: |
|
1567 | if inisp < self.indent_current_nsp: | |
1567 | self.indent_current_nsp = inisp |
|
1568 | self.indent_current_nsp = inisp | |
1568 |
|
1569 | |||
1569 | if line[-1] == ':': |
|
1570 | if line[-1] == ':': | |
1570 | self.indent_current_nsp += 4 |
|
1571 | self.indent_current_nsp += 4 | |
1571 | elif dedent_re.match(line): |
|
1572 | elif dedent_re.match(line): | |
1572 | self.indent_current_nsp -= 4 |
|
1573 | self.indent_current_nsp -= 4 | |
1573 | else: |
|
1574 | else: | |
1574 | self.indent_current_nsp = 0 |
|
1575 | self.indent_current_nsp = 0 | |
1575 |
|
1576 | |||
1576 | def runlines(self,lines): |
|
1577 | def runlines(self,lines): | |
1577 | """Run a string of one or more lines of source. |
|
1578 | """Run a string of one or more lines of source. | |
1578 |
|
1579 | |||
1579 | This method is capable of running a string containing multiple source |
|
1580 | This method is capable of running a string containing multiple source | |
1580 | lines, as if they had been entered at the IPython prompt. Since it |
|
1581 | lines, as if they had been entered at the IPython prompt. Since it | |
1581 | exposes IPython's processing machinery, the given strings can contain |
|
1582 | exposes IPython's processing machinery, the given strings can contain | |
1582 | magic calls (%magic), special shell access (!cmd), etc.""" |
|
1583 | magic calls (%magic), special shell access (!cmd), etc.""" | |
1583 |
|
1584 | |||
1584 | # We must start with a clean buffer, in case this is run from an |
|
1585 | # We must start with a clean buffer, in case this is run from an | |
1585 | # interactive IPython session (via a magic, for example). |
|
1586 | # interactive IPython session (via a magic, for example). | |
1586 | self.resetbuffer() |
|
1587 | self.resetbuffer() | |
1587 | lines = lines.split('\n') |
|
1588 | lines = lines.split('\n') | |
1588 | more = 0 |
|
1589 | more = 0 | |
1589 | for line in lines: |
|
1590 | for line in lines: | |
1590 | # skip blank lines so we don't mess up the prompt counter, but do |
|
1591 | # skip blank lines so we don't mess up the prompt counter, but do | |
1591 | # NOT skip even a blank line if we are in a code block (more is |
|
1592 | # NOT skip even a blank line if we are in a code block (more is | |
1592 | # true) |
|
1593 | # true) | |
1593 | if line or more: |
|
1594 | if line or more: | |
1594 | more = self.push(self.prefilter(line,more)) |
|
1595 | more = self.push(self.prefilter(line,more)) | |
1595 | # IPython's runsource returns None if there was an error |
|
1596 | # IPython's runsource returns None if there was an error | |
1596 | # compiling the code. This allows us to stop processing right |
|
1597 | # compiling the code. This allows us to stop processing right | |
1597 | # away, so the user gets the error message at the right place. |
|
1598 | # away, so the user gets the error message at the right place. | |
1598 | if more is None: |
|
1599 | if more is None: | |
1599 | break |
|
1600 | break | |
1600 | # final newline in case the input didn't have it, so that the code |
|
1601 | # final newline in case the input didn't have it, so that the code | |
1601 | # actually does get executed |
|
1602 | # actually does get executed | |
1602 | if more: |
|
1603 | if more: | |
1603 | self.push('\n') |
|
1604 | self.push('\n') | |
1604 |
|
1605 | |||
1605 | def runsource(self, source, filename='<input>', symbol='single'): |
|
1606 | def runsource(self, source, filename='<input>', symbol='single'): | |
1606 | """Compile and run some source in the interpreter. |
|
1607 | """Compile and run some source in the interpreter. | |
1607 |
|
1608 | |||
1608 | Arguments are as for compile_command(). |
|
1609 | Arguments are as for compile_command(). | |
1609 |
|
1610 | |||
1610 | One several things can happen: |
|
1611 | One several things can happen: | |
1611 |
|
1612 | |||
1612 | 1) The input is incorrect; compile_command() raised an |
|
1613 | 1) The input is incorrect; compile_command() raised an | |
1613 | exception (SyntaxError or OverflowError). A syntax traceback |
|
1614 | exception (SyntaxError or OverflowError). A syntax traceback | |
1614 | will be printed by calling the showsyntaxerror() method. |
|
1615 | will be printed by calling the showsyntaxerror() method. | |
1615 |
|
1616 | |||
1616 | 2) The input is incomplete, and more input is required; |
|
1617 | 2) The input is incomplete, and more input is required; | |
1617 | compile_command() returned None. Nothing happens. |
|
1618 | compile_command() returned None. Nothing happens. | |
1618 |
|
1619 | |||
1619 | 3) The input is complete; compile_command() returned a code |
|
1620 | 3) The input is complete; compile_command() returned a code | |
1620 | object. The code is executed by calling self.runcode() (which |
|
1621 | object. The code is executed by calling self.runcode() (which | |
1621 | also handles run-time exceptions, except for SystemExit). |
|
1622 | also handles run-time exceptions, except for SystemExit). | |
1622 |
|
1623 | |||
1623 | The return value is: |
|
1624 | The return value is: | |
1624 |
|
1625 | |||
1625 | - True in case 2 |
|
1626 | - True in case 2 | |
1626 |
|
1627 | |||
1627 | - False in the other cases, unless an exception is raised, where |
|
1628 | - False in the other cases, unless an exception is raised, where | |
1628 | None is returned instead. This can be used by external callers to |
|
1629 | None is returned instead. This can be used by external callers to | |
1629 | know whether to continue feeding input or not. |
|
1630 | know whether to continue feeding input or not. | |
1630 |
|
1631 | |||
1631 | The return value can be used to decide whether to use sys.ps1 or |
|
1632 | The return value can be used to decide whether to use sys.ps1 or | |
1632 | sys.ps2 to prompt the next line.""" |
|
1633 | sys.ps2 to prompt the next line.""" | |
1633 |
|
1634 | |||
1634 | try: |
|
1635 | try: | |
1635 | code = self.compile(source,filename,symbol) |
|
1636 | code = self.compile(source,filename,symbol) | |
1636 | except (OverflowError, SyntaxError, ValueError): |
|
1637 | except (OverflowError, SyntaxError, ValueError): | |
1637 | # Case 1 |
|
1638 | # Case 1 | |
1638 | self.showsyntaxerror(filename) |
|
1639 | self.showsyntaxerror(filename) | |
1639 | return None |
|
1640 | return None | |
1640 |
|
1641 | |||
1641 | if code is None: |
|
1642 | if code is None: | |
1642 | # Case 2 |
|
1643 | # Case 2 | |
1643 | return True |
|
1644 | return True | |
1644 |
|
1645 | |||
1645 | # Case 3 |
|
1646 | # Case 3 | |
1646 | # We store the code object so that threaded shells and |
|
1647 | # We store the code object so that threaded shells and | |
1647 | # custom exception handlers can access all this info if needed. |
|
1648 | # custom exception handlers can access all this info if needed. | |
1648 | # The source corresponding to this can be obtained from the |
|
1649 | # The source corresponding to this can be obtained from the | |
1649 | # buffer attribute as '\n'.join(self.buffer). |
|
1650 | # buffer attribute as '\n'.join(self.buffer). | |
1650 | self.code_to_run = code |
|
1651 | self.code_to_run = code | |
1651 | # now actually execute the code object |
|
1652 | # now actually execute the code object | |
1652 | if self.runcode(code) == 0: |
|
1653 | if self.runcode(code) == 0: | |
1653 | return False |
|
1654 | return False | |
1654 | else: |
|
1655 | else: | |
1655 | return None |
|
1656 | return None | |
1656 |
|
1657 | |||
1657 | def runcode(self,code_obj): |
|
1658 | def runcode(self,code_obj): | |
1658 | """Execute a code object. |
|
1659 | """Execute a code object. | |
1659 |
|
1660 | |||
1660 | When an exception occurs, self.showtraceback() is called to display a |
|
1661 | When an exception occurs, self.showtraceback() is called to display a | |
1661 | traceback. |
|
1662 | traceback. | |
1662 |
|
1663 | |||
1663 | Return value: a flag indicating whether the code to be run completed |
|
1664 | Return value: a flag indicating whether the code to be run completed | |
1664 | successfully: |
|
1665 | successfully: | |
1665 |
|
1666 | |||
1666 | - 0: successful execution. |
|
1667 | - 0: successful execution. | |
1667 | - 1: an error occurred. |
|
1668 | - 1: an error occurred. | |
1668 | """ |
|
1669 | """ | |
1669 |
|
1670 | |||
1670 | # Set our own excepthook in case the user code tries to call it |
|
1671 | # Set our own excepthook in case the user code tries to call it | |
1671 | # directly, so that the IPython crash handler doesn't get triggered |
|
1672 | # directly, so that the IPython crash handler doesn't get triggered | |
1672 | old_excepthook,sys.excepthook = sys.excepthook, self.excepthook |
|
1673 | old_excepthook,sys.excepthook = sys.excepthook, self.excepthook | |
1673 |
|
1674 | |||
1674 | # we save the original sys.excepthook in the instance, in case config |
|
1675 | # we save the original sys.excepthook in the instance, in case config | |
1675 | # code (such as magics) needs access to it. |
|
1676 | # code (such as magics) needs access to it. | |
1676 | self.sys_excepthook = old_excepthook |
|
1677 | self.sys_excepthook = old_excepthook | |
1677 | outflag = 1 # happens in more places, so it's easier as default |
|
1678 | outflag = 1 # happens in more places, so it's easier as default | |
1678 | try: |
|
1679 | try: | |
1679 | try: |
|
1680 | try: | |
1680 | # Embedded instances require separate global/local namespaces |
|
1681 | # Embedded instances require separate global/local namespaces | |
1681 | # so they can see both the surrounding (local) namespace and |
|
1682 | # so they can see both the surrounding (local) namespace and | |
1682 | # the module-level globals when called inside another function. |
|
1683 | # the module-level globals when called inside another function. | |
1683 | if self.embedded: |
|
1684 | if self.embedded: | |
1684 | exec code_obj in self.user_global_ns, self.user_ns |
|
1685 | exec code_obj in self.user_global_ns, self.user_ns | |
1685 | # Normal (non-embedded) instances should only have a single |
|
1686 | # Normal (non-embedded) instances should only have a single | |
1686 | # namespace for user code execution, otherwise functions won't |
|
1687 | # namespace for user code execution, otherwise functions won't | |
1687 | # see interactive top-level globals. |
|
1688 | # see interactive top-level globals. | |
1688 | else: |
|
1689 | else: | |
1689 | exec code_obj in self.user_ns |
|
1690 | exec code_obj in self.user_ns | |
1690 | finally: |
|
1691 | finally: | |
1691 | # Reset our crash handler in place |
|
1692 | # Reset our crash handler in place | |
1692 | sys.excepthook = old_excepthook |
|
1693 | sys.excepthook = old_excepthook | |
1693 | except SystemExit: |
|
1694 | except SystemExit: | |
1694 | self.resetbuffer() |
|
1695 | self.resetbuffer() | |
1695 | self.showtraceback() |
|
1696 | self.showtraceback() | |
1696 | warn("Type exit or quit to exit IPython " |
|
1697 | warn("Type exit or quit to exit IPython " | |
1697 | "(%Exit or %Quit do so unconditionally).",level=1) |
|
1698 | "(%Exit or %Quit do so unconditionally).",level=1) | |
1698 | except self.custom_exceptions: |
|
1699 | except self.custom_exceptions: | |
1699 | etype,value,tb = sys.exc_info() |
|
1700 | etype,value,tb = sys.exc_info() | |
1700 | self.CustomTB(etype,value,tb) |
|
1701 | self.CustomTB(etype,value,tb) | |
1701 | except: |
|
1702 | except: | |
1702 | self.showtraceback() |
|
1703 | self.showtraceback() | |
1703 | else: |
|
1704 | else: | |
1704 | outflag = 0 |
|
1705 | outflag = 0 | |
1705 | if softspace(sys.stdout, 0): |
|
1706 | if softspace(sys.stdout, 0): | |
1706 |
|
1707 | |||
1707 | # Flush out code object which has been run (and source) |
|
1708 | # Flush out code object which has been run (and source) | |
1708 | self.code_to_run = None |
|
1709 | self.code_to_run = None | |
1709 | return outflag |
|
1710 | return outflag | |
1710 |
|
1711 | |||
1711 | def push(self, line): |
|
1712 | def push(self, line): | |
1712 | """Push a line to the interpreter. |
|
1713 | """Push a line to the interpreter. | |
1713 |
|
1714 | |||
1714 | The line should not have a trailing newline; it may have |
|
1715 | The line should not have a trailing newline; it may have | |
1715 | internal newlines. The line is appended to a buffer and the |
|
1716 | internal newlines. The line is appended to a buffer and the | |
1716 | interpreter's runsource() method is called with the |
|
1717 | interpreter's runsource() method is called with the | |
1717 | concatenated contents of the buffer as source. If this |
|
1718 | concatenated contents of the buffer as source. If this | |
1718 | indicates that the command was executed or invalid, the buffer |
|
1719 | indicates that the command was executed or invalid, the buffer | |
1719 | is reset; otherwise, the command is incomplete, and the buffer |
|
1720 | is reset; otherwise, the command is incomplete, and the buffer | |
1720 | is left as it was after the line was appended. The return |
|
1721 | is left as it was after the line was appended. The return | |
1721 | value is 1 if more input is required, 0 if the line was dealt |
|
1722 | value is 1 if more input is required, 0 if the line was dealt | |
1722 | with in some way (this is the same as runsource()). |
|
1723 | with in some way (this is the same as runsource()). | |
1723 | """ |
|
1724 | """ | |
1724 |
|
1725 | |||
1725 | # autoindent management should be done here, and not in the |
|
1726 | # autoindent management should be done here, and not in the | |
1726 | # interactive loop, since that one is only seen by keyboard input. We |
|
1727 | # interactive loop, since that one is only seen by keyboard input. We | |
1727 | # need this done correctly even for code run via runlines (which uses |
|
1728 | # need this done correctly even for code run via runlines (which uses | |
1728 | # push). |
|
1729 | # push). | |
1729 |
|
1730 | |||
1730 | #print 'push line: <%s>' % line # dbg |
|
1731 | #print 'push line: <%s>' % line # dbg | |
1731 | self.autoindent_update(line) |
|
1732 | self.autoindent_update(line) | |
1732 |
|
1733 | |||
1733 | self.buffer.append(line) |
|
1734 | self.buffer.append(line) | |
1734 | more = self.runsource('\n'.join(self.buffer), self.filename) |
|
1735 | more = self.runsource('\n'.join(self.buffer), self.filename) | |
1735 | if not more: |
|
1736 | if not more: | |
1736 | self.resetbuffer() |
|
1737 | self.resetbuffer() | |
1737 | return more |
|
1738 | return more | |
1738 |
|
1739 | |||
1739 | def resetbuffer(self): |
|
1740 | def resetbuffer(self): | |
1740 | """Reset the input buffer.""" |
|
1741 | """Reset the input buffer.""" | |
1741 | self.buffer[:] = [] |
|
1742 | self.buffer[:] = [] | |
1742 |
|
1743 | |||
1743 | def raw_input(self,prompt='',continue_prompt=False): |
|
1744 | def raw_input(self,prompt='',continue_prompt=False): | |
1744 | """Write a prompt and read a line. |
|
1745 | """Write a prompt and read a line. | |
1745 |
|
1746 | |||
1746 | The returned line does not include the trailing newline. |
|
1747 | The returned line does not include the trailing newline. | |
1747 | When the user enters the EOF key sequence, EOFError is raised. |
|
1748 | When the user enters the EOF key sequence, EOFError is raised. | |
1748 |
|
1749 | |||
1749 | Optional inputs: |
|
1750 | Optional inputs: | |
1750 |
|
1751 | |||
1751 | - prompt(''): a string to be printed to prompt the user. |
|
1752 | - prompt(''): a string to be printed to prompt the user. | |
1752 |
|
1753 | |||
1753 | - continue_prompt(False): whether this line is the first one or a |
|
1754 | - continue_prompt(False): whether this line is the first one or a | |
1754 | continuation in a sequence of inputs. |
|
1755 | continuation in a sequence of inputs. | |
1755 | """ |
|
1756 | """ | |
1756 |
|
1757 | |||
1757 | line = raw_input_original(prompt) |
|
1758 | line = raw_input_original(prompt) | |
1758 | # Try to be reasonably smart about not re-indenting pasted input more |
|
1759 | # Try to be reasonably smart about not re-indenting pasted input more | |
1759 | # than necessary. We do this by trimming out the auto-indent initial |
|
1760 | # than necessary. We do this by trimming out the auto-indent initial | |
1760 | # spaces, if the user's actual input started itself with whitespace. |
|
1761 | # spaces, if the user's actual input started itself with whitespace. | |
1761 | #debugx('self.buffer[-1]') |
|
1762 | #debugx('self.buffer[-1]') | |
1762 |
|
1763 | |||
1763 | if self.autoindent: |
|
1764 | if self.autoindent: | |
1764 | if num_ini_spaces(line) > self.indent_current_nsp: |
|
1765 | if num_ini_spaces(line) > self.indent_current_nsp: | |
1765 | line = line[self.indent_current_nsp:] |
|
1766 | line = line[self.indent_current_nsp:] | |
1766 | self.indent_current_nsp = 0 |
|
1767 | self.indent_current_nsp = 0 | |
1767 |
|
1768 | |||
1768 | # store the unfiltered input before the user has any chance to modify |
|
1769 | # store the unfiltered input before the user has any chance to modify | |
1769 | # it. |
|
1770 | # it. | |
1770 | if line.strip(): |
|
1771 | if line.strip(): | |
1771 | if continue_prompt: |
|
1772 | if continue_prompt: | |
1772 | self.input_hist_raw[-1] += '%s\n' % line |
|
1773 | self.input_hist_raw[-1] += '%s\n' % line | |
1773 | else: |
|
1774 | else: | |
1774 | self.input_hist_raw.append('%s\n' % line) |
|
1775 | self.input_hist_raw.append('%s\n' % line) | |
1775 |
|
1776 | |||
1776 | lineout = self.prefilter(line,continue_prompt) |
|
1777 | lineout = self.prefilter(line,continue_prompt) | |
1777 | return lineout |
|
1778 | return lineout | |
1778 |
|
1779 | |||
1779 | def split_user_input(self,line): |
|
1780 | def split_user_input(self,line): | |
1780 | """Split user input into pre-char, function part and rest.""" |
|
1781 | """Split user input into pre-char, function part and rest.""" | |
1781 |
|
1782 | |||
1782 | lsplit = self.line_split.match(line) |
|
1783 | lsplit = self.line_split.match(line) | |
1783 | if lsplit is None: # no regexp match returns None |
|
1784 | if lsplit is None: # no regexp match returns None | |
1784 | try: |
|
1785 | try: | |
1785 | iFun,theRest = line.split(None,1) |
|
1786 | iFun,theRest = line.split(None,1) | |
1786 | except ValueError: |
|
1787 | except ValueError: | |
1787 | iFun,theRest = line,'' |
|
1788 | iFun,theRest = line,'' | |
1788 | pre = re.match('^(\s*)(.*)',line).groups()[0] |
|
1789 | pre = re.match('^(\s*)(.*)',line).groups()[0] | |
1789 | else: |
|
1790 | else: | |
1790 | pre,iFun,theRest = lsplit.groups() |
|
1791 | pre,iFun,theRest = lsplit.groups() | |
1791 |
|
1792 | |||
1792 | #print 'line:<%s>' % line # dbg |
|
1793 | #print 'line:<%s>' % line # dbg | |
1793 | #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun.strip(),theRest) # dbg |
|
1794 | #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun.strip(),theRest) # dbg | |
1794 | return pre,iFun.strip(),theRest |
|
1795 | return pre,iFun.strip(),theRest | |
1795 |
|
1796 | |||
1796 | def _prefilter(self, line, continue_prompt): |
|
1797 | def _prefilter(self, line, continue_prompt): | |
1797 | """Calls different preprocessors, depending on the form of line.""" |
|
1798 | """Calls different preprocessors, depending on the form of line.""" | |
1798 |
|
1799 | |||
1799 | # All handlers *must* return a value, even if it's blank (''). |
|
1800 | # All handlers *must* return a value, even if it's blank (''). | |
1800 |
|
1801 | |||
1801 | # Lines are NOT logged here. Handlers should process the line as |
|
1802 | # Lines are NOT logged here. Handlers should process the line as | |
1802 | # needed, update the cache AND log it (so that the input cache array |
|
1803 | # needed, update the cache AND log it (so that the input cache array | |
1803 | # stays synced). |
|
1804 | # stays synced). | |
1804 |
|
1805 | |||
1805 | # This function is _very_ delicate, and since it's also the one which |
|
1806 | # This function is _very_ delicate, and since it's also the one which | |
1806 | # determines IPython's response to user input, it must be as efficient |
|
1807 | # determines IPython's response to user input, it must be as efficient | |
1807 | # as possible. For this reason it has _many_ returns in it, trying |
|
1808 | # as possible. For this reason it has _many_ returns in it, trying | |
1808 | # always to exit as quickly as it can figure out what it needs to do. |
|
1809 | # always to exit as quickly as it can figure out what it needs to do. | |
1809 |
|
1810 | |||
1810 | # This function is the main responsible for maintaining IPython's |
|
1811 | # This function is the main responsible for maintaining IPython's | |
1811 | # behavior respectful of Python's semantics. So be _very_ careful if |
|
1812 | # behavior respectful of Python's semantics. So be _very_ careful if | |
1812 | # making changes to anything here. |
|
1813 | # making changes to anything here. | |
1813 |
|
1814 | |||
1814 | #..................................................................... |
|
1815 | #..................................................................... | |
1815 | # Code begins |
|
1816 | # Code begins | |
1816 |
|
1817 | |||
1817 | #if line.startswith('%crash'): raise RuntimeError,'Crash now!' # dbg |
|
1818 | #if line.startswith('%crash'): raise RuntimeError,'Crash now!' # dbg | |
1818 |
|
1819 | |||
1819 | # save the line away in case we crash, so the post-mortem handler can |
|
1820 | # save the line away in case we crash, so the post-mortem handler can | |
1820 | # record it |
|
1821 | # record it | |
1821 | self._last_input_line = line |
|
1822 | self._last_input_line = line | |
1822 |
|
1823 | |||
1823 | #print '***line: <%s>' % line # dbg |
|
1824 | #print '***line: <%s>' % line # dbg | |
1824 |
|
1825 | |||
1825 | # the input history needs to track even empty lines |
|
1826 | # the input history needs to track even empty lines | |
1826 | if not line.strip(): |
|
1827 | if not line.strip(): | |
1827 | if not continue_prompt: |
|
1828 | if not continue_prompt: | |
1828 | self.outputcache.prompt_count -= 1 |
|
1829 | self.outputcache.prompt_count -= 1 | |
1829 | return self.handle_normal(line,continue_prompt) |
|
1830 | return self.handle_normal(line,continue_prompt) | |
1830 | #return self.handle_normal('',continue_prompt) |
|
1831 | #return self.handle_normal('',continue_prompt) | |
1831 |
|
1832 | |||
1832 | # print '***cont',continue_prompt # dbg |
|
1833 | # print '***cont',continue_prompt # dbg | |
1833 | # special handlers are only allowed for single line statements |
|
1834 | # special handlers are only allowed for single line statements | |
1834 | if continue_prompt and not self.rc.multi_line_specials: |
|
1835 | if continue_prompt and not self.rc.multi_line_specials: | |
1835 | return self.handle_normal(line,continue_prompt) |
|
1836 | return self.handle_normal(line,continue_prompt) | |
1836 |
|
1837 | |||
1837 | # For the rest, we need the structure of the input |
|
1838 | # For the rest, we need the structure of the input | |
1838 | pre,iFun,theRest = self.split_user_input(line) |
|
1839 | pre,iFun,theRest = self.split_user_input(line) | |
1839 | #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun,theRest) # dbg |
|
1840 | #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun,theRest) # dbg | |
1840 |
|
1841 | |||
1841 | # First check for explicit escapes in the last/first character |
|
1842 | # First check for explicit escapes in the last/first character | |
1842 | handler = None |
|
1843 | handler = None | |
1843 | if line[-1] == self.ESC_HELP: |
|
1844 | if line[-1] == self.ESC_HELP: | |
1844 | handler = self.esc_handlers.get(line[-1]) # the ? can be at the end |
|
1845 | handler = self.esc_handlers.get(line[-1]) # the ? can be at the end | |
1845 | if handler is None: |
|
1846 | if handler is None: | |
1846 | # look at the first character of iFun, NOT of line, so we skip |
|
1847 | # look at the first character of iFun, NOT of line, so we skip | |
1847 | # leading whitespace in multiline input |
|
1848 | # leading whitespace in multiline input | |
1848 | handler = self.esc_handlers.get(iFun[0:1]) |
|
1849 | handler = self.esc_handlers.get(iFun[0:1]) | |
1849 | if handler is not None: |
|
1850 | if handler is not None: | |
1850 | return handler(line,continue_prompt,pre,iFun,theRest) |
|
1851 | return handler(line,continue_prompt,pre,iFun,theRest) | |
1851 | # Emacs ipython-mode tags certain input lines |
|
1852 | # Emacs ipython-mode tags certain input lines | |
1852 | if line.endswith('# PYTHON-MODE'): |
|
1853 | if line.endswith('# PYTHON-MODE'): | |
1853 | return self.handle_emacs(line,continue_prompt) |
|
1854 | return self.handle_emacs(line,continue_prompt) | |
1854 |
|
1855 | |||
1855 | # Next, check if we can automatically execute this thing |
|
1856 | # Next, check if we can automatically execute this thing | |
1856 |
|
1857 | |||
1857 | # Allow ! in multi-line statements if multi_line_specials is on: |
|
1858 | # Allow ! in multi-line statements if multi_line_specials is on: | |
1858 | if continue_prompt and self.rc.multi_line_specials and \ |
|
1859 | if continue_prompt and self.rc.multi_line_specials and \ | |
1859 | iFun.startswith(self.ESC_SHELL): |
|
1860 | iFun.startswith(self.ESC_SHELL): | |
1860 | return self.handle_shell_escape(line,continue_prompt, |
|
1861 | return self.handle_shell_escape(line,continue_prompt, | |
1861 | pre=pre,iFun=iFun, |
|
1862 | pre=pre,iFun=iFun, | |
1862 | theRest=theRest) |
|
1863 | theRest=theRest) | |
1863 |
|
1864 | |||
1864 | # Let's try to find if the input line is a magic fn |
|
1865 | # Let's try to find if the input line is a magic fn | |
1865 | oinfo = None |
|
1866 | oinfo = None | |
1866 | if hasattr(self,'magic_'+iFun): |
|
1867 | if hasattr(self,'magic_'+iFun): | |
1867 | # WARNING: _ofind uses getattr(), so it can consume generators and |
|
1868 | # WARNING: _ofind uses getattr(), so it can consume generators and | |
1868 | # cause other side effects. |
|
1869 | # cause other side effects. | |
1869 | oinfo = self._ofind(iFun) # FIXME - _ofind is part of Magic |
|
1870 | oinfo = self._ofind(iFun) # FIXME - _ofind is part of Magic | |
1870 | if oinfo['ismagic']: |
|
1871 | if oinfo['ismagic']: | |
1871 | # Be careful not to call magics when a variable assignment is |
|
1872 | # Be careful not to call magics when a variable assignment is | |
1872 | # being made (ls='hi', for example) |
|
1873 | # being made (ls='hi', for example) | |
1873 | if self.rc.automagic and \ |
|
1874 | if self.rc.automagic and \ | |
1874 | (len(theRest)==0 or theRest[0] not in '!=()<>,') and \ |
|
1875 | (len(theRest)==0 or theRest[0] not in '!=()<>,') and \ | |
1875 | (self.rc.multi_line_specials or not continue_prompt): |
|
1876 | (self.rc.multi_line_specials or not continue_prompt): | |
1876 | return self.handle_magic(line,continue_prompt, |
|
1877 | return self.handle_magic(line,continue_prompt, | |
1877 | pre,iFun,theRest) |
|
1878 | pre,iFun,theRest) | |
1878 | else: |
|
1879 | else: | |
1879 | return self.handle_normal(line,continue_prompt) |
|
1880 | return self.handle_normal(line,continue_prompt) | |
1880 |
|
1881 | |||
1881 | # If the rest of the line begins with an (in)equality, assginment or |
|
1882 | # If the rest of the line begins with an (in)equality, assginment or | |
1882 | # function call, we should not call _ofind but simply execute it. |
|
1883 | # function call, we should not call _ofind but simply execute it. | |
1883 | # This avoids spurious geattr() accesses on objects upon assignment. |
|
1884 | # This avoids spurious geattr() accesses on objects upon assignment. | |
1884 | # |
|
1885 | # | |
1885 | # It also allows users to assign to either alias or magic names true |
|
1886 | # It also allows users to assign to either alias or magic names true | |
1886 | # python variables (the magic/alias systems always take second seat to |
|
1887 | # python variables (the magic/alias systems always take second seat to | |
1887 | # true python code). |
|
1888 | # true python code). | |
1888 | if theRest and theRest[0] in '!=()': |
|
1889 | if theRest and theRest[0] in '!=()': | |
1889 | return self.handle_normal(line,continue_prompt) |
|
1890 | return self.handle_normal(line,continue_prompt) | |
1890 |
|
1891 | |||
1891 | if oinfo is None: |
|
1892 | if oinfo is None: | |
1892 | # let's try to ensure that _oinfo is ONLY called when autocall is |
|
1893 | # let's try to ensure that _oinfo is ONLY called when autocall is | |
1893 | # on. Since it has inevitable potential side effects, at least |
|
1894 | # on. Since it has inevitable potential side effects, at least | |
1894 | # having autocall off should be a guarantee to the user that no |
|
1895 | # having autocall off should be a guarantee to the user that no | |
1895 | # weird things will happen. |
|
1896 | # weird things will happen. | |
1896 |
|
1897 | |||
1897 | if self.rc.autocall: |
|
1898 | if self.rc.autocall: | |
1898 | oinfo = self._ofind(iFun) # FIXME - _ofind is part of Magic |
|
1899 | oinfo = self._ofind(iFun) # FIXME - _ofind is part of Magic | |
1899 | else: |
|
1900 | else: | |
1900 | # in this case, all that's left is either an alias or |
|
1901 | # in this case, all that's left is either an alias or | |
1901 | # processing the line normally. |
|
1902 | # processing the line normally. | |
1902 | if iFun in self.alias_table: |
|
1903 | if iFun in self.alias_table: | |
1903 | return self.handle_alias(line,continue_prompt, |
|
1904 | return self.handle_alias(line,continue_prompt, | |
1904 | pre,iFun,theRest) |
|
1905 | pre,iFun,theRest) | |
1905 |
|
1906 | |||
1906 | else: |
|
1907 | else: | |
1907 | return self.handle_normal(line,continue_prompt) |
|
1908 | return self.handle_normal(line,continue_prompt) | |
1908 |
|
1909 | |||
1909 | if not oinfo['found']: |
|
1910 | if not oinfo['found']: | |
1910 | return self.handle_normal(line,continue_prompt) |
|
1911 | return self.handle_normal(line,continue_prompt) | |
1911 | else: |
|
1912 | else: | |
1912 | #print 'pre<%s> iFun <%s> rest <%s>' % (pre,iFun,theRest) # dbg |
|
1913 | #print 'pre<%s> iFun <%s> rest <%s>' % (pre,iFun,theRest) # dbg | |
1913 | if oinfo['isalias']: |
|
1914 | if oinfo['isalias']: | |
1914 | return self.handle_alias(line,continue_prompt, |
|
1915 | return self.handle_alias(line,continue_prompt, | |
1915 | pre,iFun,theRest) |
|
1916 | pre,iFun,theRest) | |
1916 |
|
1917 | |||
1917 | if (self.rc.autocall |
|
1918 | if (self.rc.autocall | |
1918 | and |
|
1919 | and | |
1919 | ( |
|
1920 | ( | |
1920 | #only consider exclusion re if not "," or ";" autoquoting |
|
1921 | #only consider exclusion re if not "," or ";" autoquoting | |
1921 | (pre == self.ESC_QUOTE or pre == self.ESC_QUOTE2) or |
|
1922 | (pre == self.ESC_QUOTE or pre == self.ESC_QUOTE2) or | |
1922 | (not self.re_exclude_auto.match(theRest))) |
|
1923 | (not self.re_exclude_auto.match(theRest))) | |
1923 | and |
|
1924 | and | |
1924 | self.re_fun_name.match(iFun) and |
|
1925 | self.re_fun_name.match(iFun) and | |
1925 | callable(oinfo['obj'])) : |
|
1926 | callable(oinfo['obj'])) : | |
1926 | #print 'going auto' # dbg |
|
1927 | #print 'going auto' # dbg | |
1927 | return self.handle_auto(line,continue_prompt, |
|
1928 | return self.handle_auto(line,continue_prompt, | |
1928 | pre,iFun,theRest,oinfo['obj']) |
|
1929 | pre,iFun,theRest,oinfo['obj']) | |
1929 | else: |
|
1930 | else: | |
1930 | #print 'was callable?', callable(oinfo['obj']) # dbg |
|
1931 | #print 'was callable?', callable(oinfo['obj']) # dbg | |
1931 | return self.handle_normal(line,continue_prompt) |
|
1932 | return self.handle_normal(line,continue_prompt) | |
1932 |
|
1933 | |||
1933 | # If we get here, we have a normal Python line. Log and return. |
|
1934 | # If we get here, we have a normal Python line. Log and return. | |
1934 | return self.handle_normal(line,continue_prompt) |
|
1935 | return self.handle_normal(line,continue_prompt) | |
1935 |
|
1936 | |||
1936 | def _prefilter_dumb(self, line, continue_prompt): |
|
1937 | def _prefilter_dumb(self, line, continue_prompt): | |
1937 | """simple prefilter function, for debugging""" |
|
1938 | """simple prefilter function, for debugging""" | |
1938 | return self.handle_normal(line,continue_prompt) |
|
1939 | return self.handle_normal(line,continue_prompt) | |
1939 |
|
1940 | |||
1940 | # Set the default prefilter() function (this can be user-overridden) |
|
1941 | # Set the default prefilter() function (this can be user-overridden) | |
1941 | prefilter = _prefilter |
|
1942 | prefilter = _prefilter | |
1942 |
|
1943 | |||
1943 | def handle_normal(self,line,continue_prompt=None, |
|
1944 | def handle_normal(self,line,continue_prompt=None, | |
1944 | pre=None,iFun=None,theRest=None): |
|
1945 | pre=None,iFun=None,theRest=None): | |
1945 | """Handle normal input lines. Use as a template for handlers.""" |
|
1946 | """Handle normal input lines. Use as a template for handlers.""" | |
1946 |
|
1947 | |||
1947 | # With autoindent on, we need some way to exit the input loop, and I |
|
1948 | # With autoindent on, we need some way to exit the input loop, and I | |
1948 | # don't want to force the user to have to backspace all the way to |
|
1949 | # don't want to force the user to have to backspace all the way to | |
1949 | # clear the line. The rule will be in this case, that either two |
|
1950 | # clear the line. The rule will be in this case, that either two | |
1950 | # lines of pure whitespace in a row, or a line of pure whitespace but |
|
1951 | # lines of pure whitespace in a row, or a line of pure whitespace but | |
1951 | # of a size different to the indent level, will exit the input loop. |
|
1952 | # of a size different to the indent level, will exit the input loop. | |
1952 |
|
1953 | |||
1953 | if (continue_prompt and self.autoindent and line.isspace() and |
|
1954 | if (continue_prompt and self.autoindent and line.isspace() and | |
1954 | (0 < abs(len(line) - self.indent_current_nsp) <= 2 or |
|
1955 | (0 < abs(len(line) - self.indent_current_nsp) <= 2 or | |
1955 | (self.buffer[-1]).isspace() )): |
|
1956 | (self.buffer[-1]).isspace() )): | |
1956 | line = '' |
|
1957 | line = '' | |
1957 |
|
1958 | |||
1958 | self.log(line,continue_prompt) |
|
1959 | self.log(line,continue_prompt) | |
1959 | return line |
|
1960 | return line | |
1960 |
|
1961 | |||
1961 | def handle_alias(self,line,continue_prompt=None, |
|
1962 | def handle_alias(self,line,continue_prompt=None, | |
1962 | pre=None,iFun=None,theRest=None): |
|
1963 | pre=None,iFun=None,theRest=None): | |
1963 | """Handle alias input lines. """ |
|
1964 | """Handle alias input lines. """ | |
1964 |
|
1965 | |||
1965 | # pre is needed, because it carries the leading whitespace. Otherwise |
|
1966 | # pre is needed, because it carries the leading whitespace. Otherwise | |
1966 | # aliases won't work in indented sections. |
|
1967 | # aliases won't work in indented sections. | |
1967 | line_out = '%sipalias(%s)' % (pre,make_quoted_expr(iFun + " " + theRest)) |
|
1968 | line_out = '%sipalias(%s)' % (pre,make_quoted_expr(iFun + " " + theRest)) | |
1968 | self.log(line_out,continue_prompt) |
|
1969 | self.log(line_out,continue_prompt) | |
1969 | return line_out |
|
1970 | return line_out | |
1970 |
|
1971 | |||
1971 | def handle_shell_escape(self, line, continue_prompt=None, |
|
1972 | def handle_shell_escape(self, line, continue_prompt=None, | |
1972 | pre=None,iFun=None,theRest=None): |
|
1973 | pre=None,iFun=None,theRest=None): | |
1973 | """Execute the line in a shell, empty return value""" |
|
1974 | """Execute the line in a shell, empty return value""" | |
1974 |
|
1975 | |||
1975 | #print 'line in :', `line` # dbg |
|
1976 | #print 'line in :', `line` # dbg | |
1976 | # Example of a special handler. Others follow a similar pattern. |
|
1977 | # Example of a special handler. Others follow a similar pattern. | |
1977 | if line.lstrip().startswith('!!'): |
|
1978 | if line.lstrip().startswith('!!'): | |
1978 | # rewrite iFun/theRest to properly hold the call to %sx and |
|
1979 | # rewrite iFun/theRest to properly hold the call to %sx and | |
1979 | # the actual command to be executed, so handle_magic can work |
|
1980 | # the actual command to be executed, so handle_magic can work | |
1980 | # correctly |
|
1981 | # correctly | |
1981 | theRest = '%s %s' % (iFun[2:],theRest) |
|
1982 | theRest = '%s %s' % (iFun[2:],theRest) | |
1982 | iFun = 'sx' |
|
1983 | iFun = 'sx' | |
1983 | return self.handle_magic('%ssx %s' % (self.ESC_MAGIC, |
|
1984 | return self.handle_magic('%ssx %s' % (self.ESC_MAGIC, | |
1984 | line.lstrip()[2:]), |
|
1985 | line.lstrip()[2:]), | |
1985 | continue_prompt,pre,iFun,theRest) |
|
1986 | continue_prompt,pre,iFun,theRest) | |
1986 | else: |
|
1987 | else: | |
1987 | cmd=line.lstrip().lstrip('!') |
|
1988 | cmd=line.lstrip().lstrip('!') | |
1988 | line_out = '%sipsystem(%s)' % (pre,make_quoted_expr(cmd)) |
|
1989 | line_out = '%sipsystem(%s)' % (pre,make_quoted_expr(cmd)) | |
1989 | # update cache/log and return |
|
1990 | # update cache/log and return | |
1990 | self.log(line_out,continue_prompt) |
|
1991 | self.log(line_out,continue_prompt) | |
1991 | return line_out |
|
1992 | return line_out | |
1992 |
|
1993 | |||
1993 | def handle_magic(self, line, continue_prompt=None, |
|
1994 | def handle_magic(self, line, continue_prompt=None, | |
1994 | pre=None,iFun=None,theRest=None): |
|
1995 | pre=None,iFun=None,theRest=None): | |
1995 | """Execute magic functions.""" |
|
1996 | """Execute magic functions.""" | |
1996 |
|
1997 | |||
1997 |
|
1998 | |||
1998 | cmd = '%sipmagic(%s)' % (pre,make_quoted_expr(iFun + " " + theRest)) |
|
1999 | cmd = '%sipmagic(%s)' % (pre,make_quoted_expr(iFun + " " + theRest)) | |
1999 | self.log(cmd,continue_prompt) |
|
2000 | self.log(cmd,continue_prompt) | |
2000 | #print 'in handle_magic, cmd=<%s>' % cmd # dbg |
|
2001 | #print 'in handle_magic, cmd=<%s>' % cmd # dbg | |
2001 | return cmd |
|
2002 | return cmd | |
2002 |
|
2003 | |||
2003 | def handle_auto(self, line, continue_prompt=None, |
|
2004 | def handle_auto(self, line, continue_prompt=None, | |
2004 | pre=None,iFun=None,theRest=None,obj=None): |
|
2005 | pre=None,iFun=None,theRest=None,obj=None): | |
2005 | """Hande lines which can be auto-executed, quoting if requested.""" |
|
2006 | """Hande lines which can be auto-executed, quoting if requested.""" | |
2006 |
|
2007 | |||
2007 | #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun,theRest) # dbg |
|
2008 | #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun,theRest) # dbg | |
2008 |
|
2009 | |||
2009 | # This should only be active for single-line input! |
|
2010 | # This should only be active for single-line input! | |
2010 | if continue_prompt: |
|
2011 | if continue_prompt: | |
2011 | self.log(line,continue_prompt) |
|
2012 | self.log(line,continue_prompt) | |
2012 | return line |
|
2013 | return line | |
2013 |
|
2014 | |||
2014 | auto_rewrite = True |
|
2015 | auto_rewrite = True | |
2015 | if pre == self.ESC_QUOTE: |
|
2016 | if pre == self.ESC_QUOTE: | |
2016 | # Auto-quote splitting on whitespace |
|
2017 | # Auto-quote splitting on whitespace | |
2017 | newcmd = '%s("%s")' % (iFun,'", "'.join(theRest.split()) ) |
|
2018 | newcmd = '%s("%s")' % (iFun,'", "'.join(theRest.split()) ) | |
2018 | elif pre == self.ESC_QUOTE2: |
|
2019 | elif pre == self.ESC_QUOTE2: | |
2019 | # Auto-quote whole string |
|
2020 | # Auto-quote whole string | |
2020 | newcmd = '%s("%s")' % (iFun,theRest) |
|
2021 | newcmd = '%s("%s")' % (iFun,theRest) | |
2021 | else: |
|
2022 | else: | |
2022 | # Auto-paren. |
|
2023 | # Auto-paren. | |
2023 | # We only apply it to argument-less calls if the autocall |
|
2024 | # We only apply it to argument-less calls if the autocall | |
2024 | # parameter is set to 2. We only need to check that autocall is < |
|
2025 | # parameter is set to 2. We only need to check that autocall is < | |
2025 | # 2, since this function isn't called unless it's at least 1. |
|
2026 | # 2, since this function isn't called unless it's at least 1. | |
2026 | if not theRest and (self.rc.autocall < 2): |
|
2027 | if not theRest and (self.rc.autocall < 2): | |
2027 | newcmd = '%s %s' % (iFun,theRest) |
|
2028 | newcmd = '%s %s' % (iFun,theRest) | |
2028 | auto_rewrite = False |
|
2029 | auto_rewrite = False | |
2029 | else: |
|
2030 | else: | |
2030 | if theRest.startswith('['): |
|
2031 | if theRest.startswith('['): | |
2031 | if hasattr(obj,'__getitem__'): |
|
2032 | if hasattr(obj,'__getitem__'): | |
2032 | # Don't autocall in this case: item access for an object |
|
2033 | # Don't autocall in this case: item access for an object | |
2033 | # which is BOTH callable and implements __getitem__. |
|
2034 | # which is BOTH callable and implements __getitem__. | |
2034 | newcmd = '%s %s' % (iFun,theRest) |
|
2035 | newcmd = '%s %s' % (iFun,theRest) | |
2035 | auto_rewrite = False |
|
2036 | auto_rewrite = False | |
2036 | else: |
|
2037 | else: | |
2037 | # if the object doesn't support [] access, go ahead and |
|
2038 | # if the object doesn't support [] access, go ahead and | |
2038 | # autocall |
|
2039 | # autocall | |
2039 | newcmd = '%s(%s)' % (iFun.rstrip(),theRest) |
|
2040 | newcmd = '%s(%s)' % (iFun.rstrip(),theRest) | |
2040 | elif theRest.endswith(';'): |
|
2041 | elif theRest.endswith(';'): | |
2041 | newcmd = '%s(%s);' % (iFun.rstrip(),theRest[:-1]) |
|
2042 | newcmd = '%s(%s);' % (iFun.rstrip(),theRest[:-1]) | |
2042 | else: |
|
2043 | else: | |
2043 | newcmd = '%s(%s)' % (iFun.rstrip(),theRest) |
|
2044 | newcmd = '%s(%s)' % (iFun.rstrip(),theRest) | |
2044 |
|
2045 | |||
2045 | if auto_rewrite: |
|
2046 | if auto_rewrite: | |
2046 | print >>Term.cout, self.outputcache.prompt1.auto_rewrite() + newcmd |
|
2047 | print >>Term.cout, self.outputcache.prompt1.auto_rewrite() + newcmd | |
2047 | # log what is now valid Python, not the actual user input (without the |
|
2048 | # log what is now valid Python, not the actual user input (without the | |
2048 | # final newline) |
|
2049 | # final newline) | |
2049 | self.log(newcmd,continue_prompt) |
|
2050 | self.log(newcmd,continue_prompt) | |
2050 | return newcmd |
|
2051 | return newcmd | |
2051 |
|
2052 | |||
2052 | def handle_help(self, line, continue_prompt=None, |
|
2053 | def handle_help(self, line, continue_prompt=None, | |
2053 | pre=None,iFun=None,theRest=None): |
|
2054 | pre=None,iFun=None,theRest=None): | |
2054 | """Try to get some help for the object. |
|
2055 | """Try to get some help for the object. | |
2055 |
|
2056 | |||
2056 | obj? or ?obj -> basic information. |
|
2057 | obj? or ?obj -> basic information. | |
2057 | obj?? or ??obj -> more details. |
|
2058 | obj?? or ??obj -> more details. | |
2058 | """ |
|
2059 | """ | |
2059 |
|
2060 | |||
2060 | # We need to make sure that we don't process lines which would be |
|
2061 | # We need to make sure that we don't process lines which would be | |
2061 | # otherwise valid python, such as "x=1 # what?" |
|
2062 | # otherwise valid python, such as "x=1 # what?" | |
2062 | try: |
|
2063 | try: | |
2063 | codeop.compile_command(line) |
|
2064 | codeop.compile_command(line) | |
2064 | except SyntaxError: |
|
2065 | except SyntaxError: | |
2065 | # We should only handle as help stuff which is NOT valid syntax |
|
2066 | # We should only handle as help stuff which is NOT valid syntax | |
2066 | if line[0]==self.ESC_HELP: |
|
2067 | if line[0]==self.ESC_HELP: | |
2067 | line = line[1:] |
|
2068 | line = line[1:] | |
2068 | elif line[-1]==self.ESC_HELP: |
|
2069 | elif line[-1]==self.ESC_HELP: | |
2069 | line = line[:-1] |
|
2070 | line = line[:-1] | |
2070 | self.log('#?'+line) |
|
2071 | self.log('#?'+line) | |
2071 | if line: |
|
2072 | if line: | |
2072 | self.magic_pinfo(line) |
|
2073 | self.magic_pinfo(line) | |
2073 | else: |
|
2074 | else: | |
2074 | page(self.usage,screen_lines=self.rc.screen_length) |
|
2075 | page(self.usage,screen_lines=self.rc.screen_length) | |
2075 | return '' # Empty string is needed here! |
|
2076 | return '' # Empty string is needed here! | |
2076 | except: |
|
2077 | except: | |
2077 | # Pass any other exceptions through to the normal handler |
|
2078 | # Pass any other exceptions through to the normal handler | |
2078 | return self.handle_normal(line,continue_prompt) |
|
2079 | return self.handle_normal(line,continue_prompt) | |
2079 | else: |
|
2080 | else: | |
2080 | # If the code compiles ok, we should handle it normally |
|
2081 | # If the code compiles ok, we should handle it normally | |
2081 | return self.handle_normal(line,continue_prompt) |
|
2082 | return self.handle_normal(line,continue_prompt) | |
2082 |
|
2083 | |||
2083 | def handle_emacs(self,line,continue_prompt=None, |
|
2084 | def handle_emacs(self,line,continue_prompt=None, | |
2084 | pre=None,iFun=None,theRest=None): |
|
2085 | pre=None,iFun=None,theRest=None): | |
2085 | """Handle input lines marked by python-mode.""" |
|
2086 | """Handle input lines marked by python-mode.""" | |
2086 |
|
2087 | |||
2087 | # Currently, nothing is done. Later more functionality can be added |
|
2088 | # Currently, nothing is done. Later more functionality can be added | |
2088 | # here if needed. |
|
2089 | # here if needed. | |
2089 |
|
2090 | |||
2090 | # The input cache shouldn't be updated |
|
2091 | # The input cache shouldn't be updated | |
2091 |
|
2092 | |||
2092 | return line |
|
2093 | return line | |
2093 |
|
2094 | |||
2094 | def mktempfile(self,data=None): |
|
2095 | def mktempfile(self,data=None): | |
2095 | """Make a new tempfile and return its filename. |
|
2096 | """Make a new tempfile and return its filename. | |
2096 |
|
2097 | |||
2097 | This makes a call to tempfile.mktemp, but it registers the created |
|
2098 | This makes a call to tempfile.mktemp, but it registers the created | |
2098 | filename internally so ipython cleans it up at exit time. |
|
2099 | filename internally so ipython cleans it up at exit time. | |
2099 |
|
2100 | |||
2100 | Optional inputs: |
|
2101 | Optional inputs: | |
2101 |
|
2102 | |||
2102 | - data(None): if data is given, it gets written out to the temp file |
|
2103 | - data(None): if data is given, it gets written out to the temp file | |
2103 | immediately, and the file is closed again.""" |
|
2104 | immediately, and the file is closed again.""" | |
2104 |
|
2105 | |||
2105 | filename = tempfile.mktemp('.py','ipython_edit_') |
|
2106 | filename = tempfile.mktemp('.py','ipython_edit_') | |
2106 | self.tempfiles.append(filename) |
|
2107 | self.tempfiles.append(filename) | |
2107 |
|
2108 | |||
2108 | if data: |
|
2109 | if data: | |
2109 | tmp_file = open(filename,'w') |
|
2110 | tmp_file = open(filename,'w') | |
2110 | tmp_file.write(data) |
|
2111 | tmp_file.write(data) | |
2111 | tmp_file.close() |
|
2112 | tmp_file.close() | |
2112 | return filename |
|
2113 | return filename | |
2113 |
|
2114 | |||
2114 | def write(self,data): |
|
2115 | def write(self,data): | |
2115 | """Write a string to the default output""" |
|
2116 | """Write a string to the default output""" | |
2116 | Term.cout.write(data) |
|
2117 | Term.cout.write(data) | |
2117 |
|
2118 | |||
2118 | def write_err(self,data): |
|
2119 | def write_err(self,data): | |
2119 | """Write a string to the default error output""" |
|
2120 | """Write a string to the default error output""" | |
2120 | Term.cerr.write(data) |
|
2121 | Term.cerr.write(data) | |
2121 |
|
2122 | |||
2122 | def exit(self): |
|
2123 | def exit(self): | |
2123 | """Handle interactive exit. |
|
2124 | """Handle interactive exit. | |
2124 |
|
2125 | |||
2125 | This method sets the exit_now attribute.""" |
|
2126 | This method sets the exit_now attribute.""" | |
2126 |
|
2127 | |||
2127 | if self.rc.confirm_exit: |
|
2128 | if self.rc.confirm_exit: | |
2128 | if ask_yes_no('Do you really want to exit ([y]/n)?','y'): |
|
2129 | if ask_yes_no('Do you really want to exit ([y]/n)?','y'): | |
2129 | self.exit_now = True |
|
2130 | self.exit_now = True | |
2130 | else: |
|
2131 | else: | |
2131 | self.exit_now = True |
|
2132 | self.exit_now = True | |
2132 | return self.exit_now |
|
2133 | return self.exit_now | |
2133 |
|
2134 | |||
2134 | def safe_execfile(self,fname,*where,**kw): |
|
2135 | def safe_execfile(self,fname,*where,**kw): | |
2135 | fname = os.path.expanduser(fname) |
|
2136 | fname = os.path.expanduser(fname) | |
2136 |
|
2137 | |||
2137 | # find things also in current directory |
|
2138 | # find things also in current directory | |
2138 | dname = os.path.dirname(fname) |
|
2139 | dname = os.path.dirname(fname) | |
2139 | if not sys.path.count(dname): |
|
2140 | if not sys.path.count(dname): | |
2140 | sys.path.append(dname) |
|
2141 | sys.path.append(dname) | |
2141 |
|
2142 | |||
2142 | try: |
|
2143 | try: | |
2143 | xfile = open(fname) |
|
2144 | xfile = open(fname) | |
2144 | except: |
|
2145 | except: | |
2145 | print >> Term.cerr, \ |
|
2146 | print >> Term.cerr, \ | |
2146 | 'Could not open file <%s> for safe execution.' % fname |
|
2147 | 'Could not open file <%s> for safe execution.' % fname | |
2147 | return None |
|
2148 | return None | |
2148 |
|
2149 | |||
2149 | kw.setdefault('islog',0) |
|
2150 | kw.setdefault('islog',0) | |
2150 | kw.setdefault('quiet',1) |
|
2151 | kw.setdefault('quiet',1) | |
2151 | kw.setdefault('exit_ignore',0) |
|
2152 | kw.setdefault('exit_ignore',0) | |
2152 | first = xfile.readline() |
|
2153 | first = xfile.readline() | |
2153 | loghead = str(self.loghead_tpl).split('\n',1)[0].strip() |
|
2154 | loghead = str(self.loghead_tpl).split('\n',1)[0].strip() | |
2154 | xfile.close() |
|
2155 | xfile.close() | |
2155 | # line by line execution |
|
2156 | # line by line execution | |
2156 | if first.startswith(loghead) or kw['islog']: |
|
2157 | if first.startswith(loghead) or kw['islog']: | |
2157 | print 'Loading log file <%s> one line at a time...' % fname |
|
2158 | print 'Loading log file <%s> one line at a time...' % fname | |
2158 | if kw['quiet']: |
|
2159 | if kw['quiet']: | |
2159 | stdout_save = sys.stdout |
|
2160 | stdout_save = sys.stdout | |
2160 | sys.stdout = StringIO.StringIO() |
|
2161 | sys.stdout = StringIO.StringIO() | |
2161 | try: |
|
2162 | try: | |
2162 | globs,locs = where[0:2] |
|
2163 | globs,locs = where[0:2] | |
2163 | except: |
|
2164 | except: | |
2164 | try: |
|
2165 | try: | |
2165 | globs = locs = where[0] |
|
2166 | globs = locs = where[0] | |
2166 | except: |
|
2167 | except: | |
2167 | globs = locs = globals() |
|
2168 | globs = locs = globals() | |
2168 | badblocks = [] |
|
2169 | badblocks = [] | |
2169 |
|
2170 | |||
2170 | # we also need to identify indented blocks of code when replaying |
|
2171 | # we also need to identify indented blocks of code when replaying | |
2171 | # logs and put them together before passing them to an exec |
|
2172 | # logs and put them together before passing them to an exec | |
2172 | # statement. This takes a bit of regexp and look-ahead work in the |
|
2173 | # statement. This takes a bit of regexp and look-ahead work in the | |
2173 | # file. It's easiest if we swallow the whole thing in memory |
|
2174 | # file. It's easiest if we swallow the whole thing in memory | |
2174 | # first, and manually walk through the lines list moving the |
|
2175 | # first, and manually walk through the lines list moving the | |
2175 | # counter ourselves. |
|
2176 | # counter ourselves. | |
2176 | indent_re = re.compile('\s+\S') |
|
2177 | indent_re = re.compile('\s+\S') | |
2177 | xfile = open(fname) |
|
2178 | xfile = open(fname) | |
2178 | filelines = xfile.readlines() |
|
2179 | filelines = xfile.readlines() | |
2179 | xfile.close() |
|
2180 | xfile.close() | |
2180 | nlines = len(filelines) |
|
2181 | nlines = len(filelines) | |
2181 | lnum = 0 |
|
2182 | lnum = 0 | |
2182 | while lnum < nlines: |
|
2183 | while lnum < nlines: | |
2183 | line = filelines[lnum] |
|
2184 | line = filelines[lnum] | |
2184 | lnum += 1 |
|
2185 | lnum += 1 | |
2185 | # don't re-insert logger status info into cache |
|
2186 | # don't re-insert logger status info into cache | |
2186 | if line.startswith('#log#'): |
|
2187 | if line.startswith('#log#'): | |
2187 | continue |
|
2188 | continue | |
2188 | else: |
|
2189 | else: | |
2189 | # build a block of code (maybe a single line) for execution |
|
2190 | # build a block of code (maybe a single line) for execution | |
2190 | block = line |
|
2191 | block = line | |
2191 | try: |
|
2192 | try: | |
2192 | next = filelines[lnum] # lnum has already incremented |
|
2193 | next = filelines[lnum] # lnum has already incremented | |
2193 | except: |
|
2194 | except: | |
2194 | next = None |
|
2195 | next = None | |
2195 | while next and indent_re.match(next): |
|
2196 | while next and indent_re.match(next): | |
2196 | block += next |
|
2197 | block += next | |
2197 | lnum += 1 |
|
2198 | lnum += 1 | |
2198 | try: |
|
2199 | try: | |
2199 | next = filelines[lnum] |
|
2200 | next = filelines[lnum] | |
2200 | except: |
|
2201 | except: | |
2201 | next = None |
|
2202 | next = None | |
2202 | # now execute the block of one or more lines |
|
2203 | # now execute the block of one or more lines | |
2203 | try: |
|
2204 | try: | |
2204 | exec block in globs,locs |
|
2205 | exec block in globs,locs | |
2205 | except SystemExit: |
|
2206 | except SystemExit: | |
2206 | pass |
|
2207 | pass | |
2207 | except: |
|
2208 | except: | |
2208 | badblocks.append(block.rstrip()) |
|
2209 | badblocks.append(block.rstrip()) | |
2209 | if kw['quiet']: # restore stdout |
|
2210 | if kw['quiet']: # restore stdout | |
2210 | sys.stdout.close() |
|
2211 | sys.stdout.close() | |
2211 | sys.stdout = stdout_save |
|
2212 | sys.stdout = stdout_save | |
2212 | print 'Finished replaying log file <%s>' % fname |
|
2213 | print 'Finished replaying log file <%s>' % fname | |
2213 | if badblocks: |
|
2214 | if badblocks: | |
2214 | print >> sys.stderr, ('\nThe following lines/blocks in file ' |
|
2215 | print >> sys.stderr, ('\nThe following lines/blocks in file ' | |
2215 | '<%s> reported errors:' % fname) |
|
2216 | '<%s> reported errors:' % fname) | |
2216 |
|
2217 | |||
2217 | for badline in badblocks: |
|
2218 | for badline in badblocks: | |
2218 | print >> sys.stderr, badline |
|
2219 | print >> sys.stderr, badline | |
2219 | else: # regular file execution |
|
2220 | else: # regular file execution | |
2220 | try: |
|
2221 | try: | |
2221 | execfile(fname,*where) |
|
2222 | execfile(fname,*where) | |
2222 | except SyntaxError: |
|
2223 | except SyntaxError: | |
2223 | etype,evalue = sys.exc_info()[:2] |
|
2224 | etype,evalue = sys.exc_info()[:2] | |
2224 | self.SyntaxTB(etype,evalue,[]) |
|
2225 | self.SyntaxTB(etype,evalue,[]) | |
2225 | warn('Failure executing file: <%s>' % fname) |
|
2226 | warn('Failure executing file: <%s>' % fname) | |
2226 | except SystemExit,status: |
|
2227 | except SystemExit,status: | |
2227 | if not kw['exit_ignore']: |
|
2228 | if not kw['exit_ignore']: | |
2228 | self.InteractiveTB() |
|
2229 | self.InteractiveTB() | |
2229 | warn('Failure executing file: <%s>' % fname) |
|
2230 | warn('Failure executing file: <%s>' % fname) | |
2230 | except: |
|
2231 | except: | |
2231 | self.InteractiveTB() |
|
2232 | self.InteractiveTB() | |
2232 | warn('Failure executing file: <%s>' % fname) |
|
2233 | warn('Failure executing file: <%s>' % fname) | |
2233 |
|
2234 | |||
2234 | #************************* end of file <iplib.py> ***************************** |
|
2235 | #************************* end of file <iplib.py> ***************************** |
1 | NO CONTENT: modified file |
|
NO CONTENT: modified file | ||
The requested commit or file is too big and content was truncated. Show full diff |
General Comments 0
You need to be logged in to leave comments.
Login now