Show More
@@ -1,320 +1,321 | |||||
1 | # -*- coding: utf-8 -*- |
|
1 | # -*- coding: utf-8 -*- | |
2 | """ An ipython profile for zope and plone. |
|
2 | """ An ipython profile for zope and plone. | |
3 |
|
3 | |||
4 | Some ideas stolen from http://www.tomster.org. |
|
4 | Some ideas stolen from http://www.tomster.org. | |
5 |
|
5 | |||
6 |
|
6 | |||
7 | Authors |
|
7 | Authors | |
8 | ------- |
|
8 | ------- | |
9 | - Stefan Eletzhofer <stefan.eletzhofer@inquant.de> |
|
9 | - Stefan Eletzhofer <stefan.eletzhofer@inquant.de> | |
10 | """ |
|
10 | """ | |
11 |
|
11 | |||
12 | # File: ipy_profile_zope.py |
|
12 | # File: ipy_profile_zope.py | |
13 | # |
|
13 | # | |
14 | # Copyright (c) InQuant GmbH |
|
14 | # Copyright (c) InQuant GmbH | |
15 | # |
|
15 | # | |
16 | # |
|
16 | # | |
17 | # Distributed under the terms of the BSD License. The full license is in |
|
17 | # Distributed under the terms of the BSD License. The full license is in | |
18 | # the file COPYING, distributed as part of this software. |
|
18 | # the file COPYING, distributed as part of this software. | |
19 |
|
19 | |||
20 | from IPython import ipapi |
|
20 | from IPython import ipapi | |
21 | from IPython import Release |
|
21 | from IPython import Release | |
22 | from types import StringType |
|
22 | from types import StringType | |
23 | import sys |
|
23 | import sys | |
24 | import os |
|
24 | import os | |
25 | import textwrap |
|
25 | import textwrap | |
26 |
|
26 | |||
27 | # The import below effectively obsoletes your old-style ipythonrc[.ini], |
|
27 | # The import below effectively obsoletes your old-style ipythonrc[.ini], | |
28 | # so consider yourself warned! |
|
28 | # so consider yourself warned! | |
29 | # import ipy_defaults |
|
29 | # import ipy_defaults | |
30 |
|
30 | |||
31 | _marker = [] |
|
31 | _marker = [] | |
32 | def shasattr(obj, attr, acquire=False): |
|
32 | def shasattr(obj, attr, acquire=False): | |
33 | """ See Archetypes/utils.py |
|
33 | """ See Archetypes/utils.py | |
34 | """ |
|
34 | """ | |
35 | if not acquire: |
|
35 | if not acquire: | |
36 | obj = obj.aq_base |
|
36 | obj = obj.aq_base | |
37 | return getattr(obj, attr, _marker) is not _marker |
|
37 | return getattr(obj, attr, _marker) is not _marker | |
38 |
|
38 | |||
39 | class ZopeDebug(object): |
|
39 | class ZopeDebug(object): | |
40 | def __init__(self): |
|
40 | def __init__(self): | |
41 |
|
41 | |||
42 | self.instancehome = os.environ.get( "INSTANCE_HOME" ) |
|
42 | self.instancehome = os.environ.get( "INSTANCE_HOME" ) | |
43 |
|
43 | |||
44 | configfile = os.environ.get( "CONFIG_FILE" ) |
|
44 | configfile = os.environ.get( "CONFIG_FILE" ) | |
45 | if configfile is None and self.instancehome is not None: |
|
45 | if configfile is None and self.instancehome is not None: | |
46 | configfile = os.path.join( self.instancehome, "etc", "zope.conf" ) |
|
46 | configfile = os.path.join( self.instancehome, "etc", "zope.conf" ) | |
47 |
|
47 | |||
48 | if configfile is None: |
|
48 | if configfile is None: | |
49 | raise RuntimeError( "CONFIG_FILE env not set" ) |
|
49 | raise RuntimeError( "CONFIG_FILE env not set" ) | |
50 |
|
50 | |||
51 | print "CONFIG_FILE=", configfile |
|
51 | print "CONFIG_FILE=", configfile | |
52 | print "INSTANCE_HOME=", self.instancehome |
|
52 | print "INSTANCE_HOME=", self.instancehome | |
53 |
|
53 | |||
54 | self.configfile = configfile |
|
54 | self.configfile = configfile | |
55 |
|
55 | |||
56 | try: |
|
56 | try: | |
57 | from Zope2 import configure |
|
57 | from Zope2 import configure | |
58 | except ImportError: |
|
58 | except ImportError: | |
59 | from Zope import configure |
|
59 | from Zope import configure | |
60 |
|
60 | |||
61 | configure( configfile ) |
|
61 | configure( configfile ) | |
62 |
|
62 | |||
63 | try: |
|
63 | try: | |
64 | import Zope2 |
|
64 | import Zope2 | |
65 | app = Zope2.app() |
|
65 | app = Zope2.app() | |
66 | except ImportError: |
|
66 | except ImportError: | |
67 | import Zope |
|
67 | import Zope | |
68 | app = Zope.app() |
|
68 | app = Zope.app() | |
69 |
|
69 | |||
70 | from Testing.makerequest import makerequest |
|
70 | from Testing.makerequest import makerequest | |
71 | self.app = makerequest( app ) |
|
71 | self.app = makerequest( app ) | |
72 |
|
72 | |||
73 | try: |
|
73 | try: | |
74 | self._make_permissive() |
|
74 | self._make_permissive() | |
75 | print "Permissive security installed" |
|
75 | print "Permissive security installed" | |
76 | except: |
|
76 | except: | |
77 | print "Permissive security NOT installed" |
|
77 | print "Permissive security NOT installed" | |
78 |
|
78 | |||
79 | self._pwd = self.portal or self.app |
|
79 | self._pwd = self.portal or self.app | |
80 |
|
80 | |||
81 | try: |
|
81 | try: | |
82 | from zope.component import getSiteManager |
|
82 | from zope.component import getSiteManager | |
83 | from zope.component import getGlobalSiteManager |
|
83 | from zope.component import getGlobalSiteManager | |
84 | from zope.app.component.hooks import setSite |
|
84 | from zope.app.component.hooks import setSite | |
85 |
|
85 | |||
86 | if self.portal is not None: |
|
86 | if self.portal is not None: | |
87 | setSite( self.portal ) |
|
87 | setSite( self.portal ) | |
88 |
|
88 | |||
89 | gsm = getGlobalSiteManager() |
|
89 | gsm = getGlobalSiteManager() | |
90 | sm = getSiteManager() |
|
90 | sm = getSiteManager() | |
91 |
|
91 | |||
92 | if sm is gsm: |
|
92 | if sm is gsm: | |
93 | print "ERROR SETTING SITE!" |
|
93 | print "ERROR SETTING SITE!" | |
94 | except: |
|
94 | except: | |
95 | pass |
|
95 | pass | |
96 |
|
96 | |||
97 |
|
97 | |||
98 | @property |
|
98 | @property | |
99 | def utils(self): |
|
99 | def utils(self): | |
100 | class Utils(object): |
|
100 | class Utils(object): | |
101 | commit = self.commit |
|
101 | commit = self.commit | |
102 | sync = self.sync |
|
102 | sync = self.sync | |
103 | objectInfo = self.objectInfo |
|
103 | objectInfo = self.objectInfo | |
104 | ls = self.ls |
|
104 | ls = self.ls | |
105 | pwd = self.pwd |
|
105 | pwd = self.pwd | |
106 | cd = self.cd |
|
106 | cd = self.cd | |
107 | su = self.su |
|
107 | su = self.su | |
108 | getCatalogInfo = self.getCatalogInfo |
|
108 | getCatalogInfo = self.getCatalogInfo | |
109 |
|
109 | |||
110 | @property |
|
110 | @property | |
111 | def cwd(self): |
|
111 | def cwd(self): | |
112 | return self.pwd() |
|
112 | return self.pwd() | |
113 |
|
113 | |||
114 | return Utils() |
|
114 | return Utils() | |
115 |
|
115 | |||
116 | @property |
|
116 | @property | |
117 | def namespace(self): |
|
117 | def namespace(self): | |
118 | return dict( utils=self.utils, app=self.app, portal=self.portal ) |
|
118 | return dict( utils=self.utils, app=self.app, portal=self.portal ) | |
119 |
|
119 | |||
120 | @property |
|
120 | @property | |
121 | def portal(self): |
|
121 | def portal(self): | |
122 | portals = self.app.objectValues( "Plone Site" ) |
|
122 | portals = self.app.objectValues( "Plone Site" ) | |
123 | if len(portals): |
|
123 | if len(portals): | |
124 | return portals[0] |
|
124 | return portals[0] | |
125 | else: |
|
125 | else: | |
126 | raise KeyError( "No Plone Site found.") |
|
126 | raise KeyError( "No Plone Site found.") | |
127 |
|
127 | |||
128 | def pwd(self): |
|
128 | def pwd(self): | |
129 | return self._pwd |
|
129 | return self._pwd | |
130 |
|
130 | |||
131 | def _make_permissive(self): |
|
131 | def _make_permissive(self): | |
132 | """ |
|
132 | """ | |
133 | Make a permissive security manager with all rights. Hell, |
|
133 | Make a permissive security manager with all rights. Hell, | |
134 | we're developers, aren't we? Security is for whimps. :) |
|
134 | we're developers, aren't we? Security is for whimps. :) | |
135 | """ |
|
135 | """ | |
136 | from Products.CMFCore.tests.base.security import PermissiveSecurityPolicy |
|
136 | from Products.CMFCore.tests.base.security import PermissiveSecurityPolicy | |
137 | import AccessControl |
|
137 | import AccessControl | |
138 | from AccessControl.SecurityManagement import newSecurityManager |
|
138 | from AccessControl.SecurityManagement import newSecurityManager | |
139 | from AccessControl.SecurityManager import setSecurityPolicy |
|
139 | from AccessControl.SecurityManager import setSecurityPolicy | |
140 |
|
140 | |||
141 | _policy = PermissiveSecurityPolicy() |
|
141 | _policy = PermissiveSecurityPolicy() | |
142 | self.oldpolicy = setSecurityPolicy(_policy) |
|
142 | self.oldpolicy = setSecurityPolicy(_policy) | |
143 | newSecurityManager(None, AccessControl.User.system) |
|
143 | newSecurityManager(None, AccessControl.User.system) | |
144 |
|
144 | |||
145 | def su(self, username): |
|
145 | def su(self, username): | |
146 | """ Change to named user. |
|
146 | """ Change to named user. | |
147 | """ |
|
147 | """ | |
148 | # TODO Make it easy to change back to permissive security. |
|
148 | # TODO Make it easy to change back to permissive security. | |
149 | user = self.portal.acl_users.getUser(username) |
|
149 | user = self.portal.acl_users.getUser(username) | |
150 | if not user: |
|
150 | if not user: | |
151 | print "Can't find %s in %s" % (username, self.portal.acl_users) |
|
151 | print "Can't find %s in %s" % (username, self.portal.acl_users) | |
152 | return |
|
152 | return | |
153 |
|
153 | |||
154 | from AccessControl import ZopeSecurityPolicy |
|
154 | from AccessControl import ZopeSecurityPolicy | |
155 | import AccessControl |
|
155 | import AccessControl | |
156 | from AccessControl.SecurityManagement import newSecurityManager, getSecurityManager |
|
156 | from AccessControl.SecurityManagement import newSecurityManager, getSecurityManager | |
157 | from AccessControl.SecurityManager import setSecurityPolicy |
|
157 | from AccessControl.SecurityManager import setSecurityPolicy | |
158 |
|
158 | |||
159 | _policy = ZopeSecurityPolicy |
|
159 | _policy = ZopeSecurityPolicy | |
160 | self.oldpolicy = setSecurityPolicy(_policy) |
|
160 | self.oldpolicy = setSecurityPolicy(_policy) | |
161 | wrapped_user = user.__of__(self.portal.acl_users) |
|
161 | wrapped_user = user.__of__(self.portal.acl_users) | |
162 | newSecurityManager(None, user) |
|
162 | newSecurityManager(None, user) | |
163 | print 'User changed.' |
|
163 | print 'User changed.' | |
164 | return getSecurityManager().getUser() |
|
164 | return getSecurityManager().getUser() | |
165 |
|
165 | |||
166 | def getCatalogInfo(self, obj=None, catalog='portal_catalog', query=None, sort_on='created', sort_order='reverse' ): |
|
166 | def getCatalogInfo(self, obj=None, catalog='portal_catalog', query=None, sort_on='created', sort_order='reverse' ): | |
167 | """ Inspect portal_catalog. Pass an object or object id for a |
|
167 | """ Inspect portal_catalog. Pass an object or object id for a | |
168 | default query on that object, or pass an explicit query. |
|
168 | default query on that object, or pass an explicit query. | |
169 | """ |
|
169 | """ | |
170 | if obj and query: |
|
170 | if obj and query: | |
171 | print "Ignoring %s, using query." % obj |
|
171 | print "Ignoring %s, using query." % obj | |
172 |
|
172 | |||
173 | catalog = self.portal.get(catalog) |
|
173 | catalog = self.portal.get(catalog) | |
174 | if not catalog: |
|
174 | if not catalog: | |
175 | return 'No catalog' |
|
175 | return 'No catalog' | |
176 |
|
176 | |||
177 | indexes = catalog._catalog.indexes |
|
177 | indexes = catalog._catalog.indexes | |
178 | if not query: |
|
178 | if not query: | |
179 | if type(obj) is StringType: |
|
179 | if type(obj) is StringType: | |
180 | cwd = self.pwd() |
|
180 | cwd = self.pwd() | |
181 | obj = cwd.unrestrictedTraverse( obj ) |
|
181 | obj = cwd.unrestrictedTraverse( obj ) | |
182 | # If the default in the signature is mutable, its value will |
|
182 | # If the default in the signature is mutable, its value will | |
183 | # persist across invocations. |
|
183 | # persist across invocations. | |
184 | query = {} |
|
184 | query = {} | |
185 | if indexes.get('path'): |
|
185 | if indexes.get('path'): | |
186 | from string import join |
|
186 | from string import join | |
187 | path = join(obj.getPhysicalPath(), '/') |
|
187 | path = join(obj.getPhysicalPath(), '/') | |
188 | query.update({'path': path}) |
|
188 | query.update({'path': path}) | |
189 | if indexes.get('getID'): |
|
189 | if indexes.get('getID'): | |
190 | query.update({'getID': obj.id, }) |
|
190 | query.update({'getID': obj.id, }) | |
191 | if indexes.get('UID') and shasattr(obj, 'UID'): |
|
191 | if indexes.get('UID') and shasattr(obj, 'UID'): | |
192 | query.update({'UID': obj.UID(), }) |
|
192 | query.update({'UID': obj.UID(), }) | |
193 | if indexes.get(sort_on): |
|
193 | if indexes.get(sort_on): | |
194 | query.update({'sort_on': sort_on, 'sort_order': sort_order}) |
|
194 | query.update({'sort_on': sort_on, 'sort_order': sort_order}) | |
195 | if not query: |
|
195 | if not query: | |
196 | return 'Empty query' |
|
196 | return 'Empty query' | |
197 | results = catalog(**query) |
|
197 | results = catalog(**query) | |
198 |
|
198 | |||
199 | result_info = [] |
|
199 | result_info = [] | |
200 | for r in results: |
|
200 | for r in results: | |
201 | rid = r.getRID() |
|
201 | rid = r.getRID() | |
202 | if rid: |
|
202 | if rid: | |
203 | result_info.append( |
|
203 | result_info.append( | |
204 | {'path': catalog.getpath(rid), |
|
204 | {'path': catalog.getpath(rid), | |
205 | 'metadata': catalog.getMetadataForRID(rid), |
|
205 | 'metadata': catalog.getMetadataForRID(rid), | |
206 | 'indexes': catalog.getIndexDataForRID(rid), } |
|
206 | 'indexes': catalog.getIndexDataForRID(rid), } | |
207 | ) |
|
207 | ) | |
208 | else: |
|
208 | else: | |
209 | result_info.append({'missing': rid}) |
|
209 | result_info.append({'missing': rid}) | |
210 |
|
210 | |||
211 | if len(result_info) == 1: |
|
211 | if len(result_info) == 1: | |
212 | return result_info[0] |
|
212 | return result_info[0] | |
213 | return result_info |
|
213 | return result_info | |
214 |
|
214 | |||
215 | def commit(self): |
|
215 | def commit(self): | |
216 | """ |
|
216 | """ | |
217 | Commit the transaction. |
|
217 | Commit the transaction. | |
218 | """ |
|
218 | """ | |
219 | try: |
|
219 | try: | |
220 | import transaction |
|
220 | import transaction | |
221 | transaction.get().commit() |
|
221 | transaction.get().commit() | |
222 | except ImportError: |
|
222 | except ImportError: | |
223 | get_transaction().commit() |
|
223 | get_transaction().commit() | |
224 |
|
224 | |||
225 | def sync(self): |
|
225 | def sync(self): | |
226 | """ |
|
226 | """ | |
227 | Sync the app's view of the zodb. |
|
227 | Sync the app's view of the zodb. | |
228 | """ |
|
228 | """ | |
229 | self.app._p_jar.sync() |
|
229 | self.app._p_jar.sync() | |
230 |
|
230 | |||
231 | def objectInfo( self, o ): |
|
231 | def objectInfo( self, o ): | |
232 | """ |
|
232 | """ | |
233 | Return a descriptive string of an object |
|
233 | Return a descriptive string of an object | |
234 | """ |
|
234 | """ | |
235 | Title = "" |
|
235 | Title = "" | |
236 | t = getattr( o, 'Title', None ) |
|
236 | t = getattr( o, 'Title', None ) | |
237 | if t: |
|
237 | if t: | |
238 | Title = t() |
|
238 | Title = t() | |
239 | return {'id': o.getId(), |
|
239 | return {'id': o.getId(), | |
240 | 'Title': Title, |
|
240 | 'Title': Title, | |
241 | 'portal_type': getattr( o, 'portal_type', o.meta_type), |
|
241 | 'portal_type': getattr( o, 'portal_type', o.meta_type), | |
242 | 'folderish': o.isPrincipiaFolderish |
|
242 | 'folderish': o.isPrincipiaFolderish | |
243 | } |
|
243 | } | |
244 |
|
244 | |||
245 | def cd( self, path ): |
|
245 | def cd( self, path ): | |
246 | """ |
|
246 | """ | |
247 | Change current dir to a specific folder. |
|
247 | Change current dir to a specific folder. | |
248 |
|
248 | |||
249 | cd( ".." ) |
|
249 | cd( ".." ) | |
250 | cd( "/plone/Members/admin" ) |
|
250 | cd( "/plone/Members/admin" ) | |
251 | cd( portal.Members.admin ) |
|
251 | cd( portal.Members.admin ) | |
252 | etc. |
|
252 | etc. | |
253 | """ |
|
253 | """ | |
254 | if type(path) is not StringType: |
|
254 | if type(path) is not StringType: | |
255 | path = '/'.join(path.getPhysicalPath()) |
|
255 | path = '/'.join(path.getPhysicalPath()) | |
256 | cwd = self.pwd() |
|
256 | cwd = self.pwd() | |
257 | x = cwd.unrestrictedTraverse( path ) |
|
257 | x = cwd.unrestrictedTraverse( path ) | |
258 | if x is None: |
|
258 | if x is None: | |
259 | raise KeyError( "Can't cd to %s" % path ) |
|
259 | raise KeyError( "Can't cd to %s" % path ) | |
260 |
|
260 | |||
261 | print "%s -> %s" % ( self.pwd().getId(), x.getId() ) |
|
261 | print "%s -> %s" % ( self.pwd().getId(), x.getId() ) | |
262 | self._pwd = x |
|
262 | self._pwd = x | |
263 |
|
263 | |||
264 | def ls( self, x=None ): |
|
264 | def ls( self, x=None ): | |
265 | """ |
|
265 | """ | |
266 | List object(s) |
|
266 | List object(s) | |
267 | """ |
|
267 | """ | |
268 | if type(x) is StringType: |
|
268 | if type(x) is StringType: | |
269 | cwd = self.pwd() |
|
269 | cwd = self.pwd() | |
270 | x = cwd.unrestrictedTraverse( x ) |
|
270 | x = cwd.unrestrictedTraverse( x ) | |
271 | if x is None: |
|
271 | if x is None: | |
272 | x = self.pwd() |
|
272 | x = self.pwd() | |
273 | if x.isPrincipiaFolderish: |
|
273 | if x.isPrincipiaFolderish: | |
274 | return [self.objectInfo(o) for id, o in x.objectItems()] |
|
274 | return [self.objectInfo(o) for id, o in x.objectItems()] | |
275 | else: |
|
275 | else: | |
276 | return self.objectInfo( x ) |
|
276 | return self.objectInfo( x ) | |
277 |
|
277 | |||
278 | zope_debug = None |
|
278 | zope_debug = None | |
279 |
|
279 | |||
280 | def ipy_set_trace(): |
|
280 | def ipy_set_trace(): | |
281 | import IPython; IPython.Debugger.Pdb().set_trace() |
|
281 | from IPython.core import debugger | |
|
282 | debugger.Pdb().set_trace() | |||
282 |
|
283 | |||
283 | def main(): |
|
284 | def main(): | |
284 | global zope_debug |
|
285 | global zope_debug | |
285 | ip = ipapi.get() |
|
286 | ip = ipapi.get() | |
286 | o = ip.options |
|
287 | o = ip.options | |
287 | # autocall to "full" mode (smart mode is default, I like full mode) |
|
288 | # autocall to "full" mode (smart mode is default, I like full mode) | |
288 |
|
289 | |||
289 | SOFTWARE_HOME = os.environ.get( "SOFTWARE_HOME" ) |
|
290 | SOFTWARE_HOME = os.environ.get( "SOFTWARE_HOME" ) | |
290 | sys.path.append( SOFTWARE_HOME ) |
|
291 | sys.path.append( SOFTWARE_HOME ) | |
291 | print "SOFTWARE_HOME=%s\n" % SOFTWARE_HOME |
|
292 | print "SOFTWARE_HOME=%s\n" % SOFTWARE_HOME | |
292 |
|
293 | |||
293 | zope_debug = ZopeDebug() |
|
294 | zope_debug = ZopeDebug() | |
294 |
|
295 | |||
295 | # <HACK ALERT> |
|
296 | # <HACK ALERT> | |
296 | import pdb; |
|
297 | import pdb; | |
297 | pdb.set_trace = ipy_set_trace |
|
298 | pdb.set_trace = ipy_set_trace | |
298 | # </HACK ALERT> |
|
299 | # </HACK ALERT> | |
299 |
|
300 | |||
300 | # I like my banner minimal. |
|
301 | # I like my banner minimal. | |
301 | o.banner = "ZOPE Py %s IPy %s\n" % (sys.version.split('\n')[0],Release.version) |
|
302 | o.banner = "ZOPE Py %s IPy %s\n" % (sys.version.split('\n')[0],Release.version) | |
302 |
|
303 | |||
303 | print textwrap.dedent("""\ |
|
304 | print textwrap.dedent("""\ | |
304 | ZOPE mode iPython shell. |
|
305 | ZOPE mode iPython shell. | |
305 |
|
306 | |||
306 | Bound names: |
|
307 | Bound names: | |
307 | app |
|
308 | app | |
308 | portal |
|
309 | portal | |
309 | utils.{ %s } |
|
310 | utils.{ %s } | |
310 |
|
311 | |||
311 | Uses the $SOFTWARE_HOME and $CONFIG_FILE environment |
|
312 | Uses the $SOFTWARE_HOME and $CONFIG_FILE environment | |
312 | variables. |
|
313 | variables. | |
313 | """ % ( ",".join([ x for x in dir(zope_debug.utils) if not x.startswith("_") ] ) ) ) |
|
314 | """ % ( ",".join([ x for x in dir(zope_debug.utils) if not x.startswith("_") ] ) ) ) | |
314 |
|
315 | |||
315 |
|
316 | |||
316 | ip.user_ns.update( zope_debug.namespace ) |
|
317 | ip.user_ns.update( zope_debug.namespace ) | |
317 |
|
318 | |||
318 |
|
319 | |||
319 | main() |
|
320 | main() | |
320 | # vim: set ft=python ts=4 sw=4 expandtab : |
|
321 | # vim: set ft=python ts=4 sw=4 expandtab : |
@@ -1,31 +1,31 | |||||
1 | import inspect |
|
1 | import inspect | |
2 | import IPython.ipapi |
|
2 | import IPython.ipapi | |
3 | from IPython.genutils import arg_split |
|
3 | from IPython.genutils import arg_split | |
4 | ip = IPython.ipapi.get() |
|
4 | ip = IPython.ipapi.get() | |
5 |
|
5 | |||
6 |
from IPython import |
|
6 | from IPython.core import debugger | |
7 |
|
7 | |||
8 | def call_pydb(self, args): |
|
8 | def call_pydb(self, args): | |
9 | """Invoke pydb with the supplied parameters.""" |
|
9 | """Invoke pydb with the supplied parameters.""" | |
10 | try: |
|
10 | try: | |
11 | import pydb |
|
11 | import pydb | |
12 | except ImportError: |
|
12 | except ImportError: | |
13 | raise ImportError("pydb doesn't seem to be installed.") |
|
13 | raise ImportError("pydb doesn't seem to be installed.") | |
14 |
|
14 | |||
15 | if not hasattr(pydb.pydb, "runv"): |
|
15 | if not hasattr(pydb.pydb, "runv"): | |
16 | raise ImportError("You need pydb version 1.19 or later installed.") |
|
16 | raise ImportError("You need pydb version 1.19 or later installed.") | |
17 |
|
17 | |||
18 | argl = arg_split(args) |
|
18 | argl = arg_split(args) | |
19 | # print argl # dbg |
|
19 | # print argl # dbg | |
20 | if len(inspect.getargspec(pydb.runv)[0]) == 2: |
|
20 | if len(inspect.getargspec(pydb.runv)[0]) == 2: | |
21 |
pdb = |
|
21 | pdb = debugger.Pdb(color_scheme=self.rc.colors) | |
22 | ip.IP.history_saving_wrapper( lambda : pydb.runv(argl, pdb) )() |
|
22 | ip.IP.history_saving_wrapper( lambda : pydb.runv(argl, pdb) )() | |
23 | else: |
|
23 | else: | |
24 | ip.IP.history_saving_wrapper( lambda : pydb.runv(argl) )() |
|
24 | ip.IP.history_saving_wrapper( lambda : pydb.runv(argl) )() | |
25 |
|
25 | |||
26 |
|
26 | |||
27 | ip.expose_magic("pydb",call_pydb) |
|
27 | ip.expose_magic("pydb",call_pydb) | |
28 |
|
28 | |||
29 |
|
29 | |||
30 |
|
30 | |||
31 |
|
31 |
@@ -1,3456 +1,3457 | |||||
1 | # -*- coding: utf-8 -*- |
|
1 | # -*- coding: utf-8 -*- | |
2 | """Magic functions for InteractiveShell. |
|
2 | """Magic functions for InteractiveShell. | |
3 | """ |
|
3 | """ | |
4 |
|
4 | |||
5 | #***************************************************************************** |
|
5 | #***************************************************************************** | |
6 | # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and |
|
6 | # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and | |
7 | # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu> |
|
7 | # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu> | |
8 | # |
|
8 | # | |
9 | # Distributed under the terms of the BSD License. The full license is in |
|
9 | # Distributed under the terms of the BSD License. The full license is in | |
10 | # the file COPYING, distributed as part of this software. |
|
10 | # the file COPYING, distributed as part of this software. | |
11 | #***************************************************************************** |
|
11 | #***************************************************************************** | |
12 |
|
12 | |||
13 | #**************************************************************************** |
|
13 | #**************************************************************************** | |
14 | # Modules and globals |
|
14 | # Modules and globals | |
15 |
|
15 | |||
16 | # Python standard modules |
|
16 | # Python standard modules | |
17 | import __builtin__ |
|
17 | import __builtin__ | |
18 | import bdb |
|
18 | import bdb | |
19 | import inspect |
|
19 | import inspect | |
20 | import os |
|
20 | import os | |
21 | import pdb |
|
21 | import pdb | |
22 | import pydoc |
|
22 | import pydoc | |
23 | import sys |
|
23 | import sys | |
24 | import re |
|
24 | import re | |
25 | import tempfile |
|
25 | import tempfile | |
26 | import time |
|
26 | import time | |
27 | import cPickle as pickle |
|
27 | import cPickle as pickle | |
28 | import textwrap |
|
28 | import textwrap | |
29 | from cStringIO import StringIO |
|
29 | from cStringIO import StringIO | |
30 | from getopt import getopt,GetoptError |
|
30 | from getopt import getopt,GetoptError | |
31 | from pprint import pprint, pformat |
|
31 | from pprint import pprint, pformat | |
32 |
|
32 | |||
33 | # cProfile was added in Python2.5 |
|
33 | # cProfile was added in Python2.5 | |
34 | try: |
|
34 | try: | |
35 | import cProfile as profile |
|
35 | import cProfile as profile | |
36 | import pstats |
|
36 | import pstats | |
37 | except ImportError: |
|
37 | except ImportError: | |
38 | # profile isn't bundled by default in Debian for license reasons |
|
38 | # profile isn't bundled by default in Debian for license reasons | |
39 | try: |
|
39 | try: | |
40 | import profile,pstats |
|
40 | import profile,pstats | |
41 | except ImportError: |
|
41 | except ImportError: | |
42 | profile = pstats = None |
|
42 | profile = pstats = None | |
43 |
|
43 | |||
44 | # Homebrewed |
|
44 | # Homebrewed | |
45 | import IPython |
|
45 | import IPython | |
46 |
from IPython import |
|
46 | from IPython import OInspect, wildcard | |
|
47 | from IPython.core import debugger | |||
47 | from IPython.FakeModule import FakeModule |
|
48 | from IPython.FakeModule import FakeModule | |
48 | from IPython.Itpl import Itpl, itpl, printpl,itplns |
|
49 | from IPython.Itpl import Itpl, itpl, printpl,itplns | |
49 | from IPython.PyColorize import Parser |
|
50 | from IPython.PyColorize import Parser | |
50 | from IPython.ipstruct import Struct |
|
51 | from IPython.ipstruct import Struct | |
51 | from IPython.macro import Macro |
|
52 | from IPython.macro import Macro | |
52 | from IPython.genutils import * |
|
53 | from IPython.genutils import * | |
53 | from IPython import platutils |
|
54 | from IPython import platutils | |
54 | import IPython.generics |
|
55 | import IPython.generics | |
55 | import IPython.ipapi |
|
56 | import IPython.ipapi | |
56 | from IPython.ipapi import UsageError |
|
57 | from IPython.ipapi import UsageError | |
57 | from IPython.testing import decorators as testdec |
|
58 | from IPython.testing import decorators as testdec | |
58 |
|
59 | |||
59 | #*************************************************************************** |
|
60 | #*************************************************************************** | |
60 | # Utility functions |
|
61 | # Utility functions | |
61 | def on_off(tag): |
|
62 | def on_off(tag): | |
62 | """Return an ON/OFF string for a 1/0 input. Simple utility function.""" |
|
63 | """Return an ON/OFF string for a 1/0 input. Simple utility function.""" | |
63 | return ['OFF','ON'][tag] |
|
64 | return ['OFF','ON'][tag] | |
64 |
|
65 | |||
65 | class Bunch: pass |
|
66 | class Bunch: pass | |
66 |
|
67 | |||
67 | def compress_dhist(dh): |
|
68 | def compress_dhist(dh): | |
68 | head, tail = dh[:-10], dh[-10:] |
|
69 | head, tail = dh[:-10], dh[-10:] | |
69 |
|
70 | |||
70 | newhead = [] |
|
71 | newhead = [] | |
71 | done = set() |
|
72 | done = set() | |
72 | for h in head: |
|
73 | for h in head: | |
73 | if h in done: |
|
74 | if h in done: | |
74 | continue |
|
75 | continue | |
75 | newhead.append(h) |
|
76 | newhead.append(h) | |
76 | done.add(h) |
|
77 | done.add(h) | |
77 |
|
78 | |||
78 | return newhead + tail |
|
79 | return newhead + tail | |
79 |
|
80 | |||
80 |
|
81 | |||
81 | #*************************************************************************** |
|
82 | #*************************************************************************** | |
82 | # Main class implementing Magic functionality |
|
83 | # Main class implementing Magic functionality | |
83 | class Magic: |
|
84 | class Magic: | |
84 | """Magic functions for InteractiveShell. |
|
85 | """Magic functions for InteractiveShell. | |
85 |
|
86 | |||
86 | Shell functions which can be reached as %function_name. All magic |
|
87 | Shell functions which can be reached as %function_name. All magic | |
87 | functions should accept a string, which they can parse for their own |
|
88 | functions should accept a string, which they can parse for their own | |
88 | needs. This can make some functions easier to type, eg `%cd ../` |
|
89 | needs. This can make some functions easier to type, eg `%cd ../` | |
89 | vs. `%cd("../")` |
|
90 | vs. `%cd("../")` | |
90 |
|
91 | |||
91 | ALL definitions MUST begin with the prefix magic_. The user won't need it |
|
92 | ALL definitions MUST begin with the prefix magic_. The user won't need it | |
92 | at the command line, but it is is needed in the definition. """ |
|
93 | at the command line, but it is is needed in the definition. """ | |
93 |
|
94 | |||
94 | # class globals |
|
95 | # class globals | |
95 | auto_status = ['Automagic is OFF, % prefix IS needed for magic functions.', |
|
96 | auto_status = ['Automagic is OFF, % prefix IS needed for magic functions.', | |
96 | 'Automagic is ON, % prefix NOT needed for magic functions.'] |
|
97 | 'Automagic is ON, % prefix NOT needed for magic functions.'] | |
97 |
|
98 | |||
98 | #...................................................................... |
|
99 | #...................................................................... | |
99 | # some utility functions |
|
100 | # some utility functions | |
100 |
|
101 | |||
101 | def __init__(self,shell): |
|
102 | def __init__(self,shell): | |
102 |
|
103 | |||
103 | self.options_table = {} |
|
104 | self.options_table = {} | |
104 | if profile is None: |
|
105 | if profile is None: | |
105 | self.magic_prun = self.profile_missing_notice |
|
106 | self.magic_prun = self.profile_missing_notice | |
106 | self.shell = shell |
|
107 | self.shell = shell | |
107 |
|
108 | |||
108 | # namespace for holding state we may need |
|
109 | # namespace for holding state we may need | |
109 | self._magic_state = Bunch() |
|
110 | self._magic_state = Bunch() | |
110 |
|
111 | |||
111 | def profile_missing_notice(self, *args, **kwargs): |
|
112 | def profile_missing_notice(self, *args, **kwargs): | |
112 | error("""\ |
|
113 | error("""\ | |
113 | The profile module could not be found. It has been removed from the standard |
|
114 | The profile module could not be found. It has been removed from the standard | |
114 | python packages because of its non-free license. To use profiling, install the |
|
115 | python packages because of its non-free license. To use profiling, install the | |
115 | python-profiler package from non-free.""") |
|
116 | python-profiler package from non-free.""") | |
116 |
|
117 | |||
117 | def default_option(self,fn,optstr): |
|
118 | def default_option(self,fn,optstr): | |
118 | """Make an entry in the options_table for fn, with value optstr""" |
|
119 | """Make an entry in the options_table for fn, with value optstr""" | |
119 |
|
120 | |||
120 | if fn not in self.lsmagic(): |
|
121 | if fn not in self.lsmagic(): | |
121 | error("%s is not a magic function" % fn) |
|
122 | error("%s is not a magic function" % fn) | |
122 | self.options_table[fn] = optstr |
|
123 | self.options_table[fn] = optstr | |
123 |
|
124 | |||
124 | def lsmagic(self): |
|
125 | def lsmagic(self): | |
125 | """Return a list of currently available magic functions. |
|
126 | """Return a list of currently available magic functions. | |
126 |
|
127 | |||
127 | Gives a list of the bare names after mangling (['ls','cd', ...], not |
|
128 | Gives a list of the bare names after mangling (['ls','cd', ...], not | |
128 | ['magic_ls','magic_cd',...]""" |
|
129 | ['magic_ls','magic_cd',...]""" | |
129 |
|
130 | |||
130 | # FIXME. This needs a cleanup, in the way the magics list is built. |
|
131 | # FIXME. This needs a cleanup, in the way the magics list is built. | |
131 |
|
132 | |||
132 | # magics in class definition |
|
133 | # magics in class definition | |
133 | class_magic = lambda fn: fn.startswith('magic_') and \ |
|
134 | class_magic = lambda fn: fn.startswith('magic_') and \ | |
134 | callable(Magic.__dict__[fn]) |
|
135 | callable(Magic.__dict__[fn]) | |
135 | # in instance namespace (run-time user additions) |
|
136 | # in instance namespace (run-time user additions) | |
136 | inst_magic = lambda fn: fn.startswith('magic_') and \ |
|
137 | inst_magic = lambda fn: fn.startswith('magic_') and \ | |
137 | callable(self.__dict__[fn]) |
|
138 | callable(self.__dict__[fn]) | |
138 | # and bound magics by user (so they can access self): |
|
139 | # and bound magics by user (so they can access self): | |
139 | inst_bound_magic = lambda fn: fn.startswith('magic_') and \ |
|
140 | inst_bound_magic = lambda fn: fn.startswith('magic_') and \ | |
140 | callable(self.__class__.__dict__[fn]) |
|
141 | callable(self.__class__.__dict__[fn]) | |
141 | magics = filter(class_magic,Magic.__dict__.keys()) + \ |
|
142 | magics = filter(class_magic,Magic.__dict__.keys()) + \ | |
142 | filter(inst_magic,self.__dict__.keys()) + \ |
|
143 | filter(inst_magic,self.__dict__.keys()) + \ | |
143 | filter(inst_bound_magic,self.__class__.__dict__.keys()) |
|
144 | filter(inst_bound_magic,self.__class__.__dict__.keys()) | |
144 | out = [] |
|
145 | out = [] | |
145 | for fn in set(magics): |
|
146 | for fn in set(magics): | |
146 | out.append(fn.replace('magic_','',1)) |
|
147 | out.append(fn.replace('magic_','',1)) | |
147 | out.sort() |
|
148 | out.sort() | |
148 | return out |
|
149 | return out | |
149 |
|
150 | |||
150 | def extract_input_slices(self,slices,raw=False): |
|
151 | def extract_input_slices(self,slices,raw=False): | |
151 | """Return as a string a set of input history slices. |
|
152 | """Return as a string a set of input history slices. | |
152 |
|
153 | |||
153 | Inputs: |
|
154 | Inputs: | |
154 |
|
155 | |||
155 | - slices: the set of slices is given as a list of strings (like |
|
156 | - slices: the set of slices is given as a list of strings (like | |
156 | ['1','4:8','9'], since this function is for use by magic functions |
|
157 | ['1','4:8','9'], since this function is for use by magic functions | |
157 | which get their arguments as strings. |
|
158 | which get their arguments as strings. | |
158 |
|
159 | |||
159 | Optional inputs: |
|
160 | Optional inputs: | |
160 |
|
161 | |||
161 | - raw(False): by default, the processed input is used. If this is |
|
162 | - raw(False): by default, the processed input is used. If this is | |
162 | true, the raw input history is used instead. |
|
163 | true, the raw input history is used instead. | |
163 |
|
164 | |||
164 | Note that slices can be called with two notations: |
|
165 | Note that slices can be called with two notations: | |
165 |
|
166 | |||
166 | N:M -> standard python form, means including items N...(M-1). |
|
167 | N:M -> standard python form, means including items N...(M-1). | |
167 |
|
168 | |||
168 | N-M -> include items N..M (closed endpoint).""" |
|
169 | N-M -> include items N..M (closed endpoint).""" | |
169 |
|
170 | |||
170 | if raw: |
|
171 | if raw: | |
171 | hist = self.shell.input_hist_raw |
|
172 | hist = self.shell.input_hist_raw | |
172 | else: |
|
173 | else: | |
173 | hist = self.shell.input_hist |
|
174 | hist = self.shell.input_hist | |
174 |
|
175 | |||
175 | cmds = [] |
|
176 | cmds = [] | |
176 | for chunk in slices: |
|
177 | for chunk in slices: | |
177 | if ':' in chunk: |
|
178 | if ':' in chunk: | |
178 | ini,fin = map(int,chunk.split(':')) |
|
179 | ini,fin = map(int,chunk.split(':')) | |
179 | elif '-' in chunk: |
|
180 | elif '-' in chunk: | |
180 | ini,fin = map(int,chunk.split('-')) |
|
181 | ini,fin = map(int,chunk.split('-')) | |
181 | fin += 1 |
|
182 | fin += 1 | |
182 | else: |
|
183 | else: | |
183 | ini = int(chunk) |
|
184 | ini = int(chunk) | |
184 | fin = ini+1 |
|
185 | fin = ini+1 | |
185 | cmds.append(hist[ini:fin]) |
|
186 | cmds.append(hist[ini:fin]) | |
186 | return cmds |
|
187 | return cmds | |
187 |
|
188 | |||
188 | def _ofind(self, oname, namespaces=None): |
|
189 | def _ofind(self, oname, namespaces=None): | |
189 | """Find an object in the available namespaces. |
|
190 | """Find an object in the available namespaces. | |
190 |
|
191 | |||
191 | self._ofind(oname) -> dict with keys: found,obj,ospace,ismagic |
|
192 | self._ofind(oname) -> dict with keys: found,obj,ospace,ismagic | |
192 |
|
193 | |||
193 | Has special code to detect magic functions. |
|
194 | Has special code to detect magic functions. | |
194 | """ |
|
195 | """ | |
195 |
|
196 | |||
196 | oname = oname.strip() |
|
197 | oname = oname.strip() | |
197 |
|
198 | |||
198 | alias_ns = None |
|
199 | alias_ns = None | |
199 | if namespaces is None: |
|
200 | if namespaces is None: | |
200 | # Namespaces to search in: |
|
201 | # Namespaces to search in: | |
201 | # Put them in a list. The order is important so that we |
|
202 | # Put them in a list. The order is important so that we | |
202 | # find things in the same order that Python finds them. |
|
203 | # find things in the same order that Python finds them. | |
203 | namespaces = [ ('Interactive', self.shell.user_ns), |
|
204 | namespaces = [ ('Interactive', self.shell.user_ns), | |
204 | ('IPython internal', self.shell.internal_ns), |
|
205 | ('IPython internal', self.shell.internal_ns), | |
205 | ('Python builtin', __builtin__.__dict__), |
|
206 | ('Python builtin', __builtin__.__dict__), | |
206 | ('Alias', self.shell.alias_table), |
|
207 | ('Alias', self.shell.alias_table), | |
207 | ] |
|
208 | ] | |
208 | alias_ns = self.shell.alias_table |
|
209 | alias_ns = self.shell.alias_table | |
209 |
|
210 | |||
210 | # initialize results to 'null' |
|
211 | # initialize results to 'null' | |
211 | found = 0; obj = None; ospace = None; ds = None; |
|
212 | found = 0; obj = None; ospace = None; ds = None; | |
212 | ismagic = 0; isalias = 0; parent = None |
|
213 | ismagic = 0; isalias = 0; parent = None | |
213 |
|
214 | |||
214 | # Look for the given name by splitting it in parts. If the head is |
|
215 | # Look for the given name by splitting it in parts. If the head is | |
215 | # found, then we look for all the remaining parts as members, and only |
|
216 | # found, then we look for all the remaining parts as members, and only | |
216 | # declare success if we can find them all. |
|
217 | # declare success if we can find them all. | |
217 | oname_parts = oname.split('.') |
|
218 | oname_parts = oname.split('.') | |
218 | oname_head, oname_rest = oname_parts[0],oname_parts[1:] |
|
219 | oname_head, oname_rest = oname_parts[0],oname_parts[1:] | |
219 | for nsname,ns in namespaces: |
|
220 | for nsname,ns in namespaces: | |
220 | try: |
|
221 | try: | |
221 | obj = ns[oname_head] |
|
222 | obj = ns[oname_head] | |
222 | except KeyError: |
|
223 | except KeyError: | |
223 | continue |
|
224 | continue | |
224 | else: |
|
225 | else: | |
225 | #print 'oname_rest:', oname_rest # dbg |
|
226 | #print 'oname_rest:', oname_rest # dbg | |
226 | for part in oname_rest: |
|
227 | for part in oname_rest: | |
227 | try: |
|
228 | try: | |
228 | parent = obj |
|
229 | parent = obj | |
229 | obj = getattr(obj,part) |
|
230 | obj = getattr(obj,part) | |
230 | except: |
|
231 | except: | |
231 | # Blanket except b/c some badly implemented objects |
|
232 | # Blanket except b/c some badly implemented objects | |
232 | # allow __getattr__ to raise exceptions other than |
|
233 | # allow __getattr__ to raise exceptions other than | |
233 | # AttributeError, which then crashes IPython. |
|
234 | # AttributeError, which then crashes IPython. | |
234 | break |
|
235 | break | |
235 | else: |
|
236 | else: | |
236 | # If we finish the for loop (no break), we got all members |
|
237 | # If we finish the for loop (no break), we got all members | |
237 | found = 1 |
|
238 | found = 1 | |
238 | ospace = nsname |
|
239 | ospace = nsname | |
239 | if ns == alias_ns: |
|
240 | if ns == alias_ns: | |
240 | isalias = 1 |
|
241 | isalias = 1 | |
241 | break # namespace loop |
|
242 | break # namespace loop | |
242 |
|
243 | |||
243 | # Try to see if it's magic |
|
244 | # Try to see if it's magic | |
244 | if not found: |
|
245 | if not found: | |
245 | if oname.startswith(self.shell.ESC_MAGIC): |
|
246 | if oname.startswith(self.shell.ESC_MAGIC): | |
246 | oname = oname[1:] |
|
247 | oname = oname[1:] | |
247 | obj = getattr(self,'magic_'+oname,None) |
|
248 | obj = getattr(self,'magic_'+oname,None) | |
248 | if obj is not None: |
|
249 | if obj is not None: | |
249 | found = 1 |
|
250 | found = 1 | |
250 | ospace = 'IPython internal' |
|
251 | ospace = 'IPython internal' | |
251 | ismagic = 1 |
|
252 | ismagic = 1 | |
252 |
|
253 | |||
253 | # Last try: special-case some literals like '', [], {}, etc: |
|
254 | # Last try: special-case some literals like '', [], {}, etc: | |
254 | if not found and oname_head in ["''",'""','[]','{}','()']: |
|
255 | if not found and oname_head in ["''",'""','[]','{}','()']: | |
255 | obj = eval(oname_head) |
|
256 | obj = eval(oname_head) | |
256 | found = 1 |
|
257 | found = 1 | |
257 | ospace = 'Interactive' |
|
258 | ospace = 'Interactive' | |
258 |
|
259 | |||
259 | return {'found':found, 'obj':obj, 'namespace':ospace, |
|
260 | return {'found':found, 'obj':obj, 'namespace':ospace, | |
260 | 'ismagic':ismagic, 'isalias':isalias, 'parent':parent} |
|
261 | 'ismagic':ismagic, 'isalias':isalias, 'parent':parent} | |
261 |
|
262 | |||
262 | def arg_err(self,func): |
|
263 | def arg_err(self,func): | |
263 | """Print docstring if incorrect arguments were passed""" |
|
264 | """Print docstring if incorrect arguments were passed""" | |
264 | print 'Error in arguments:' |
|
265 | print 'Error in arguments:' | |
265 | print OInspect.getdoc(func) |
|
266 | print OInspect.getdoc(func) | |
266 |
|
267 | |||
267 | def format_latex(self,strng): |
|
268 | def format_latex(self,strng): | |
268 | """Format a string for latex inclusion.""" |
|
269 | """Format a string for latex inclusion.""" | |
269 |
|
270 | |||
270 | # Characters that need to be escaped for latex: |
|
271 | # Characters that need to be escaped for latex: | |
271 | escape_re = re.compile(r'(%|_|\$|#|&)',re.MULTILINE) |
|
272 | escape_re = re.compile(r'(%|_|\$|#|&)',re.MULTILINE) | |
272 | # Magic command names as headers: |
|
273 | # Magic command names as headers: | |
273 | cmd_name_re = re.compile(r'^(%s.*?):' % self.shell.ESC_MAGIC, |
|
274 | cmd_name_re = re.compile(r'^(%s.*?):' % self.shell.ESC_MAGIC, | |
274 | re.MULTILINE) |
|
275 | re.MULTILINE) | |
275 | # Magic commands |
|
276 | # Magic commands | |
276 | cmd_re = re.compile(r'(?P<cmd>%s.+?\b)(?!\}\}:)' % self.shell.ESC_MAGIC, |
|
277 | cmd_re = re.compile(r'(?P<cmd>%s.+?\b)(?!\}\}:)' % self.shell.ESC_MAGIC, | |
277 | re.MULTILINE) |
|
278 | re.MULTILINE) | |
278 | # Paragraph continue |
|
279 | # Paragraph continue | |
279 | par_re = re.compile(r'\\$',re.MULTILINE) |
|
280 | par_re = re.compile(r'\\$',re.MULTILINE) | |
280 |
|
281 | |||
281 | # The "\n" symbol |
|
282 | # The "\n" symbol | |
282 | newline_re = re.compile(r'\\n') |
|
283 | newline_re = re.compile(r'\\n') | |
283 |
|
284 | |||
284 | # Now build the string for output: |
|
285 | # Now build the string for output: | |
285 | #strng = cmd_name_re.sub(r'\n\\texttt{\\textsl{\\large \1}}:',strng) |
|
286 | #strng = cmd_name_re.sub(r'\n\\texttt{\\textsl{\\large \1}}:',strng) | |
286 | strng = cmd_name_re.sub(r'\n\\bigskip\n\\texttt{\\textbf{ \1}}:', |
|
287 | strng = cmd_name_re.sub(r'\n\\bigskip\n\\texttt{\\textbf{ \1}}:', | |
287 | strng) |
|
288 | strng) | |
288 | strng = cmd_re.sub(r'\\texttt{\g<cmd>}',strng) |
|
289 | strng = cmd_re.sub(r'\\texttt{\g<cmd>}',strng) | |
289 | strng = par_re.sub(r'\\\\',strng) |
|
290 | strng = par_re.sub(r'\\\\',strng) | |
290 | strng = escape_re.sub(r'\\\1',strng) |
|
291 | strng = escape_re.sub(r'\\\1',strng) | |
291 | strng = newline_re.sub(r'\\textbackslash{}n',strng) |
|
292 | strng = newline_re.sub(r'\\textbackslash{}n',strng) | |
292 | return strng |
|
293 | return strng | |
293 |
|
294 | |||
294 | def format_screen(self,strng): |
|
295 | def format_screen(self,strng): | |
295 | """Format a string for screen printing. |
|
296 | """Format a string for screen printing. | |
296 |
|
297 | |||
297 | This removes some latex-type format codes.""" |
|
298 | This removes some latex-type format codes.""" | |
298 | # Paragraph continue |
|
299 | # Paragraph continue | |
299 | par_re = re.compile(r'\\$',re.MULTILINE) |
|
300 | par_re = re.compile(r'\\$',re.MULTILINE) | |
300 | strng = par_re.sub('',strng) |
|
301 | strng = par_re.sub('',strng) | |
301 | return strng |
|
302 | return strng | |
302 |
|
303 | |||
303 | def parse_options(self,arg_str,opt_str,*long_opts,**kw): |
|
304 | def parse_options(self,arg_str,opt_str,*long_opts,**kw): | |
304 | """Parse options passed to an argument string. |
|
305 | """Parse options passed to an argument string. | |
305 |
|
306 | |||
306 | The interface is similar to that of getopt(), but it returns back a |
|
307 | The interface is similar to that of getopt(), but it returns back a | |
307 | Struct with the options as keys and the stripped argument string still |
|
308 | Struct with the options as keys and the stripped argument string still | |
308 | as a string. |
|
309 | as a string. | |
309 |
|
310 | |||
310 | arg_str is quoted as a true sys.argv vector by using shlex.split. |
|
311 | arg_str is quoted as a true sys.argv vector by using shlex.split. | |
311 | This allows us to easily expand variables, glob files, quote |
|
312 | This allows us to easily expand variables, glob files, quote | |
312 | arguments, etc. |
|
313 | arguments, etc. | |
313 |
|
314 | |||
314 | Options: |
|
315 | Options: | |
315 | -mode: default 'string'. If given as 'list', the argument string is |
|
316 | -mode: default 'string'. If given as 'list', the argument string is | |
316 | returned as a list (split on whitespace) instead of a string. |
|
317 | returned as a list (split on whitespace) instead of a string. | |
317 |
|
318 | |||
318 | -list_all: put all option values in lists. Normally only options |
|
319 | -list_all: put all option values in lists. Normally only options | |
319 | appearing more than once are put in a list. |
|
320 | appearing more than once are put in a list. | |
320 |
|
321 | |||
321 | -posix (True): whether to split the input line in POSIX mode or not, |
|
322 | -posix (True): whether to split the input line in POSIX mode or not, | |
322 | as per the conventions outlined in the shlex module from the |
|
323 | as per the conventions outlined in the shlex module from the | |
323 | standard library.""" |
|
324 | standard library.""" | |
324 |
|
325 | |||
325 | # inject default options at the beginning of the input line |
|
326 | # inject default options at the beginning of the input line | |
326 | caller = sys._getframe(1).f_code.co_name.replace('magic_','') |
|
327 | caller = sys._getframe(1).f_code.co_name.replace('magic_','') | |
327 | arg_str = '%s %s' % (self.options_table.get(caller,''),arg_str) |
|
328 | arg_str = '%s %s' % (self.options_table.get(caller,''),arg_str) | |
328 |
|
329 | |||
329 | mode = kw.get('mode','string') |
|
330 | mode = kw.get('mode','string') | |
330 | if mode not in ['string','list']: |
|
331 | if mode not in ['string','list']: | |
331 | raise ValueError,'incorrect mode given: %s' % mode |
|
332 | raise ValueError,'incorrect mode given: %s' % mode | |
332 | # Get options |
|
333 | # Get options | |
333 | list_all = kw.get('list_all',0) |
|
334 | list_all = kw.get('list_all',0) | |
334 | posix = kw.get('posix',True) |
|
335 | posix = kw.get('posix',True) | |
335 |
|
336 | |||
336 | # Check if we have more than one argument to warrant extra processing: |
|
337 | # Check if we have more than one argument to warrant extra processing: | |
337 | odict = {} # Dictionary with options |
|
338 | odict = {} # Dictionary with options | |
338 | args = arg_str.split() |
|
339 | args = arg_str.split() | |
339 | if len(args) >= 1: |
|
340 | if len(args) >= 1: | |
340 | # If the list of inputs only has 0 or 1 thing in it, there's no |
|
341 | # If the list of inputs only has 0 or 1 thing in it, there's no | |
341 | # need to look for options |
|
342 | # need to look for options | |
342 | argv = arg_split(arg_str,posix) |
|
343 | argv = arg_split(arg_str,posix) | |
343 | # Do regular option processing |
|
344 | # Do regular option processing | |
344 | try: |
|
345 | try: | |
345 | opts,args = getopt(argv,opt_str,*long_opts) |
|
346 | opts,args = getopt(argv,opt_str,*long_opts) | |
346 | except GetoptError,e: |
|
347 | except GetoptError,e: | |
347 | raise UsageError('%s ( allowed: "%s" %s)' % (e.msg,opt_str, |
|
348 | raise UsageError('%s ( allowed: "%s" %s)' % (e.msg,opt_str, | |
348 | " ".join(long_opts))) |
|
349 | " ".join(long_opts))) | |
349 | for o,a in opts: |
|
350 | for o,a in opts: | |
350 | if o.startswith('--'): |
|
351 | if o.startswith('--'): | |
351 | o = o[2:] |
|
352 | o = o[2:] | |
352 | else: |
|
353 | else: | |
353 | o = o[1:] |
|
354 | o = o[1:] | |
354 | try: |
|
355 | try: | |
355 | odict[o].append(a) |
|
356 | odict[o].append(a) | |
356 | except AttributeError: |
|
357 | except AttributeError: | |
357 | odict[o] = [odict[o],a] |
|
358 | odict[o] = [odict[o],a] | |
358 | except KeyError: |
|
359 | except KeyError: | |
359 | if list_all: |
|
360 | if list_all: | |
360 | odict[o] = [a] |
|
361 | odict[o] = [a] | |
361 | else: |
|
362 | else: | |
362 | odict[o] = a |
|
363 | odict[o] = a | |
363 |
|
364 | |||
364 | # Prepare opts,args for return |
|
365 | # Prepare opts,args for return | |
365 | opts = Struct(odict) |
|
366 | opts = Struct(odict) | |
366 | if mode == 'string': |
|
367 | if mode == 'string': | |
367 | args = ' '.join(args) |
|
368 | args = ' '.join(args) | |
368 |
|
369 | |||
369 | return opts,args |
|
370 | return opts,args | |
370 |
|
371 | |||
371 | #...................................................................... |
|
372 | #...................................................................... | |
372 | # And now the actual magic functions |
|
373 | # And now the actual magic functions | |
373 |
|
374 | |||
374 | # Functions for IPython shell work (vars,funcs, config, etc) |
|
375 | # Functions for IPython shell work (vars,funcs, config, etc) | |
375 | def magic_lsmagic(self, parameter_s = ''): |
|
376 | def magic_lsmagic(self, parameter_s = ''): | |
376 | """List currently available magic functions.""" |
|
377 | """List currently available magic functions.""" | |
377 | mesc = self.shell.ESC_MAGIC |
|
378 | mesc = self.shell.ESC_MAGIC | |
378 | print 'Available magic functions:\n'+mesc+\ |
|
379 | print 'Available magic functions:\n'+mesc+\ | |
379 | (' '+mesc).join(self.lsmagic()) |
|
380 | (' '+mesc).join(self.lsmagic()) | |
380 | print '\n' + Magic.auto_status[self.shell.rc.automagic] |
|
381 | print '\n' + Magic.auto_status[self.shell.rc.automagic] | |
381 | return None |
|
382 | return None | |
382 |
|
383 | |||
383 | def magic_magic(self, parameter_s = ''): |
|
384 | def magic_magic(self, parameter_s = ''): | |
384 | """Print information about the magic function system. |
|
385 | """Print information about the magic function system. | |
385 |
|
386 | |||
386 | Supported formats: -latex, -brief, -rest |
|
387 | Supported formats: -latex, -brief, -rest | |
387 | """ |
|
388 | """ | |
388 |
|
389 | |||
389 | mode = '' |
|
390 | mode = '' | |
390 | try: |
|
391 | try: | |
391 | if parameter_s.split()[0] == '-latex': |
|
392 | if parameter_s.split()[0] == '-latex': | |
392 | mode = 'latex' |
|
393 | mode = 'latex' | |
393 | if parameter_s.split()[0] == '-brief': |
|
394 | if parameter_s.split()[0] == '-brief': | |
394 | mode = 'brief' |
|
395 | mode = 'brief' | |
395 | if parameter_s.split()[0] == '-rest': |
|
396 | if parameter_s.split()[0] == '-rest': | |
396 | mode = 'rest' |
|
397 | mode = 'rest' | |
397 | rest_docs = [] |
|
398 | rest_docs = [] | |
398 | except: |
|
399 | except: | |
399 | pass |
|
400 | pass | |
400 |
|
401 | |||
401 | magic_docs = [] |
|
402 | magic_docs = [] | |
402 | for fname in self.lsmagic(): |
|
403 | for fname in self.lsmagic(): | |
403 | mname = 'magic_' + fname |
|
404 | mname = 'magic_' + fname | |
404 | for space in (Magic,self,self.__class__): |
|
405 | for space in (Magic,self,self.__class__): | |
405 | try: |
|
406 | try: | |
406 | fn = space.__dict__[mname] |
|
407 | fn = space.__dict__[mname] | |
407 | except KeyError: |
|
408 | except KeyError: | |
408 | pass |
|
409 | pass | |
409 | else: |
|
410 | else: | |
410 | break |
|
411 | break | |
411 | if mode == 'brief': |
|
412 | if mode == 'brief': | |
412 | # only first line |
|
413 | # only first line | |
413 | if fn.__doc__: |
|
414 | if fn.__doc__: | |
414 | fndoc = fn.__doc__.split('\n',1)[0] |
|
415 | fndoc = fn.__doc__.split('\n',1)[0] | |
415 | else: |
|
416 | else: | |
416 | fndoc = 'No documentation' |
|
417 | fndoc = 'No documentation' | |
417 | else: |
|
418 | else: | |
418 | if fn.__doc__: |
|
419 | if fn.__doc__: | |
419 | fndoc = fn.__doc__.rstrip() |
|
420 | fndoc = fn.__doc__.rstrip() | |
420 | else: |
|
421 | else: | |
421 | fndoc = 'No documentation' |
|
422 | fndoc = 'No documentation' | |
422 |
|
423 | |||
423 |
|
424 | |||
424 | if mode == 'rest': |
|
425 | if mode == 'rest': | |
425 | rest_docs.append('**%s%s**::\n\n\t%s\n\n' %(self.shell.ESC_MAGIC, |
|
426 | rest_docs.append('**%s%s**::\n\n\t%s\n\n' %(self.shell.ESC_MAGIC, | |
426 | fname,fndoc)) |
|
427 | fname,fndoc)) | |
427 |
|
428 | |||
428 | else: |
|
429 | else: | |
429 | magic_docs.append('%s%s:\n\t%s\n' %(self.shell.ESC_MAGIC, |
|
430 | magic_docs.append('%s%s:\n\t%s\n' %(self.shell.ESC_MAGIC, | |
430 | fname,fndoc)) |
|
431 | fname,fndoc)) | |
431 |
|
432 | |||
432 | magic_docs = ''.join(magic_docs) |
|
433 | magic_docs = ''.join(magic_docs) | |
433 |
|
434 | |||
434 | if mode == 'rest': |
|
435 | if mode == 'rest': | |
435 | return "".join(rest_docs) |
|
436 | return "".join(rest_docs) | |
436 |
|
437 | |||
437 | if mode == 'latex': |
|
438 | if mode == 'latex': | |
438 | print self.format_latex(magic_docs) |
|
439 | print self.format_latex(magic_docs) | |
439 | return |
|
440 | return | |
440 | else: |
|
441 | else: | |
441 | magic_docs = self.format_screen(magic_docs) |
|
442 | magic_docs = self.format_screen(magic_docs) | |
442 | if mode == 'brief': |
|
443 | if mode == 'brief': | |
443 | return magic_docs |
|
444 | return magic_docs | |
444 |
|
445 | |||
445 | outmsg = """ |
|
446 | outmsg = """ | |
446 | IPython's 'magic' functions |
|
447 | IPython's 'magic' functions | |
447 | =========================== |
|
448 | =========================== | |
448 |
|
449 | |||
449 | The magic function system provides a series of functions which allow you to |
|
450 | The magic function system provides a series of functions which allow you to | |
450 | control the behavior of IPython itself, plus a lot of system-type |
|
451 | control the behavior of IPython itself, plus a lot of system-type | |
451 | features. All these functions are prefixed with a % character, but parameters |
|
452 | features. All these functions are prefixed with a % character, but parameters | |
452 | are given without parentheses or quotes. |
|
453 | are given without parentheses or quotes. | |
453 |
|
454 | |||
454 | NOTE: If you have 'automagic' enabled (via the command line option or with the |
|
455 | NOTE: If you have 'automagic' enabled (via the command line option or with the | |
455 | %automagic function), you don't need to type in the % explicitly. By default, |
|
456 | %automagic function), you don't need to type in the % explicitly. By default, | |
456 | IPython ships with automagic on, so you should only rarely need the % escape. |
|
457 | IPython ships with automagic on, so you should only rarely need the % escape. | |
457 |
|
458 | |||
458 | Example: typing '%cd mydir' (without the quotes) changes you working directory |
|
459 | Example: typing '%cd mydir' (without the quotes) changes you working directory | |
459 | to 'mydir', if it exists. |
|
460 | to 'mydir', if it exists. | |
460 |
|
461 | |||
461 | You can define your own magic functions to extend the system. See the supplied |
|
462 | You can define your own magic functions to extend the system. See the supplied | |
462 | ipythonrc and example-magic.py files for details (in your ipython |
|
463 | ipythonrc and example-magic.py files for details (in your ipython | |
463 | configuration directory, typically $HOME/.ipython/). |
|
464 | configuration directory, typically $HOME/.ipython/). | |
464 |
|
465 | |||
465 | You can also define your own aliased names for magic functions. In your |
|
466 | You can also define your own aliased names for magic functions. In your | |
466 | ipythonrc file, placing a line like: |
|
467 | ipythonrc file, placing a line like: | |
467 |
|
468 | |||
468 | execute __IPYTHON__.magic_pf = __IPYTHON__.magic_profile |
|
469 | execute __IPYTHON__.magic_pf = __IPYTHON__.magic_profile | |
469 |
|
470 | |||
470 | will define %pf as a new name for %profile. |
|
471 | will define %pf as a new name for %profile. | |
471 |
|
472 | |||
472 | You can also call magics in code using the ipmagic() function, which IPython |
|
473 | You can also call magics in code using the ipmagic() function, which IPython | |
473 | automatically adds to the builtin namespace. Type 'ipmagic?' for details. |
|
474 | automatically adds to the builtin namespace. Type 'ipmagic?' for details. | |
474 |
|
475 | |||
475 | For a list of the available magic functions, use %lsmagic. For a description |
|
476 | For a list of the available magic functions, use %lsmagic. For a description | |
476 | of any of them, type %magic_name?, e.g. '%cd?'. |
|
477 | of any of them, type %magic_name?, e.g. '%cd?'. | |
477 |
|
478 | |||
478 | Currently the magic system has the following functions:\n""" |
|
479 | Currently the magic system has the following functions:\n""" | |
479 |
|
480 | |||
480 | mesc = self.shell.ESC_MAGIC |
|
481 | mesc = self.shell.ESC_MAGIC | |
481 | outmsg = ("%s\n%s\n\nSummary of magic functions (from %slsmagic):" |
|
482 | outmsg = ("%s\n%s\n\nSummary of magic functions (from %slsmagic):" | |
482 | "\n\n%s%s\n\n%s" % (outmsg, |
|
483 | "\n\n%s%s\n\n%s" % (outmsg, | |
483 | magic_docs,mesc,mesc, |
|
484 | magic_docs,mesc,mesc, | |
484 | (' '+mesc).join(self.lsmagic()), |
|
485 | (' '+mesc).join(self.lsmagic()), | |
485 | Magic.auto_status[self.shell.rc.automagic] ) ) |
|
486 | Magic.auto_status[self.shell.rc.automagic] ) ) | |
486 |
|
487 | |||
487 | page(outmsg,screen_lines=self.shell.rc.screen_length) |
|
488 | page(outmsg,screen_lines=self.shell.rc.screen_length) | |
488 |
|
489 | |||
489 |
|
490 | |||
490 | def magic_autoindent(self, parameter_s = ''): |
|
491 | def magic_autoindent(self, parameter_s = ''): | |
491 | """Toggle autoindent on/off (if available).""" |
|
492 | """Toggle autoindent on/off (if available).""" | |
492 |
|
493 | |||
493 | self.shell.set_autoindent() |
|
494 | self.shell.set_autoindent() | |
494 | print "Automatic indentation is:",['OFF','ON'][self.shell.autoindent] |
|
495 | print "Automatic indentation is:",['OFF','ON'][self.shell.autoindent] | |
495 |
|
496 | |||
496 |
|
497 | |||
497 | def magic_automagic(self, parameter_s = ''): |
|
498 | def magic_automagic(self, parameter_s = ''): | |
498 | """Make magic functions callable without having to type the initial %. |
|
499 | """Make magic functions callable without having to type the initial %. | |
499 |
|
500 | |||
500 | Without argumentsl toggles on/off (when off, you must call it as |
|
501 | Without argumentsl toggles on/off (when off, you must call it as | |
501 | %automagic, of course). With arguments it sets the value, and you can |
|
502 | %automagic, of course). With arguments it sets the value, and you can | |
502 | use any of (case insensitive): |
|
503 | use any of (case insensitive): | |
503 |
|
504 | |||
504 | - on,1,True: to activate |
|
505 | - on,1,True: to activate | |
505 |
|
506 | |||
506 | - off,0,False: to deactivate. |
|
507 | - off,0,False: to deactivate. | |
507 |
|
508 | |||
508 | Note that magic functions have lowest priority, so if there's a |
|
509 | Note that magic functions have lowest priority, so if there's a | |
509 | variable whose name collides with that of a magic fn, automagic won't |
|
510 | variable whose name collides with that of a magic fn, automagic won't | |
510 | work for that function (you get the variable instead). However, if you |
|
511 | work for that function (you get the variable instead). However, if you | |
511 | delete the variable (del var), the previously shadowed magic function |
|
512 | delete the variable (del var), the previously shadowed magic function | |
512 | becomes visible to automagic again.""" |
|
513 | becomes visible to automagic again.""" | |
513 |
|
514 | |||
514 | rc = self.shell.rc |
|
515 | rc = self.shell.rc | |
515 | arg = parameter_s.lower() |
|
516 | arg = parameter_s.lower() | |
516 | if parameter_s in ('on','1','true'): |
|
517 | if parameter_s in ('on','1','true'): | |
517 | rc.automagic = True |
|
518 | rc.automagic = True | |
518 | elif parameter_s in ('off','0','false'): |
|
519 | elif parameter_s in ('off','0','false'): | |
519 | rc.automagic = False |
|
520 | rc.automagic = False | |
520 | else: |
|
521 | else: | |
521 | rc.automagic = not rc.automagic |
|
522 | rc.automagic = not rc.automagic | |
522 | print '\n' + Magic.auto_status[rc.automagic] |
|
523 | print '\n' + Magic.auto_status[rc.automagic] | |
523 |
|
524 | |||
524 | @testdec.skip_doctest |
|
525 | @testdec.skip_doctest | |
525 | def magic_autocall(self, parameter_s = ''): |
|
526 | def magic_autocall(self, parameter_s = ''): | |
526 | """Make functions callable without having to type parentheses. |
|
527 | """Make functions callable without having to type parentheses. | |
527 |
|
528 | |||
528 | Usage: |
|
529 | Usage: | |
529 |
|
530 | |||
530 | %autocall [mode] |
|
531 | %autocall [mode] | |
531 |
|
532 | |||
532 | The mode can be one of: 0->Off, 1->Smart, 2->Full. If not given, the |
|
533 | The mode can be one of: 0->Off, 1->Smart, 2->Full. If not given, the | |
533 | value is toggled on and off (remembering the previous state). |
|
534 | value is toggled on and off (remembering the previous state). | |
534 |
|
535 | |||
535 | In more detail, these values mean: |
|
536 | In more detail, these values mean: | |
536 |
|
537 | |||
537 | 0 -> fully disabled |
|
538 | 0 -> fully disabled | |
538 |
|
539 | |||
539 | 1 -> active, but do not apply if there are no arguments on the line. |
|
540 | 1 -> active, but do not apply if there are no arguments on the line. | |
540 |
|
541 | |||
541 | In this mode, you get: |
|
542 | In this mode, you get: | |
542 |
|
543 | |||
543 | In [1]: callable |
|
544 | In [1]: callable | |
544 | Out[1]: <built-in function callable> |
|
545 | Out[1]: <built-in function callable> | |
545 |
|
546 | |||
546 | In [2]: callable 'hello' |
|
547 | In [2]: callable 'hello' | |
547 | ------> callable('hello') |
|
548 | ------> callable('hello') | |
548 | Out[2]: False |
|
549 | Out[2]: False | |
549 |
|
550 | |||
550 | 2 -> Active always. Even if no arguments are present, the callable |
|
551 | 2 -> Active always. Even if no arguments are present, the callable | |
551 | object is called: |
|
552 | object is called: | |
552 |
|
553 | |||
553 | In [2]: float |
|
554 | In [2]: float | |
554 | ------> float() |
|
555 | ------> float() | |
555 | Out[2]: 0.0 |
|
556 | Out[2]: 0.0 | |
556 |
|
557 | |||
557 | Note that even with autocall off, you can still use '/' at the start of |
|
558 | Note that even with autocall off, you can still use '/' at the start of | |
558 | a line to treat the first argument on the command line as a function |
|
559 | a line to treat the first argument on the command line as a function | |
559 | and add parentheses to it: |
|
560 | and add parentheses to it: | |
560 |
|
561 | |||
561 | In [8]: /str 43 |
|
562 | In [8]: /str 43 | |
562 | ------> str(43) |
|
563 | ------> str(43) | |
563 | Out[8]: '43' |
|
564 | Out[8]: '43' | |
564 |
|
565 | |||
565 | # all-random (note for auto-testing) |
|
566 | # all-random (note for auto-testing) | |
566 | """ |
|
567 | """ | |
567 |
|
568 | |||
568 | rc = self.shell.rc |
|
569 | rc = self.shell.rc | |
569 |
|
570 | |||
570 | if parameter_s: |
|
571 | if parameter_s: | |
571 | arg = int(parameter_s) |
|
572 | arg = int(parameter_s) | |
572 | else: |
|
573 | else: | |
573 | arg = 'toggle' |
|
574 | arg = 'toggle' | |
574 |
|
575 | |||
575 | if not arg in (0,1,2,'toggle'): |
|
576 | if not arg in (0,1,2,'toggle'): | |
576 | error('Valid modes: (0->Off, 1->Smart, 2->Full') |
|
577 | error('Valid modes: (0->Off, 1->Smart, 2->Full') | |
577 | return |
|
578 | return | |
578 |
|
579 | |||
579 | if arg in (0,1,2): |
|
580 | if arg in (0,1,2): | |
580 | rc.autocall = arg |
|
581 | rc.autocall = arg | |
581 | else: # toggle |
|
582 | else: # toggle | |
582 | if rc.autocall: |
|
583 | if rc.autocall: | |
583 | self._magic_state.autocall_save = rc.autocall |
|
584 | self._magic_state.autocall_save = rc.autocall | |
584 | rc.autocall = 0 |
|
585 | rc.autocall = 0 | |
585 | else: |
|
586 | else: | |
586 | try: |
|
587 | try: | |
587 | rc.autocall = self._magic_state.autocall_save |
|
588 | rc.autocall = self._magic_state.autocall_save | |
588 | except AttributeError: |
|
589 | except AttributeError: | |
589 | rc.autocall = self._magic_state.autocall_save = 1 |
|
590 | rc.autocall = self._magic_state.autocall_save = 1 | |
590 |
|
591 | |||
591 | print "Automatic calling is:",['OFF','Smart','Full'][rc.autocall] |
|
592 | print "Automatic calling is:",['OFF','Smart','Full'][rc.autocall] | |
592 |
|
593 | |||
593 | def magic_system_verbose(self, parameter_s = ''): |
|
594 | def magic_system_verbose(self, parameter_s = ''): | |
594 | """Set verbose printing of system calls. |
|
595 | """Set verbose printing of system calls. | |
595 |
|
596 | |||
596 | If called without an argument, act as a toggle""" |
|
597 | If called without an argument, act as a toggle""" | |
597 |
|
598 | |||
598 | if parameter_s: |
|
599 | if parameter_s: | |
599 | val = bool(eval(parameter_s)) |
|
600 | val = bool(eval(parameter_s)) | |
600 | else: |
|
601 | else: | |
601 | val = None |
|
602 | val = None | |
602 |
|
603 | |||
603 | self.shell.rc_set_toggle('system_verbose',val) |
|
604 | self.shell.rc_set_toggle('system_verbose',val) | |
604 | print "System verbose printing is:",\ |
|
605 | print "System verbose printing is:",\ | |
605 | ['OFF','ON'][self.shell.rc.system_verbose] |
|
606 | ['OFF','ON'][self.shell.rc.system_verbose] | |
606 |
|
607 | |||
607 |
|
608 | |||
608 | def magic_page(self, parameter_s=''): |
|
609 | def magic_page(self, parameter_s=''): | |
609 | """Pretty print the object and display it through a pager. |
|
610 | """Pretty print the object and display it through a pager. | |
610 |
|
611 | |||
611 | %page [options] OBJECT |
|
612 | %page [options] OBJECT | |
612 |
|
613 | |||
613 | If no object is given, use _ (last output). |
|
614 | If no object is given, use _ (last output). | |
614 |
|
615 | |||
615 | Options: |
|
616 | Options: | |
616 |
|
617 | |||
617 | -r: page str(object), don't pretty-print it.""" |
|
618 | -r: page str(object), don't pretty-print it.""" | |
618 |
|
619 | |||
619 | # After a function contributed by Olivier Aubert, slightly modified. |
|
620 | # After a function contributed by Olivier Aubert, slightly modified. | |
620 |
|
621 | |||
621 | # Process options/args |
|
622 | # Process options/args | |
622 | opts,args = self.parse_options(parameter_s,'r') |
|
623 | opts,args = self.parse_options(parameter_s,'r') | |
623 | raw = 'r' in opts |
|
624 | raw = 'r' in opts | |
624 |
|
625 | |||
625 | oname = args and args or '_' |
|
626 | oname = args and args or '_' | |
626 | info = self._ofind(oname) |
|
627 | info = self._ofind(oname) | |
627 | if info['found']: |
|
628 | if info['found']: | |
628 | txt = (raw and str or pformat)( info['obj'] ) |
|
629 | txt = (raw and str or pformat)( info['obj'] ) | |
629 | page(txt) |
|
630 | page(txt) | |
630 | else: |
|
631 | else: | |
631 | print 'Object `%s` not found' % oname |
|
632 | print 'Object `%s` not found' % oname | |
632 |
|
633 | |||
633 | def magic_profile(self, parameter_s=''): |
|
634 | def magic_profile(self, parameter_s=''): | |
634 | """Print your currently active IPyhton profile.""" |
|
635 | """Print your currently active IPyhton profile.""" | |
635 | if self.shell.rc.profile: |
|
636 | if self.shell.rc.profile: | |
636 | printpl('Current IPython profile: $self.shell.rc.profile.') |
|
637 | printpl('Current IPython profile: $self.shell.rc.profile.') | |
637 | else: |
|
638 | else: | |
638 | print 'No profile active.' |
|
639 | print 'No profile active.' | |
639 |
|
640 | |||
640 | def magic_pinfo(self, parameter_s='', namespaces=None): |
|
641 | def magic_pinfo(self, parameter_s='', namespaces=None): | |
641 | """Provide detailed information about an object. |
|
642 | """Provide detailed information about an object. | |
642 |
|
643 | |||
643 | '%pinfo object' is just a synonym for object? or ?object.""" |
|
644 | '%pinfo object' is just a synonym for object? or ?object.""" | |
644 |
|
645 | |||
645 | #print 'pinfo par: <%s>' % parameter_s # dbg |
|
646 | #print 'pinfo par: <%s>' % parameter_s # dbg | |
646 |
|
647 | |||
647 |
|
648 | |||
648 | # detail_level: 0 -> obj? , 1 -> obj?? |
|
649 | # detail_level: 0 -> obj? , 1 -> obj?? | |
649 | detail_level = 0 |
|
650 | detail_level = 0 | |
650 | # We need to detect if we got called as 'pinfo pinfo foo', which can |
|
651 | # We need to detect if we got called as 'pinfo pinfo foo', which can | |
651 | # happen if the user types 'pinfo foo?' at the cmd line. |
|
652 | # happen if the user types 'pinfo foo?' at the cmd line. | |
652 | pinfo,qmark1,oname,qmark2 = \ |
|
653 | pinfo,qmark1,oname,qmark2 = \ | |
653 | re.match('(pinfo )?(\?*)(.*?)(\??$)',parameter_s).groups() |
|
654 | re.match('(pinfo )?(\?*)(.*?)(\??$)',parameter_s).groups() | |
654 | if pinfo or qmark1 or qmark2: |
|
655 | if pinfo or qmark1 or qmark2: | |
655 | detail_level = 1 |
|
656 | detail_level = 1 | |
656 | if "*" in oname: |
|
657 | if "*" in oname: | |
657 | self.magic_psearch(oname) |
|
658 | self.magic_psearch(oname) | |
658 | else: |
|
659 | else: | |
659 | self._inspect('pinfo', oname, detail_level=detail_level, |
|
660 | self._inspect('pinfo', oname, detail_level=detail_level, | |
660 | namespaces=namespaces) |
|
661 | namespaces=namespaces) | |
661 |
|
662 | |||
662 | def magic_pdef(self, parameter_s='', namespaces=None): |
|
663 | def magic_pdef(self, parameter_s='', namespaces=None): | |
663 | """Print the definition header for any callable object. |
|
664 | """Print the definition header for any callable object. | |
664 |
|
665 | |||
665 | If the object is a class, print the constructor information.""" |
|
666 | If the object is a class, print the constructor information.""" | |
666 | self._inspect('pdef',parameter_s, namespaces) |
|
667 | self._inspect('pdef',parameter_s, namespaces) | |
667 |
|
668 | |||
668 | def magic_pdoc(self, parameter_s='', namespaces=None): |
|
669 | def magic_pdoc(self, parameter_s='', namespaces=None): | |
669 | """Print the docstring for an object. |
|
670 | """Print the docstring for an object. | |
670 |
|
671 | |||
671 | If the given object is a class, it will print both the class and the |
|
672 | If the given object is a class, it will print both the class and the | |
672 | constructor docstrings.""" |
|
673 | constructor docstrings.""" | |
673 | self._inspect('pdoc',parameter_s, namespaces) |
|
674 | self._inspect('pdoc',parameter_s, namespaces) | |
674 |
|
675 | |||
675 | def magic_psource(self, parameter_s='', namespaces=None): |
|
676 | def magic_psource(self, parameter_s='', namespaces=None): | |
676 | """Print (or run through pager) the source code for an object.""" |
|
677 | """Print (or run through pager) the source code for an object.""" | |
677 | self._inspect('psource',parameter_s, namespaces) |
|
678 | self._inspect('psource',parameter_s, namespaces) | |
678 |
|
679 | |||
679 | def magic_pfile(self, parameter_s=''): |
|
680 | def magic_pfile(self, parameter_s=''): | |
680 | """Print (or run through pager) the file where an object is defined. |
|
681 | """Print (or run through pager) the file where an object is defined. | |
681 |
|
682 | |||
682 | The file opens at the line where the object definition begins. IPython |
|
683 | The file opens at the line where the object definition begins. IPython | |
683 | will honor the environment variable PAGER if set, and otherwise will |
|
684 | will honor the environment variable PAGER if set, and otherwise will | |
684 | do its best to print the file in a convenient form. |
|
685 | do its best to print the file in a convenient form. | |
685 |
|
686 | |||
686 | If the given argument is not an object currently defined, IPython will |
|
687 | If the given argument is not an object currently defined, IPython will | |
687 | try to interpret it as a filename (automatically adding a .py extension |
|
688 | try to interpret it as a filename (automatically adding a .py extension | |
688 | if needed). You can thus use %pfile as a syntax highlighting code |
|
689 | if needed). You can thus use %pfile as a syntax highlighting code | |
689 | viewer.""" |
|
690 | viewer.""" | |
690 |
|
691 | |||
691 | # first interpret argument as an object name |
|
692 | # first interpret argument as an object name | |
692 | out = self._inspect('pfile',parameter_s) |
|
693 | out = self._inspect('pfile',parameter_s) | |
693 | # if not, try the input as a filename |
|
694 | # if not, try the input as a filename | |
694 | if out == 'not found': |
|
695 | if out == 'not found': | |
695 | try: |
|
696 | try: | |
696 | filename = get_py_filename(parameter_s) |
|
697 | filename = get_py_filename(parameter_s) | |
697 | except IOError,msg: |
|
698 | except IOError,msg: | |
698 | print msg |
|
699 | print msg | |
699 | return |
|
700 | return | |
700 | page(self.shell.inspector.format(file(filename).read())) |
|
701 | page(self.shell.inspector.format(file(filename).read())) | |
701 |
|
702 | |||
702 | def _inspect(self,meth,oname,namespaces=None,**kw): |
|
703 | def _inspect(self,meth,oname,namespaces=None,**kw): | |
703 | """Generic interface to the inspector system. |
|
704 | """Generic interface to the inspector system. | |
704 |
|
705 | |||
705 | This function is meant to be called by pdef, pdoc & friends.""" |
|
706 | This function is meant to be called by pdef, pdoc & friends.""" | |
706 |
|
707 | |||
707 | #oname = oname.strip() |
|
708 | #oname = oname.strip() | |
708 | #print '1- oname: <%r>' % oname # dbg |
|
709 | #print '1- oname: <%r>' % oname # dbg | |
709 | try: |
|
710 | try: | |
710 | oname = oname.strip().encode('ascii') |
|
711 | oname = oname.strip().encode('ascii') | |
711 | #print '2- oname: <%r>' % oname # dbg |
|
712 | #print '2- oname: <%r>' % oname # dbg | |
712 | except UnicodeEncodeError: |
|
713 | except UnicodeEncodeError: | |
713 | print 'Python identifiers can only contain ascii characters.' |
|
714 | print 'Python identifiers can only contain ascii characters.' | |
714 | return 'not found' |
|
715 | return 'not found' | |
715 |
|
716 | |||
716 | info = Struct(self._ofind(oname, namespaces)) |
|
717 | info = Struct(self._ofind(oname, namespaces)) | |
717 |
|
718 | |||
718 | if info.found: |
|
719 | if info.found: | |
719 | try: |
|
720 | try: | |
720 | IPython.generics.inspect_object(info.obj) |
|
721 | IPython.generics.inspect_object(info.obj) | |
721 | return |
|
722 | return | |
722 | except IPython.ipapi.TryNext: |
|
723 | except IPython.ipapi.TryNext: | |
723 | pass |
|
724 | pass | |
724 | # Get the docstring of the class property if it exists. |
|
725 | # Get the docstring of the class property if it exists. | |
725 | path = oname.split('.') |
|
726 | path = oname.split('.') | |
726 | root = '.'.join(path[:-1]) |
|
727 | root = '.'.join(path[:-1]) | |
727 | if info.parent is not None: |
|
728 | if info.parent is not None: | |
728 | try: |
|
729 | try: | |
729 | target = getattr(info.parent, '__class__') |
|
730 | target = getattr(info.parent, '__class__') | |
730 | # The object belongs to a class instance. |
|
731 | # The object belongs to a class instance. | |
731 | try: |
|
732 | try: | |
732 | target = getattr(target, path[-1]) |
|
733 | target = getattr(target, path[-1]) | |
733 | # The class defines the object. |
|
734 | # The class defines the object. | |
734 | if isinstance(target, property): |
|
735 | if isinstance(target, property): | |
735 | oname = root + '.__class__.' + path[-1] |
|
736 | oname = root + '.__class__.' + path[-1] | |
736 | info = Struct(self._ofind(oname)) |
|
737 | info = Struct(self._ofind(oname)) | |
737 | except AttributeError: pass |
|
738 | except AttributeError: pass | |
738 | except AttributeError: pass |
|
739 | except AttributeError: pass | |
739 |
|
740 | |||
740 | pmethod = getattr(self.shell.inspector,meth) |
|
741 | pmethod = getattr(self.shell.inspector,meth) | |
741 | formatter = info.ismagic and self.format_screen or None |
|
742 | formatter = info.ismagic and self.format_screen or None | |
742 | if meth == 'pdoc': |
|
743 | if meth == 'pdoc': | |
743 | pmethod(info.obj,oname,formatter) |
|
744 | pmethod(info.obj,oname,formatter) | |
744 | elif meth == 'pinfo': |
|
745 | elif meth == 'pinfo': | |
745 | pmethod(info.obj,oname,formatter,info,**kw) |
|
746 | pmethod(info.obj,oname,formatter,info,**kw) | |
746 | else: |
|
747 | else: | |
747 | pmethod(info.obj,oname) |
|
748 | pmethod(info.obj,oname) | |
748 | else: |
|
749 | else: | |
749 | print 'Object `%s` not found.' % oname |
|
750 | print 'Object `%s` not found.' % oname | |
750 | return 'not found' # so callers can take other action |
|
751 | return 'not found' # so callers can take other action | |
751 |
|
752 | |||
752 | def magic_psearch(self, parameter_s=''): |
|
753 | def magic_psearch(self, parameter_s=''): | |
753 | """Search for object in namespaces by wildcard. |
|
754 | """Search for object in namespaces by wildcard. | |
754 |
|
755 | |||
755 | %psearch [options] PATTERN [OBJECT TYPE] |
|
756 | %psearch [options] PATTERN [OBJECT TYPE] | |
756 |
|
757 | |||
757 | Note: ? can be used as a synonym for %psearch, at the beginning or at |
|
758 | Note: ? can be used as a synonym for %psearch, at the beginning or at | |
758 | the end: both a*? and ?a* are equivalent to '%psearch a*'. Still, the |
|
759 | the end: both a*? and ?a* are equivalent to '%psearch a*'. Still, the | |
759 | rest of the command line must be unchanged (options come first), so |
|
760 | rest of the command line must be unchanged (options come first), so | |
760 | for example the following forms are equivalent |
|
761 | for example the following forms are equivalent | |
761 |
|
762 | |||
762 | %psearch -i a* function |
|
763 | %psearch -i a* function | |
763 | -i a* function? |
|
764 | -i a* function? | |
764 | ?-i a* function |
|
765 | ?-i a* function | |
765 |
|
766 | |||
766 | Arguments: |
|
767 | Arguments: | |
767 |
|
768 | |||
768 | PATTERN |
|
769 | PATTERN | |
769 |
|
770 | |||
770 | where PATTERN is a string containing * as a wildcard similar to its |
|
771 | where PATTERN is a string containing * as a wildcard similar to its | |
771 | use in a shell. The pattern is matched in all namespaces on the |
|
772 | use in a shell. The pattern is matched in all namespaces on the | |
772 | search path. By default objects starting with a single _ are not |
|
773 | search path. By default objects starting with a single _ are not | |
773 | matched, many IPython generated objects have a single |
|
774 | matched, many IPython generated objects have a single | |
774 | underscore. The default is case insensitive matching. Matching is |
|
775 | underscore. The default is case insensitive matching. Matching is | |
775 | also done on the attributes of objects and not only on the objects |
|
776 | also done on the attributes of objects and not only on the objects | |
776 | in a module. |
|
777 | in a module. | |
777 |
|
778 | |||
778 | [OBJECT TYPE] |
|
779 | [OBJECT TYPE] | |
779 |
|
780 | |||
780 | Is the name of a python type from the types module. The name is |
|
781 | Is the name of a python type from the types module. The name is | |
781 | given in lowercase without the ending type, ex. StringType is |
|
782 | given in lowercase without the ending type, ex. StringType is | |
782 | written string. By adding a type here only objects matching the |
|
783 | written string. By adding a type here only objects matching the | |
783 | given type are matched. Using all here makes the pattern match all |
|
784 | given type are matched. Using all here makes the pattern match all | |
784 | types (this is the default). |
|
785 | types (this is the default). | |
785 |
|
786 | |||
786 | Options: |
|
787 | Options: | |
787 |
|
788 | |||
788 | -a: makes the pattern match even objects whose names start with a |
|
789 | -a: makes the pattern match even objects whose names start with a | |
789 | single underscore. These names are normally ommitted from the |
|
790 | single underscore. These names are normally ommitted from the | |
790 | search. |
|
791 | search. | |
791 |
|
792 | |||
792 | -i/-c: make the pattern case insensitive/sensitive. If neither of |
|
793 | -i/-c: make the pattern case insensitive/sensitive. If neither of | |
793 | these options is given, the default is read from your ipythonrc |
|
794 | these options is given, the default is read from your ipythonrc | |
794 | file. The option name which sets this value is |
|
795 | file. The option name which sets this value is | |
795 | 'wildcards_case_sensitive'. If this option is not specified in your |
|
796 | 'wildcards_case_sensitive'. If this option is not specified in your | |
796 | ipythonrc file, IPython's internal default is to do a case sensitive |
|
797 | ipythonrc file, IPython's internal default is to do a case sensitive | |
797 | search. |
|
798 | search. | |
798 |
|
799 | |||
799 | -e/-s NAMESPACE: exclude/search a given namespace. The pattern you |
|
800 | -e/-s NAMESPACE: exclude/search a given namespace. The pattern you | |
800 | specifiy can be searched in any of the following namespaces: |
|
801 | specifiy can be searched in any of the following namespaces: | |
801 | 'builtin', 'user', 'user_global','internal', 'alias', where |
|
802 | 'builtin', 'user', 'user_global','internal', 'alias', where | |
802 | 'builtin' and 'user' are the search defaults. Note that you should |
|
803 | 'builtin' and 'user' are the search defaults. Note that you should | |
803 | not use quotes when specifying namespaces. |
|
804 | not use quotes when specifying namespaces. | |
804 |
|
805 | |||
805 | 'Builtin' contains the python module builtin, 'user' contains all |
|
806 | 'Builtin' contains the python module builtin, 'user' contains all | |
806 | user data, 'alias' only contain the shell aliases and no python |
|
807 | user data, 'alias' only contain the shell aliases and no python | |
807 | objects, 'internal' contains objects used by IPython. The |
|
808 | objects, 'internal' contains objects used by IPython. The | |
808 | 'user_global' namespace is only used by embedded IPython instances, |
|
809 | 'user_global' namespace is only used by embedded IPython instances, | |
809 | and it contains module-level globals. You can add namespaces to the |
|
810 | and it contains module-level globals. You can add namespaces to the | |
810 | search with -s or exclude them with -e (these options can be given |
|
811 | search with -s or exclude them with -e (these options can be given | |
811 | more than once). |
|
812 | more than once). | |
812 |
|
813 | |||
813 | Examples: |
|
814 | Examples: | |
814 |
|
815 | |||
815 | %psearch a* -> objects beginning with an a |
|
816 | %psearch a* -> objects beginning with an a | |
816 | %psearch -e builtin a* -> objects NOT in the builtin space starting in a |
|
817 | %psearch -e builtin a* -> objects NOT in the builtin space starting in a | |
817 | %psearch a* function -> all functions beginning with an a |
|
818 | %psearch a* function -> all functions beginning with an a | |
818 | %psearch re.e* -> objects beginning with an e in module re |
|
819 | %psearch re.e* -> objects beginning with an e in module re | |
819 | %psearch r*.e* -> objects that start with e in modules starting in r |
|
820 | %psearch r*.e* -> objects that start with e in modules starting in r | |
820 | %psearch r*.* string -> all strings in modules beginning with r |
|
821 | %psearch r*.* string -> all strings in modules beginning with r | |
821 |
|
822 | |||
822 | Case sensitve search: |
|
823 | Case sensitve search: | |
823 |
|
824 | |||
824 | %psearch -c a* list all object beginning with lower case a |
|
825 | %psearch -c a* list all object beginning with lower case a | |
825 |
|
826 | |||
826 | Show objects beginning with a single _: |
|
827 | Show objects beginning with a single _: | |
827 |
|
828 | |||
828 | %psearch -a _* list objects beginning with a single underscore""" |
|
829 | %psearch -a _* list objects beginning with a single underscore""" | |
829 | try: |
|
830 | try: | |
830 | parameter_s = parameter_s.encode('ascii') |
|
831 | parameter_s = parameter_s.encode('ascii') | |
831 | except UnicodeEncodeError: |
|
832 | except UnicodeEncodeError: | |
832 | print 'Python identifiers can only contain ascii characters.' |
|
833 | print 'Python identifiers can only contain ascii characters.' | |
833 | return |
|
834 | return | |
834 |
|
835 | |||
835 | # default namespaces to be searched |
|
836 | # default namespaces to be searched | |
836 | def_search = ['user','builtin'] |
|
837 | def_search = ['user','builtin'] | |
837 |
|
838 | |||
838 | # Process options/args |
|
839 | # Process options/args | |
839 | opts,args = self.parse_options(parameter_s,'cias:e:',list_all=True) |
|
840 | opts,args = self.parse_options(parameter_s,'cias:e:',list_all=True) | |
840 | opt = opts.get |
|
841 | opt = opts.get | |
841 | shell = self.shell |
|
842 | shell = self.shell | |
842 | psearch = shell.inspector.psearch |
|
843 | psearch = shell.inspector.psearch | |
843 |
|
844 | |||
844 | # select case options |
|
845 | # select case options | |
845 | if opts.has_key('i'): |
|
846 | if opts.has_key('i'): | |
846 | ignore_case = True |
|
847 | ignore_case = True | |
847 | elif opts.has_key('c'): |
|
848 | elif opts.has_key('c'): | |
848 | ignore_case = False |
|
849 | ignore_case = False | |
849 | else: |
|
850 | else: | |
850 | ignore_case = not shell.rc.wildcards_case_sensitive |
|
851 | ignore_case = not shell.rc.wildcards_case_sensitive | |
851 |
|
852 | |||
852 | # Build list of namespaces to search from user options |
|
853 | # Build list of namespaces to search from user options | |
853 | def_search.extend(opt('s',[])) |
|
854 | def_search.extend(opt('s',[])) | |
854 | ns_exclude = ns_exclude=opt('e',[]) |
|
855 | ns_exclude = ns_exclude=opt('e',[]) | |
855 | ns_search = [nm for nm in def_search if nm not in ns_exclude] |
|
856 | ns_search = [nm for nm in def_search if nm not in ns_exclude] | |
856 |
|
857 | |||
857 | # Call the actual search |
|
858 | # Call the actual search | |
858 | try: |
|
859 | try: | |
859 | psearch(args,shell.ns_table,ns_search, |
|
860 | psearch(args,shell.ns_table,ns_search, | |
860 | show_all=opt('a'),ignore_case=ignore_case) |
|
861 | show_all=opt('a'),ignore_case=ignore_case) | |
861 | except: |
|
862 | except: | |
862 | shell.showtraceback() |
|
863 | shell.showtraceback() | |
863 |
|
864 | |||
864 | def magic_who_ls(self, parameter_s=''): |
|
865 | def magic_who_ls(self, parameter_s=''): | |
865 | """Return a sorted list of all interactive variables. |
|
866 | """Return a sorted list of all interactive variables. | |
866 |
|
867 | |||
867 | If arguments are given, only variables of types matching these |
|
868 | If arguments are given, only variables of types matching these | |
868 | arguments are returned.""" |
|
869 | arguments are returned.""" | |
869 |
|
870 | |||
870 | user_ns = self.shell.user_ns |
|
871 | user_ns = self.shell.user_ns | |
871 | internal_ns = self.shell.internal_ns |
|
872 | internal_ns = self.shell.internal_ns | |
872 | user_config_ns = self.shell.user_config_ns |
|
873 | user_config_ns = self.shell.user_config_ns | |
873 | out = [] |
|
874 | out = [] | |
874 | typelist = parameter_s.split() |
|
875 | typelist = parameter_s.split() | |
875 |
|
876 | |||
876 | for i in user_ns: |
|
877 | for i in user_ns: | |
877 | if not (i.startswith('_') or i.startswith('_i')) \ |
|
878 | if not (i.startswith('_') or i.startswith('_i')) \ | |
878 | and not (i in internal_ns or i in user_config_ns): |
|
879 | and not (i in internal_ns or i in user_config_ns): | |
879 | if typelist: |
|
880 | if typelist: | |
880 | if type(user_ns[i]).__name__ in typelist: |
|
881 | if type(user_ns[i]).__name__ in typelist: | |
881 | out.append(i) |
|
882 | out.append(i) | |
882 | else: |
|
883 | else: | |
883 | out.append(i) |
|
884 | out.append(i) | |
884 | out.sort() |
|
885 | out.sort() | |
885 | return out |
|
886 | return out | |
886 |
|
887 | |||
887 | def magic_who(self, parameter_s=''): |
|
888 | def magic_who(self, parameter_s=''): | |
888 | """Print all interactive variables, with some minimal formatting. |
|
889 | """Print all interactive variables, with some minimal formatting. | |
889 |
|
890 | |||
890 | If any arguments are given, only variables whose type matches one of |
|
891 | If any arguments are given, only variables whose type matches one of | |
891 | these are printed. For example: |
|
892 | these are printed. For example: | |
892 |
|
893 | |||
893 | %who function str |
|
894 | %who function str | |
894 |
|
895 | |||
895 | will only list functions and strings, excluding all other types of |
|
896 | will only list functions and strings, excluding all other types of | |
896 | variables. To find the proper type names, simply use type(var) at a |
|
897 | variables. To find the proper type names, simply use type(var) at a | |
897 | command line to see how python prints type names. For example: |
|
898 | command line to see how python prints type names. For example: | |
898 |
|
899 | |||
899 | In [1]: type('hello')\\ |
|
900 | In [1]: type('hello')\\ | |
900 | Out[1]: <type 'str'> |
|
901 | Out[1]: <type 'str'> | |
901 |
|
902 | |||
902 | indicates that the type name for strings is 'str'. |
|
903 | indicates that the type name for strings is 'str'. | |
903 |
|
904 | |||
904 | %who always excludes executed names loaded through your configuration |
|
905 | %who always excludes executed names loaded through your configuration | |
905 | file and things which are internal to IPython. |
|
906 | file and things which are internal to IPython. | |
906 |
|
907 | |||
907 | This is deliberate, as typically you may load many modules and the |
|
908 | This is deliberate, as typically you may load many modules and the | |
908 | purpose of %who is to show you only what you've manually defined.""" |
|
909 | purpose of %who is to show you only what you've manually defined.""" | |
909 |
|
910 | |||
910 | varlist = self.magic_who_ls(parameter_s) |
|
911 | varlist = self.magic_who_ls(parameter_s) | |
911 | if not varlist: |
|
912 | if not varlist: | |
912 | if parameter_s: |
|
913 | if parameter_s: | |
913 | print 'No variables match your requested type.' |
|
914 | print 'No variables match your requested type.' | |
914 | else: |
|
915 | else: | |
915 | print 'Interactive namespace is empty.' |
|
916 | print 'Interactive namespace is empty.' | |
916 | return |
|
917 | return | |
917 |
|
918 | |||
918 | # if we have variables, move on... |
|
919 | # if we have variables, move on... | |
919 | count = 0 |
|
920 | count = 0 | |
920 | for i in varlist: |
|
921 | for i in varlist: | |
921 | print i+'\t', |
|
922 | print i+'\t', | |
922 | count += 1 |
|
923 | count += 1 | |
923 | if count > 8: |
|
924 | if count > 8: | |
924 | count = 0 |
|
925 | count = 0 | |
925 |
|
926 | |||
926 |
|
927 | |||
927 |
|
928 | |||
928 | def magic_whos(self, parameter_s=''): |
|
929 | def magic_whos(self, parameter_s=''): | |
929 | """Like %who, but gives some extra information about each variable. |
|
930 | """Like %who, but gives some extra information about each variable. | |
930 |
|
931 | |||
931 | The same type filtering of %who can be applied here. |
|
932 | The same type filtering of %who can be applied here. | |
932 |
|
933 | |||
933 | For all variables, the type is printed. Additionally it prints: |
|
934 | For all variables, the type is printed. Additionally it prints: | |
934 |
|
935 | |||
935 | - For {},[],(): their length. |
|
936 | - For {},[],(): their length. | |
936 |
|
937 | |||
937 | - For numpy and Numeric arrays, a summary with shape, number of |
|
938 | - For numpy and Numeric arrays, a summary with shape, number of | |
938 | elements, typecode and size in memory. |
|
939 | elements, typecode and size in memory. | |
939 |
|
940 | |||
940 | - Everything else: a string representation, snipping their middle if |
|
941 | - Everything else: a string representation, snipping their middle if | |
941 | too long.""" |
|
942 | too long.""" | |
942 |
|
943 | |||
943 | varnames = self.magic_who_ls(parameter_s) |
|
944 | varnames = self.magic_who_ls(parameter_s) | |
944 | if not varnames: |
|
945 | if not varnames: | |
945 | if parameter_s: |
|
946 | if parameter_s: | |
946 | print 'No variables match your requested type.' |
|
947 | print 'No variables match your requested type.' | |
947 | else: |
|
948 | else: | |
948 | print 'Interactive namespace is empty.' |
|
949 | print 'Interactive namespace is empty.' | |
949 | return |
|
950 | return | |
950 |
|
951 | |||
951 | # if we have variables, move on... |
|
952 | # if we have variables, move on... | |
952 |
|
953 | |||
953 | # for these types, show len() instead of data: |
|
954 | # for these types, show len() instead of data: | |
954 | seq_types = [types.DictType,types.ListType,types.TupleType] |
|
955 | seq_types = [types.DictType,types.ListType,types.TupleType] | |
955 |
|
956 | |||
956 | # for numpy/Numeric arrays, display summary info |
|
957 | # for numpy/Numeric arrays, display summary info | |
957 | try: |
|
958 | try: | |
958 | import numpy |
|
959 | import numpy | |
959 | except ImportError: |
|
960 | except ImportError: | |
960 | ndarray_type = None |
|
961 | ndarray_type = None | |
961 | else: |
|
962 | else: | |
962 | ndarray_type = numpy.ndarray.__name__ |
|
963 | ndarray_type = numpy.ndarray.__name__ | |
963 | try: |
|
964 | try: | |
964 | import Numeric |
|
965 | import Numeric | |
965 | except ImportError: |
|
966 | except ImportError: | |
966 | array_type = None |
|
967 | array_type = None | |
967 | else: |
|
968 | else: | |
968 | array_type = Numeric.ArrayType.__name__ |
|
969 | array_type = Numeric.ArrayType.__name__ | |
969 |
|
970 | |||
970 | # Find all variable names and types so we can figure out column sizes |
|
971 | # Find all variable names and types so we can figure out column sizes | |
971 | def get_vars(i): |
|
972 | def get_vars(i): | |
972 | return self.shell.user_ns[i] |
|
973 | return self.shell.user_ns[i] | |
973 |
|
974 | |||
974 | # some types are well known and can be shorter |
|
975 | # some types are well known and can be shorter | |
975 | abbrevs = {'IPython.macro.Macro' : 'Macro'} |
|
976 | abbrevs = {'IPython.macro.Macro' : 'Macro'} | |
976 | def type_name(v): |
|
977 | def type_name(v): | |
977 | tn = type(v).__name__ |
|
978 | tn = type(v).__name__ | |
978 | return abbrevs.get(tn,tn) |
|
979 | return abbrevs.get(tn,tn) | |
979 |
|
980 | |||
980 | varlist = map(get_vars,varnames) |
|
981 | varlist = map(get_vars,varnames) | |
981 |
|
982 | |||
982 | typelist = [] |
|
983 | typelist = [] | |
983 | for vv in varlist: |
|
984 | for vv in varlist: | |
984 | tt = type_name(vv) |
|
985 | tt = type_name(vv) | |
985 |
|
986 | |||
986 | if tt=='instance': |
|
987 | if tt=='instance': | |
987 | typelist.append( abbrevs.get(str(vv.__class__), |
|
988 | typelist.append( abbrevs.get(str(vv.__class__), | |
988 | str(vv.__class__))) |
|
989 | str(vv.__class__))) | |
989 | else: |
|
990 | else: | |
990 | typelist.append(tt) |
|
991 | typelist.append(tt) | |
991 |
|
992 | |||
992 | # column labels and # of spaces as separator |
|
993 | # column labels and # of spaces as separator | |
993 | varlabel = 'Variable' |
|
994 | varlabel = 'Variable' | |
994 | typelabel = 'Type' |
|
995 | typelabel = 'Type' | |
995 | datalabel = 'Data/Info' |
|
996 | datalabel = 'Data/Info' | |
996 | colsep = 3 |
|
997 | colsep = 3 | |
997 | # variable format strings |
|
998 | # variable format strings | |
998 | vformat = "$vname.ljust(varwidth)$vtype.ljust(typewidth)" |
|
999 | vformat = "$vname.ljust(varwidth)$vtype.ljust(typewidth)" | |
999 | vfmt_short = '$vstr[:25]<...>$vstr[-25:]' |
|
1000 | vfmt_short = '$vstr[:25]<...>$vstr[-25:]' | |
1000 | aformat = "%s: %s elems, type `%s`, %s bytes" |
|
1001 | aformat = "%s: %s elems, type `%s`, %s bytes" | |
1001 | # find the size of the columns to format the output nicely |
|
1002 | # find the size of the columns to format the output nicely | |
1002 | varwidth = max(max(map(len,varnames)), len(varlabel)) + colsep |
|
1003 | varwidth = max(max(map(len,varnames)), len(varlabel)) + colsep | |
1003 | typewidth = max(max(map(len,typelist)), len(typelabel)) + colsep |
|
1004 | typewidth = max(max(map(len,typelist)), len(typelabel)) + colsep | |
1004 | # table header |
|
1005 | # table header | |
1005 | print varlabel.ljust(varwidth) + typelabel.ljust(typewidth) + \ |
|
1006 | print varlabel.ljust(varwidth) + typelabel.ljust(typewidth) + \ | |
1006 | ' '+datalabel+'\n' + '-'*(varwidth+typewidth+len(datalabel)+1) |
|
1007 | ' '+datalabel+'\n' + '-'*(varwidth+typewidth+len(datalabel)+1) | |
1007 | # and the table itself |
|
1008 | # and the table itself | |
1008 | kb = 1024 |
|
1009 | kb = 1024 | |
1009 | Mb = 1048576 # kb**2 |
|
1010 | Mb = 1048576 # kb**2 | |
1010 | for vname,var,vtype in zip(varnames,varlist,typelist): |
|
1011 | for vname,var,vtype in zip(varnames,varlist,typelist): | |
1011 | print itpl(vformat), |
|
1012 | print itpl(vformat), | |
1012 | if vtype in seq_types: |
|
1013 | if vtype in seq_types: | |
1013 | print len(var) |
|
1014 | print len(var) | |
1014 | elif vtype in [array_type,ndarray_type]: |
|
1015 | elif vtype in [array_type,ndarray_type]: | |
1015 | vshape = str(var.shape).replace(',','').replace(' ','x')[1:-1] |
|
1016 | vshape = str(var.shape).replace(',','').replace(' ','x')[1:-1] | |
1016 | if vtype==ndarray_type: |
|
1017 | if vtype==ndarray_type: | |
1017 | # numpy |
|
1018 | # numpy | |
1018 | vsize = var.size |
|
1019 | vsize = var.size | |
1019 | vbytes = vsize*var.itemsize |
|
1020 | vbytes = vsize*var.itemsize | |
1020 | vdtype = var.dtype |
|
1021 | vdtype = var.dtype | |
1021 | else: |
|
1022 | else: | |
1022 | # Numeric |
|
1023 | # Numeric | |
1023 | vsize = Numeric.size(var) |
|
1024 | vsize = Numeric.size(var) | |
1024 | vbytes = vsize*var.itemsize() |
|
1025 | vbytes = vsize*var.itemsize() | |
1025 | vdtype = var.typecode() |
|
1026 | vdtype = var.typecode() | |
1026 |
|
1027 | |||
1027 | if vbytes < 100000: |
|
1028 | if vbytes < 100000: | |
1028 | print aformat % (vshape,vsize,vdtype,vbytes) |
|
1029 | print aformat % (vshape,vsize,vdtype,vbytes) | |
1029 | else: |
|
1030 | else: | |
1030 | print aformat % (vshape,vsize,vdtype,vbytes), |
|
1031 | print aformat % (vshape,vsize,vdtype,vbytes), | |
1031 | if vbytes < Mb: |
|
1032 | if vbytes < Mb: | |
1032 | print '(%s kb)' % (vbytes/kb,) |
|
1033 | print '(%s kb)' % (vbytes/kb,) | |
1033 | else: |
|
1034 | else: | |
1034 | print '(%s Mb)' % (vbytes/Mb,) |
|
1035 | print '(%s Mb)' % (vbytes/Mb,) | |
1035 | else: |
|
1036 | else: | |
1036 | try: |
|
1037 | try: | |
1037 | vstr = str(var) |
|
1038 | vstr = str(var) | |
1038 | except UnicodeEncodeError: |
|
1039 | except UnicodeEncodeError: | |
1039 | vstr = unicode(var).encode(sys.getdefaultencoding(), |
|
1040 | vstr = unicode(var).encode(sys.getdefaultencoding(), | |
1040 | 'backslashreplace') |
|
1041 | 'backslashreplace') | |
1041 | vstr = vstr.replace('\n','\\n') |
|
1042 | vstr = vstr.replace('\n','\\n') | |
1042 | if len(vstr) < 50: |
|
1043 | if len(vstr) < 50: | |
1043 | print vstr |
|
1044 | print vstr | |
1044 | else: |
|
1045 | else: | |
1045 | printpl(vfmt_short) |
|
1046 | printpl(vfmt_short) | |
1046 |
|
1047 | |||
1047 | def magic_reset(self, parameter_s=''): |
|
1048 | def magic_reset(self, parameter_s=''): | |
1048 | """Resets the namespace by removing all names defined by the user. |
|
1049 | """Resets the namespace by removing all names defined by the user. | |
1049 |
|
1050 | |||
1050 | Input/Output history are left around in case you need them. |
|
1051 | Input/Output history are left around in case you need them. | |
1051 |
|
1052 | |||
1052 | Parameters |
|
1053 | Parameters | |
1053 | ---------- |
|
1054 | ---------- | |
1054 | -y : force reset without asking for confirmation. |
|
1055 | -y : force reset without asking for confirmation. | |
1055 |
|
1056 | |||
1056 | Examples |
|
1057 | Examples | |
1057 | -------- |
|
1058 | -------- | |
1058 | In [6]: a = 1 |
|
1059 | In [6]: a = 1 | |
1059 |
|
1060 | |||
1060 | In [7]: a |
|
1061 | In [7]: a | |
1061 | Out[7]: 1 |
|
1062 | Out[7]: 1 | |
1062 |
|
1063 | |||
1063 | In [8]: 'a' in _ip.user_ns |
|
1064 | In [8]: 'a' in _ip.user_ns | |
1064 | Out[8]: True |
|
1065 | Out[8]: True | |
1065 |
|
1066 | |||
1066 | In [9]: %reset -f |
|
1067 | In [9]: %reset -f | |
1067 |
|
1068 | |||
1068 | In [10]: 'a' in _ip.user_ns |
|
1069 | In [10]: 'a' in _ip.user_ns | |
1069 | Out[10]: False |
|
1070 | Out[10]: False | |
1070 | """ |
|
1071 | """ | |
1071 |
|
1072 | |||
1072 | if parameter_s == '-f': |
|
1073 | if parameter_s == '-f': | |
1073 | ans = True |
|
1074 | ans = True | |
1074 | else: |
|
1075 | else: | |
1075 | ans = self.shell.ask_yes_no( |
|
1076 | ans = self.shell.ask_yes_no( | |
1076 | "Once deleted, variables cannot be recovered. Proceed (y/[n])? ") |
|
1077 | "Once deleted, variables cannot be recovered. Proceed (y/[n])? ") | |
1077 | if not ans: |
|
1078 | if not ans: | |
1078 | print 'Nothing done.' |
|
1079 | print 'Nothing done.' | |
1079 | return |
|
1080 | return | |
1080 | user_ns = self.shell.user_ns |
|
1081 | user_ns = self.shell.user_ns | |
1081 | for i in self.magic_who_ls(): |
|
1082 | for i in self.magic_who_ls(): | |
1082 | del(user_ns[i]) |
|
1083 | del(user_ns[i]) | |
1083 |
|
1084 | |||
1084 | # Also flush the private list of module references kept for script |
|
1085 | # Also flush the private list of module references kept for script | |
1085 | # execution protection |
|
1086 | # execution protection | |
1086 | self.shell.clear_main_mod_cache() |
|
1087 | self.shell.clear_main_mod_cache() | |
1087 |
|
1088 | |||
1088 | def magic_logstart(self,parameter_s=''): |
|
1089 | def magic_logstart(self,parameter_s=''): | |
1089 | """Start logging anywhere in a session. |
|
1090 | """Start logging anywhere in a session. | |
1090 |
|
1091 | |||
1091 | %logstart [-o|-r|-t] [log_name [log_mode]] |
|
1092 | %logstart [-o|-r|-t] [log_name [log_mode]] | |
1092 |
|
1093 | |||
1093 | If no name is given, it defaults to a file named 'ipython_log.py' in your |
|
1094 | If no name is given, it defaults to a file named 'ipython_log.py' in your | |
1094 | current directory, in 'rotate' mode (see below). |
|
1095 | current directory, in 'rotate' mode (see below). | |
1095 |
|
1096 | |||
1096 | '%logstart name' saves to file 'name' in 'backup' mode. It saves your |
|
1097 | '%logstart name' saves to file 'name' in 'backup' mode. It saves your | |
1097 | history up to that point and then continues logging. |
|
1098 | history up to that point and then continues logging. | |
1098 |
|
1099 | |||
1099 | %logstart takes a second optional parameter: logging mode. This can be one |
|
1100 | %logstart takes a second optional parameter: logging mode. This can be one | |
1100 | of (note that the modes are given unquoted):\\ |
|
1101 | of (note that the modes are given unquoted):\\ | |
1101 | append: well, that says it.\\ |
|
1102 | append: well, that says it.\\ | |
1102 | backup: rename (if exists) to name~ and start name.\\ |
|
1103 | backup: rename (if exists) to name~ and start name.\\ | |
1103 | global: single logfile in your home dir, appended to.\\ |
|
1104 | global: single logfile in your home dir, appended to.\\ | |
1104 | over : overwrite existing log.\\ |
|
1105 | over : overwrite existing log.\\ | |
1105 | rotate: create rotating logs name.1~, name.2~, etc. |
|
1106 | rotate: create rotating logs name.1~, name.2~, etc. | |
1106 |
|
1107 | |||
1107 | Options: |
|
1108 | Options: | |
1108 |
|
1109 | |||
1109 | -o: log also IPython's output. In this mode, all commands which |
|
1110 | -o: log also IPython's output. In this mode, all commands which | |
1110 | generate an Out[NN] prompt are recorded to the logfile, right after |
|
1111 | generate an Out[NN] prompt are recorded to the logfile, right after | |
1111 | their corresponding input line. The output lines are always |
|
1112 | their corresponding input line. The output lines are always | |
1112 | prepended with a '#[Out]# ' marker, so that the log remains valid |
|
1113 | prepended with a '#[Out]# ' marker, so that the log remains valid | |
1113 | Python code. |
|
1114 | Python code. | |
1114 |
|
1115 | |||
1115 | Since this marker is always the same, filtering only the output from |
|
1116 | Since this marker is always the same, filtering only the output from | |
1116 | a log is very easy, using for example a simple awk call: |
|
1117 | a log is very easy, using for example a simple awk call: | |
1117 |
|
1118 | |||
1118 | awk -F'#\\[Out\\]# ' '{if($2) {print $2}}' ipython_log.py |
|
1119 | awk -F'#\\[Out\\]# ' '{if($2) {print $2}}' ipython_log.py | |
1119 |
|
1120 | |||
1120 | -r: log 'raw' input. Normally, IPython's logs contain the processed |
|
1121 | -r: log 'raw' input. Normally, IPython's logs contain the processed | |
1121 | input, so that user lines are logged in their final form, converted |
|
1122 | input, so that user lines are logged in their final form, converted | |
1122 | into valid Python. For example, %Exit is logged as |
|
1123 | into valid Python. For example, %Exit is logged as | |
1123 | '_ip.magic("Exit"). If the -r flag is given, all input is logged |
|
1124 | '_ip.magic("Exit"). If the -r flag is given, all input is logged | |
1124 | exactly as typed, with no transformations applied. |
|
1125 | exactly as typed, with no transformations applied. | |
1125 |
|
1126 | |||
1126 | -t: put timestamps before each input line logged (these are put in |
|
1127 | -t: put timestamps before each input line logged (these are put in | |
1127 | comments).""" |
|
1128 | comments).""" | |
1128 |
|
1129 | |||
1129 | opts,par = self.parse_options(parameter_s,'ort') |
|
1130 | opts,par = self.parse_options(parameter_s,'ort') | |
1130 | log_output = 'o' in opts |
|
1131 | log_output = 'o' in opts | |
1131 | log_raw_input = 'r' in opts |
|
1132 | log_raw_input = 'r' in opts | |
1132 | timestamp = 't' in opts |
|
1133 | timestamp = 't' in opts | |
1133 |
|
1134 | |||
1134 | rc = self.shell.rc |
|
1135 | rc = self.shell.rc | |
1135 | logger = self.shell.logger |
|
1136 | logger = self.shell.logger | |
1136 |
|
1137 | |||
1137 | # if no args are given, the defaults set in the logger constructor by |
|
1138 | # if no args are given, the defaults set in the logger constructor by | |
1138 | # ipytohn remain valid |
|
1139 | # ipytohn remain valid | |
1139 | if par: |
|
1140 | if par: | |
1140 | try: |
|
1141 | try: | |
1141 | logfname,logmode = par.split() |
|
1142 | logfname,logmode = par.split() | |
1142 | except: |
|
1143 | except: | |
1143 | logfname = par |
|
1144 | logfname = par | |
1144 | logmode = 'backup' |
|
1145 | logmode = 'backup' | |
1145 | else: |
|
1146 | else: | |
1146 | logfname = logger.logfname |
|
1147 | logfname = logger.logfname | |
1147 | logmode = logger.logmode |
|
1148 | logmode = logger.logmode | |
1148 | # put logfname into rc struct as if it had been called on the command |
|
1149 | # put logfname into rc struct as if it had been called on the command | |
1149 | # line, so it ends up saved in the log header Save it in case we need |
|
1150 | # line, so it ends up saved in the log header Save it in case we need | |
1150 | # to restore it... |
|
1151 | # to restore it... | |
1151 | old_logfile = rc.opts.get('logfile','') |
|
1152 | old_logfile = rc.opts.get('logfile','') | |
1152 | if logfname: |
|
1153 | if logfname: | |
1153 | logfname = os.path.expanduser(logfname) |
|
1154 | logfname = os.path.expanduser(logfname) | |
1154 | rc.opts.logfile = logfname |
|
1155 | rc.opts.logfile = logfname | |
1155 | loghead = self.shell.loghead_tpl % (rc.opts,rc.args) |
|
1156 | loghead = self.shell.loghead_tpl % (rc.opts,rc.args) | |
1156 | try: |
|
1157 | try: | |
1157 | started = logger.logstart(logfname,loghead,logmode, |
|
1158 | started = logger.logstart(logfname,loghead,logmode, | |
1158 | log_output,timestamp,log_raw_input) |
|
1159 | log_output,timestamp,log_raw_input) | |
1159 | except: |
|
1160 | except: | |
1160 | rc.opts.logfile = old_logfile |
|
1161 | rc.opts.logfile = old_logfile | |
1161 | warn("Couldn't start log: %s" % sys.exc_info()[1]) |
|
1162 | warn("Couldn't start log: %s" % sys.exc_info()[1]) | |
1162 | else: |
|
1163 | else: | |
1163 | # log input history up to this point, optionally interleaving |
|
1164 | # log input history up to this point, optionally interleaving | |
1164 | # output if requested |
|
1165 | # output if requested | |
1165 |
|
1166 | |||
1166 | if timestamp: |
|
1167 | if timestamp: | |
1167 | # disable timestamping for the previous history, since we've |
|
1168 | # disable timestamping for the previous history, since we've | |
1168 | # lost those already (no time machine here). |
|
1169 | # lost those already (no time machine here). | |
1169 | logger.timestamp = False |
|
1170 | logger.timestamp = False | |
1170 |
|
1171 | |||
1171 | if log_raw_input: |
|
1172 | if log_raw_input: | |
1172 | input_hist = self.shell.input_hist_raw |
|
1173 | input_hist = self.shell.input_hist_raw | |
1173 | else: |
|
1174 | else: | |
1174 | input_hist = self.shell.input_hist |
|
1175 | input_hist = self.shell.input_hist | |
1175 |
|
1176 | |||
1176 | if log_output: |
|
1177 | if log_output: | |
1177 | log_write = logger.log_write |
|
1178 | log_write = logger.log_write | |
1178 | output_hist = self.shell.output_hist |
|
1179 | output_hist = self.shell.output_hist | |
1179 | for n in range(1,len(input_hist)-1): |
|
1180 | for n in range(1,len(input_hist)-1): | |
1180 | log_write(input_hist[n].rstrip()) |
|
1181 | log_write(input_hist[n].rstrip()) | |
1181 | if n in output_hist: |
|
1182 | if n in output_hist: | |
1182 | log_write(repr(output_hist[n]),'output') |
|
1183 | log_write(repr(output_hist[n]),'output') | |
1183 | else: |
|
1184 | else: | |
1184 | logger.log_write(input_hist[1:]) |
|
1185 | logger.log_write(input_hist[1:]) | |
1185 | if timestamp: |
|
1186 | if timestamp: | |
1186 | # re-enable timestamping |
|
1187 | # re-enable timestamping | |
1187 | logger.timestamp = True |
|
1188 | logger.timestamp = True | |
1188 |
|
1189 | |||
1189 | print ('Activating auto-logging. ' |
|
1190 | print ('Activating auto-logging. ' | |
1190 | 'Current session state plus future input saved.') |
|
1191 | 'Current session state plus future input saved.') | |
1191 | logger.logstate() |
|
1192 | logger.logstate() | |
1192 |
|
1193 | |||
1193 | def magic_logstop(self,parameter_s=''): |
|
1194 | def magic_logstop(self,parameter_s=''): | |
1194 | """Fully stop logging and close log file. |
|
1195 | """Fully stop logging and close log file. | |
1195 |
|
1196 | |||
1196 | In order to start logging again, a new %logstart call needs to be made, |
|
1197 | In order to start logging again, a new %logstart call needs to be made, | |
1197 | possibly (though not necessarily) with a new filename, mode and other |
|
1198 | possibly (though not necessarily) with a new filename, mode and other | |
1198 | options.""" |
|
1199 | options.""" | |
1199 | self.logger.logstop() |
|
1200 | self.logger.logstop() | |
1200 |
|
1201 | |||
1201 | def magic_logoff(self,parameter_s=''): |
|
1202 | def magic_logoff(self,parameter_s=''): | |
1202 | """Temporarily stop logging. |
|
1203 | """Temporarily stop logging. | |
1203 |
|
1204 | |||
1204 | You must have previously started logging.""" |
|
1205 | You must have previously started logging.""" | |
1205 | self.shell.logger.switch_log(0) |
|
1206 | self.shell.logger.switch_log(0) | |
1206 |
|
1207 | |||
1207 | def magic_logon(self,parameter_s=''): |
|
1208 | def magic_logon(self,parameter_s=''): | |
1208 | """Restart logging. |
|
1209 | """Restart logging. | |
1209 |
|
1210 | |||
1210 | This function is for restarting logging which you've temporarily |
|
1211 | This function is for restarting logging which you've temporarily | |
1211 | stopped with %logoff. For starting logging for the first time, you |
|
1212 | stopped with %logoff. For starting logging for the first time, you | |
1212 | must use the %logstart function, which allows you to specify an |
|
1213 | must use the %logstart function, which allows you to specify an | |
1213 | optional log filename.""" |
|
1214 | optional log filename.""" | |
1214 |
|
1215 | |||
1215 | self.shell.logger.switch_log(1) |
|
1216 | self.shell.logger.switch_log(1) | |
1216 |
|
1217 | |||
1217 | def magic_logstate(self,parameter_s=''): |
|
1218 | def magic_logstate(self,parameter_s=''): | |
1218 | """Print the status of the logging system.""" |
|
1219 | """Print the status of the logging system.""" | |
1219 |
|
1220 | |||
1220 | self.shell.logger.logstate() |
|
1221 | self.shell.logger.logstate() | |
1221 |
|
1222 | |||
1222 | def magic_pdb(self, parameter_s=''): |
|
1223 | def magic_pdb(self, parameter_s=''): | |
1223 | """Control the automatic calling of the pdb interactive debugger. |
|
1224 | """Control the automatic calling of the pdb interactive debugger. | |
1224 |
|
1225 | |||
1225 | Call as '%pdb on', '%pdb 1', '%pdb off' or '%pdb 0'. If called without |
|
1226 | Call as '%pdb on', '%pdb 1', '%pdb off' or '%pdb 0'. If called without | |
1226 | argument it works as a toggle. |
|
1227 | argument it works as a toggle. | |
1227 |
|
1228 | |||
1228 | When an exception is triggered, IPython can optionally call the |
|
1229 | When an exception is triggered, IPython can optionally call the | |
1229 | interactive pdb debugger after the traceback printout. %pdb toggles |
|
1230 | interactive pdb debugger after the traceback printout. %pdb toggles | |
1230 | this feature on and off. |
|
1231 | this feature on and off. | |
1231 |
|
1232 | |||
1232 | The initial state of this feature is set in your ipythonrc |
|
1233 | The initial state of this feature is set in your ipythonrc | |
1233 | configuration file (the variable is called 'pdb'). |
|
1234 | configuration file (the variable is called 'pdb'). | |
1234 |
|
1235 | |||
1235 | If you want to just activate the debugger AFTER an exception has fired, |
|
1236 | If you want to just activate the debugger AFTER an exception has fired, | |
1236 | without having to type '%pdb on' and rerunning your code, you can use |
|
1237 | without having to type '%pdb on' and rerunning your code, you can use | |
1237 | the %debug magic.""" |
|
1238 | the %debug magic.""" | |
1238 |
|
1239 | |||
1239 | par = parameter_s.strip().lower() |
|
1240 | par = parameter_s.strip().lower() | |
1240 |
|
1241 | |||
1241 | if par: |
|
1242 | if par: | |
1242 | try: |
|
1243 | try: | |
1243 | new_pdb = {'off':0,'0':0,'on':1,'1':1}[par] |
|
1244 | new_pdb = {'off':0,'0':0,'on':1,'1':1}[par] | |
1244 | except KeyError: |
|
1245 | except KeyError: | |
1245 | print ('Incorrect argument. Use on/1, off/0, ' |
|
1246 | print ('Incorrect argument. Use on/1, off/0, ' | |
1246 | 'or nothing for a toggle.') |
|
1247 | 'or nothing for a toggle.') | |
1247 | return |
|
1248 | return | |
1248 | else: |
|
1249 | else: | |
1249 | # toggle |
|
1250 | # toggle | |
1250 | new_pdb = not self.shell.call_pdb |
|
1251 | new_pdb = not self.shell.call_pdb | |
1251 |
|
1252 | |||
1252 | # set on the shell |
|
1253 | # set on the shell | |
1253 | self.shell.call_pdb = new_pdb |
|
1254 | self.shell.call_pdb = new_pdb | |
1254 | print 'Automatic pdb calling has been turned',on_off(new_pdb) |
|
1255 | print 'Automatic pdb calling has been turned',on_off(new_pdb) | |
1255 |
|
1256 | |||
1256 | def magic_debug(self, parameter_s=''): |
|
1257 | def magic_debug(self, parameter_s=''): | |
1257 | """Activate the interactive debugger in post-mortem mode. |
|
1258 | """Activate the interactive debugger in post-mortem mode. | |
1258 |
|
1259 | |||
1259 | If an exception has just occurred, this lets you inspect its stack |
|
1260 | If an exception has just occurred, this lets you inspect its stack | |
1260 | frames interactively. Note that this will always work only on the last |
|
1261 | frames interactively. Note that this will always work only on the last | |
1261 | traceback that occurred, so you must call this quickly after an |
|
1262 | traceback that occurred, so you must call this quickly after an | |
1262 | exception that you wish to inspect has fired, because if another one |
|
1263 | exception that you wish to inspect has fired, because if another one | |
1263 | occurs, it clobbers the previous one. |
|
1264 | occurs, it clobbers the previous one. | |
1264 |
|
1265 | |||
1265 | If you want IPython to automatically do this on every exception, see |
|
1266 | If you want IPython to automatically do this on every exception, see | |
1266 | the %pdb magic for more details. |
|
1267 | the %pdb magic for more details. | |
1267 | """ |
|
1268 | """ | |
1268 |
|
1269 | |||
1269 | self.shell.debugger(force=True) |
|
1270 | self.shell.debugger(force=True) | |
1270 |
|
1271 | |||
1271 | @testdec.skip_doctest |
|
1272 | @testdec.skip_doctest | |
1272 | def magic_prun(self, parameter_s ='',user_mode=1, |
|
1273 | def magic_prun(self, parameter_s ='',user_mode=1, | |
1273 | opts=None,arg_lst=None,prog_ns=None): |
|
1274 | opts=None,arg_lst=None,prog_ns=None): | |
1274 |
|
1275 | |||
1275 | """Run a statement through the python code profiler. |
|
1276 | """Run a statement through the python code profiler. | |
1276 |
|
1277 | |||
1277 | Usage: |
|
1278 | Usage: | |
1278 | %prun [options] statement |
|
1279 | %prun [options] statement | |
1279 |
|
1280 | |||
1280 | The given statement (which doesn't require quote marks) is run via the |
|
1281 | The given statement (which doesn't require quote marks) is run via the | |
1281 | python profiler in a manner similar to the profile.run() function. |
|
1282 | python profiler in a manner similar to the profile.run() function. | |
1282 | Namespaces are internally managed to work correctly; profile.run |
|
1283 | Namespaces are internally managed to work correctly; profile.run | |
1283 | cannot be used in IPython because it makes certain assumptions about |
|
1284 | cannot be used in IPython because it makes certain assumptions about | |
1284 | namespaces which do not hold under IPython. |
|
1285 | namespaces which do not hold under IPython. | |
1285 |
|
1286 | |||
1286 | Options: |
|
1287 | Options: | |
1287 |
|
1288 | |||
1288 | -l <limit>: you can place restrictions on what or how much of the |
|
1289 | -l <limit>: you can place restrictions on what or how much of the | |
1289 | profile gets printed. The limit value can be: |
|
1290 | profile gets printed. The limit value can be: | |
1290 |
|
1291 | |||
1291 | * A string: only information for function names containing this string |
|
1292 | * A string: only information for function names containing this string | |
1292 | is printed. |
|
1293 | is printed. | |
1293 |
|
1294 | |||
1294 | * An integer: only these many lines are printed. |
|
1295 | * An integer: only these many lines are printed. | |
1295 |
|
1296 | |||
1296 | * A float (between 0 and 1): this fraction of the report is printed |
|
1297 | * A float (between 0 and 1): this fraction of the report is printed | |
1297 | (for example, use a limit of 0.4 to see the topmost 40% only). |
|
1298 | (for example, use a limit of 0.4 to see the topmost 40% only). | |
1298 |
|
1299 | |||
1299 | You can combine several limits with repeated use of the option. For |
|
1300 | You can combine several limits with repeated use of the option. For | |
1300 | example, '-l __init__ -l 5' will print only the topmost 5 lines of |
|
1301 | example, '-l __init__ -l 5' will print only the topmost 5 lines of | |
1301 | information about class constructors. |
|
1302 | information about class constructors. | |
1302 |
|
1303 | |||
1303 | -r: return the pstats.Stats object generated by the profiling. This |
|
1304 | -r: return the pstats.Stats object generated by the profiling. This | |
1304 | object has all the information about the profile in it, and you can |
|
1305 | object has all the information about the profile in it, and you can | |
1305 | later use it for further analysis or in other functions. |
|
1306 | later use it for further analysis or in other functions. | |
1306 |
|
1307 | |||
1307 | -s <key>: sort profile by given key. You can provide more than one key |
|
1308 | -s <key>: sort profile by given key. You can provide more than one key | |
1308 | by using the option several times: '-s key1 -s key2 -s key3...'. The |
|
1309 | by using the option several times: '-s key1 -s key2 -s key3...'. The | |
1309 | default sorting key is 'time'. |
|
1310 | default sorting key is 'time'. | |
1310 |
|
1311 | |||
1311 | The following is copied verbatim from the profile documentation |
|
1312 | The following is copied verbatim from the profile documentation | |
1312 | referenced below: |
|
1313 | referenced below: | |
1313 |
|
1314 | |||
1314 | When more than one key is provided, additional keys are used as |
|
1315 | When more than one key is provided, additional keys are used as | |
1315 | secondary criteria when the there is equality in all keys selected |
|
1316 | secondary criteria when the there is equality in all keys selected | |
1316 | before them. |
|
1317 | before them. | |
1317 |
|
1318 | |||
1318 | Abbreviations can be used for any key names, as long as the |
|
1319 | Abbreviations can be used for any key names, as long as the | |
1319 | abbreviation is unambiguous. The following are the keys currently |
|
1320 | abbreviation is unambiguous. The following are the keys currently | |
1320 | defined: |
|
1321 | defined: | |
1321 |
|
1322 | |||
1322 | Valid Arg Meaning |
|
1323 | Valid Arg Meaning | |
1323 | "calls" call count |
|
1324 | "calls" call count | |
1324 | "cumulative" cumulative time |
|
1325 | "cumulative" cumulative time | |
1325 | "file" file name |
|
1326 | "file" file name | |
1326 | "module" file name |
|
1327 | "module" file name | |
1327 | "pcalls" primitive call count |
|
1328 | "pcalls" primitive call count | |
1328 | "line" line number |
|
1329 | "line" line number | |
1329 | "name" function name |
|
1330 | "name" function name | |
1330 | "nfl" name/file/line |
|
1331 | "nfl" name/file/line | |
1331 | "stdname" standard name |
|
1332 | "stdname" standard name | |
1332 | "time" internal time |
|
1333 | "time" internal time | |
1333 |
|
1334 | |||
1334 | Note that all sorts on statistics are in descending order (placing |
|
1335 | Note that all sorts on statistics are in descending order (placing | |
1335 | most time consuming items first), where as name, file, and line number |
|
1336 | most time consuming items first), where as name, file, and line number | |
1336 | searches are in ascending order (i.e., alphabetical). The subtle |
|
1337 | searches are in ascending order (i.e., alphabetical). The subtle | |
1337 | distinction between "nfl" and "stdname" is that the standard name is a |
|
1338 | distinction between "nfl" and "stdname" is that the standard name is a | |
1338 | sort of the name as printed, which means that the embedded line |
|
1339 | sort of the name as printed, which means that the embedded line | |
1339 | numbers get compared in an odd way. For example, lines 3, 20, and 40 |
|
1340 | numbers get compared in an odd way. For example, lines 3, 20, and 40 | |
1340 | would (if the file names were the same) appear in the string order |
|
1341 | would (if the file names were the same) appear in the string order | |
1341 | "20" "3" and "40". In contrast, "nfl" does a numeric compare of the |
|
1342 | "20" "3" and "40". In contrast, "nfl" does a numeric compare of the | |
1342 | line numbers. In fact, sort_stats("nfl") is the same as |
|
1343 | line numbers. In fact, sort_stats("nfl") is the same as | |
1343 | sort_stats("name", "file", "line"). |
|
1344 | sort_stats("name", "file", "line"). | |
1344 |
|
1345 | |||
1345 | -T <filename>: save profile results as shown on screen to a text |
|
1346 | -T <filename>: save profile results as shown on screen to a text | |
1346 | file. The profile is still shown on screen. |
|
1347 | file. The profile is still shown on screen. | |
1347 |
|
1348 | |||
1348 | -D <filename>: save (via dump_stats) profile statistics to given |
|
1349 | -D <filename>: save (via dump_stats) profile statistics to given | |
1349 | filename. This data is in a format understod by the pstats module, and |
|
1350 | filename. This data is in a format understod by the pstats module, and | |
1350 | is generated by a call to the dump_stats() method of profile |
|
1351 | is generated by a call to the dump_stats() method of profile | |
1351 | objects. The profile is still shown on screen. |
|
1352 | objects. The profile is still shown on screen. | |
1352 |
|
1353 | |||
1353 | If you want to run complete programs under the profiler's control, use |
|
1354 | If you want to run complete programs under the profiler's control, use | |
1354 | '%run -p [prof_opts] filename.py [args to program]' where prof_opts |
|
1355 | '%run -p [prof_opts] filename.py [args to program]' where prof_opts | |
1355 | contains profiler specific options as described here. |
|
1356 | contains profiler specific options as described here. | |
1356 |
|
1357 | |||
1357 | You can read the complete documentation for the profile module with:: |
|
1358 | You can read the complete documentation for the profile module with:: | |
1358 |
|
1359 | |||
1359 | In [1]: import profile; profile.help() |
|
1360 | In [1]: import profile; profile.help() | |
1360 | """ |
|
1361 | """ | |
1361 |
|
1362 | |||
1362 | opts_def = Struct(D=[''],l=[],s=['time'],T=['']) |
|
1363 | opts_def = Struct(D=[''],l=[],s=['time'],T=['']) | |
1363 | # protect user quote marks |
|
1364 | # protect user quote marks | |
1364 | parameter_s = parameter_s.replace('"',r'\"').replace("'",r"\'") |
|
1365 | parameter_s = parameter_s.replace('"',r'\"').replace("'",r"\'") | |
1365 |
|
1366 | |||
1366 | if user_mode: # regular user call |
|
1367 | if user_mode: # regular user call | |
1367 | opts,arg_str = self.parse_options(parameter_s,'D:l:rs:T:', |
|
1368 | opts,arg_str = self.parse_options(parameter_s,'D:l:rs:T:', | |
1368 | list_all=1) |
|
1369 | list_all=1) | |
1369 | namespace = self.shell.user_ns |
|
1370 | namespace = self.shell.user_ns | |
1370 | else: # called to run a program by %run -p |
|
1371 | else: # called to run a program by %run -p | |
1371 | try: |
|
1372 | try: | |
1372 | filename = get_py_filename(arg_lst[0]) |
|
1373 | filename = get_py_filename(arg_lst[0]) | |
1373 | except IOError,msg: |
|
1374 | except IOError,msg: | |
1374 | error(msg) |
|
1375 | error(msg) | |
1375 | return |
|
1376 | return | |
1376 |
|
1377 | |||
1377 | arg_str = 'execfile(filename,prog_ns)' |
|
1378 | arg_str = 'execfile(filename,prog_ns)' | |
1378 | namespace = locals() |
|
1379 | namespace = locals() | |
1379 |
|
1380 | |||
1380 | opts.merge(opts_def) |
|
1381 | opts.merge(opts_def) | |
1381 |
|
1382 | |||
1382 | prof = profile.Profile() |
|
1383 | prof = profile.Profile() | |
1383 | try: |
|
1384 | try: | |
1384 | prof = prof.runctx(arg_str,namespace,namespace) |
|
1385 | prof = prof.runctx(arg_str,namespace,namespace) | |
1385 | sys_exit = '' |
|
1386 | sys_exit = '' | |
1386 | except SystemExit: |
|
1387 | except SystemExit: | |
1387 | sys_exit = """*** SystemExit exception caught in code being profiled.""" |
|
1388 | sys_exit = """*** SystemExit exception caught in code being profiled.""" | |
1388 |
|
1389 | |||
1389 | stats = pstats.Stats(prof).strip_dirs().sort_stats(*opts.s) |
|
1390 | stats = pstats.Stats(prof).strip_dirs().sort_stats(*opts.s) | |
1390 |
|
1391 | |||
1391 | lims = opts.l |
|
1392 | lims = opts.l | |
1392 | if lims: |
|
1393 | if lims: | |
1393 | lims = [] # rebuild lims with ints/floats/strings |
|
1394 | lims = [] # rebuild lims with ints/floats/strings | |
1394 | for lim in opts.l: |
|
1395 | for lim in opts.l: | |
1395 | try: |
|
1396 | try: | |
1396 | lims.append(int(lim)) |
|
1397 | lims.append(int(lim)) | |
1397 | except ValueError: |
|
1398 | except ValueError: | |
1398 | try: |
|
1399 | try: | |
1399 | lims.append(float(lim)) |
|
1400 | lims.append(float(lim)) | |
1400 | except ValueError: |
|
1401 | except ValueError: | |
1401 | lims.append(lim) |
|
1402 | lims.append(lim) | |
1402 |
|
1403 | |||
1403 | # Trap output. |
|
1404 | # Trap output. | |
1404 | stdout_trap = StringIO() |
|
1405 | stdout_trap = StringIO() | |
1405 |
|
1406 | |||
1406 | if hasattr(stats,'stream'): |
|
1407 | if hasattr(stats,'stream'): | |
1407 | # In newer versions of python, the stats object has a 'stream' |
|
1408 | # In newer versions of python, the stats object has a 'stream' | |
1408 | # attribute to write into. |
|
1409 | # attribute to write into. | |
1409 | stats.stream = stdout_trap |
|
1410 | stats.stream = stdout_trap | |
1410 | stats.print_stats(*lims) |
|
1411 | stats.print_stats(*lims) | |
1411 | else: |
|
1412 | else: | |
1412 | # For older versions, we manually redirect stdout during printing |
|
1413 | # For older versions, we manually redirect stdout during printing | |
1413 | sys_stdout = sys.stdout |
|
1414 | sys_stdout = sys.stdout | |
1414 | try: |
|
1415 | try: | |
1415 | sys.stdout = stdout_trap |
|
1416 | sys.stdout = stdout_trap | |
1416 | stats.print_stats(*lims) |
|
1417 | stats.print_stats(*lims) | |
1417 | finally: |
|
1418 | finally: | |
1418 | sys.stdout = sys_stdout |
|
1419 | sys.stdout = sys_stdout | |
1419 |
|
1420 | |||
1420 | output = stdout_trap.getvalue() |
|
1421 | output = stdout_trap.getvalue() | |
1421 | output = output.rstrip() |
|
1422 | output = output.rstrip() | |
1422 |
|
1423 | |||
1423 | page(output,screen_lines=self.shell.rc.screen_length) |
|
1424 | page(output,screen_lines=self.shell.rc.screen_length) | |
1424 | print sys_exit, |
|
1425 | print sys_exit, | |
1425 |
|
1426 | |||
1426 | dump_file = opts.D[0] |
|
1427 | dump_file = opts.D[0] | |
1427 | text_file = opts.T[0] |
|
1428 | text_file = opts.T[0] | |
1428 | if dump_file: |
|
1429 | if dump_file: | |
1429 | prof.dump_stats(dump_file) |
|
1430 | prof.dump_stats(dump_file) | |
1430 | print '\n*** Profile stats marshalled to file',\ |
|
1431 | print '\n*** Profile stats marshalled to file',\ | |
1431 | `dump_file`+'.',sys_exit |
|
1432 | `dump_file`+'.',sys_exit | |
1432 | if text_file: |
|
1433 | if text_file: | |
1433 | pfile = file(text_file,'w') |
|
1434 | pfile = file(text_file,'w') | |
1434 | pfile.write(output) |
|
1435 | pfile.write(output) | |
1435 | pfile.close() |
|
1436 | pfile.close() | |
1436 | print '\n*** Profile printout saved to text file',\ |
|
1437 | print '\n*** Profile printout saved to text file',\ | |
1437 | `text_file`+'.',sys_exit |
|
1438 | `text_file`+'.',sys_exit | |
1438 |
|
1439 | |||
1439 | if opts.has_key('r'): |
|
1440 | if opts.has_key('r'): | |
1440 | return stats |
|
1441 | return stats | |
1441 | else: |
|
1442 | else: | |
1442 | return None |
|
1443 | return None | |
1443 |
|
1444 | |||
1444 | @testdec.skip_doctest |
|
1445 | @testdec.skip_doctest | |
1445 | def magic_run(self, parameter_s ='',runner=None, |
|
1446 | def magic_run(self, parameter_s ='',runner=None, | |
1446 | file_finder=get_py_filename): |
|
1447 | file_finder=get_py_filename): | |
1447 | """Run the named file inside IPython as a program. |
|
1448 | """Run the named file inside IPython as a program. | |
1448 |
|
1449 | |||
1449 | Usage:\\ |
|
1450 | Usage:\\ | |
1450 | %run [-n -i -t [-N<N>] -d [-b<N>] -p [profile options]] file [args] |
|
1451 | %run [-n -i -t [-N<N>] -d [-b<N>] -p [profile options]] file [args] | |
1451 |
|
1452 | |||
1452 | Parameters after the filename are passed as command-line arguments to |
|
1453 | Parameters after the filename are passed as command-line arguments to | |
1453 | the program (put in sys.argv). Then, control returns to IPython's |
|
1454 | the program (put in sys.argv). Then, control returns to IPython's | |
1454 | prompt. |
|
1455 | prompt. | |
1455 |
|
1456 | |||
1456 | This is similar to running at a system prompt:\\ |
|
1457 | This is similar to running at a system prompt:\\ | |
1457 | $ python file args\\ |
|
1458 | $ python file args\\ | |
1458 | but with the advantage of giving you IPython's tracebacks, and of |
|
1459 | but with the advantage of giving you IPython's tracebacks, and of | |
1459 | loading all variables into your interactive namespace for further use |
|
1460 | loading all variables into your interactive namespace for further use | |
1460 | (unless -p is used, see below). |
|
1461 | (unless -p is used, see below). | |
1461 |
|
1462 | |||
1462 | The file is executed in a namespace initially consisting only of |
|
1463 | The file is executed in a namespace initially consisting only of | |
1463 | __name__=='__main__' and sys.argv constructed as indicated. It thus |
|
1464 | __name__=='__main__' and sys.argv constructed as indicated. It thus | |
1464 | sees its environment as if it were being run as a stand-alone program |
|
1465 | sees its environment as if it were being run as a stand-alone program | |
1465 | (except for sharing global objects such as previously imported |
|
1466 | (except for sharing global objects such as previously imported | |
1466 | modules). But after execution, the IPython interactive namespace gets |
|
1467 | modules). But after execution, the IPython interactive namespace gets | |
1467 | updated with all variables defined in the program (except for __name__ |
|
1468 | updated with all variables defined in the program (except for __name__ | |
1468 | and sys.argv). This allows for very convenient loading of code for |
|
1469 | and sys.argv). This allows for very convenient loading of code for | |
1469 | interactive work, while giving each program a 'clean sheet' to run in. |
|
1470 | interactive work, while giving each program a 'clean sheet' to run in. | |
1470 |
|
1471 | |||
1471 | Options: |
|
1472 | Options: | |
1472 |
|
1473 | |||
1473 | -n: __name__ is NOT set to '__main__', but to the running file's name |
|
1474 | -n: __name__ is NOT set to '__main__', but to the running file's name | |
1474 | without extension (as python does under import). This allows running |
|
1475 | without extension (as python does under import). This allows running | |
1475 | scripts and reloading the definitions in them without calling code |
|
1476 | scripts and reloading the definitions in them without calling code | |
1476 | protected by an ' if __name__ == "__main__" ' clause. |
|
1477 | protected by an ' if __name__ == "__main__" ' clause. | |
1477 |
|
1478 | |||
1478 | -i: run the file in IPython's namespace instead of an empty one. This |
|
1479 | -i: run the file in IPython's namespace instead of an empty one. This | |
1479 | is useful if you are experimenting with code written in a text editor |
|
1480 | is useful if you are experimenting with code written in a text editor | |
1480 | which depends on variables defined interactively. |
|
1481 | which depends on variables defined interactively. | |
1481 |
|
1482 | |||
1482 | -e: ignore sys.exit() calls or SystemExit exceptions in the script |
|
1483 | -e: ignore sys.exit() calls or SystemExit exceptions in the script | |
1483 | being run. This is particularly useful if IPython is being used to |
|
1484 | being run. This is particularly useful if IPython is being used to | |
1484 | run unittests, which always exit with a sys.exit() call. In such |
|
1485 | run unittests, which always exit with a sys.exit() call. In such | |
1485 | cases you are interested in the output of the test results, not in |
|
1486 | cases you are interested in the output of the test results, not in | |
1486 | seeing a traceback of the unittest module. |
|
1487 | seeing a traceback of the unittest module. | |
1487 |
|
1488 | |||
1488 | -t: print timing information at the end of the run. IPython will give |
|
1489 | -t: print timing information at the end of the run. IPython will give | |
1489 | you an estimated CPU time consumption for your script, which under |
|
1490 | you an estimated CPU time consumption for your script, which under | |
1490 | Unix uses the resource module to avoid the wraparound problems of |
|
1491 | Unix uses the resource module to avoid the wraparound problems of | |
1491 | time.clock(). Under Unix, an estimate of time spent on system tasks |
|
1492 | time.clock(). Under Unix, an estimate of time spent on system tasks | |
1492 | is also given (for Windows platforms this is reported as 0.0). |
|
1493 | is also given (for Windows platforms this is reported as 0.0). | |
1493 |
|
1494 | |||
1494 | If -t is given, an additional -N<N> option can be given, where <N> |
|
1495 | If -t is given, an additional -N<N> option can be given, where <N> | |
1495 | must be an integer indicating how many times you want the script to |
|
1496 | must be an integer indicating how many times you want the script to | |
1496 | run. The final timing report will include total and per run results. |
|
1497 | run. The final timing report will include total and per run results. | |
1497 |
|
1498 | |||
1498 | For example (testing the script uniq_stable.py): |
|
1499 | For example (testing the script uniq_stable.py): | |
1499 |
|
1500 | |||
1500 | In [1]: run -t uniq_stable |
|
1501 | In [1]: run -t uniq_stable | |
1501 |
|
1502 | |||
1502 | IPython CPU timings (estimated):\\ |
|
1503 | IPython CPU timings (estimated):\\ | |
1503 | User : 0.19597 s.\\ |
|
1504 | User : 0.19597 s.\\ | |
1504 | System: 0.0 s.\\ |
|
1505 | System: 0.0 s.\\ | |
1505 |
|
1506 | |||
1506 | In [2]: run -t -N5 uniq_stable |
|
1507 | In [2]: run -t -N5 uniq_stable | |
1507 |
|
1508 | |||
1508 | IPython CPU timings (estimated):\\ |
|
1509 | IPython CPU timings (estimated):\\ | |
1509 | Total runs performed: 5\\ |
|
1510 | Total runs performed: 5\\ | |
1510 | Times : Total Per run\\ |
|
1511 | Times : Total Per run\\ | |
1511 | User : 0.910862 s, 0.1821724 s.\\ |
|
1512 | User : 0.910862 s, 0.1821724 s.\\ | |
1512 | System: 0.0 s, 0.0 s. |
|
1513 | System: 0.0 s, 0.0 s. | |
1513 |
|
1514 | |||
1514 | -d: run your program under the control of pdb, the Python debugger. |
|
1515 | -d: run your program under the control of pdb, the Python debugger. | |
1515 | This allows you to execute your program step by step, watch variables, |
|
1516 | This allows you to execute your program step by step, watch variables, | |
1516 | etc. Internally, what IPython does is similar to calling: |
|
1517 | etc. Internally, what IPython does is similar to calling: | |
1517 |
|
1518 | |||
1518 | pdb.run('execfile("YOURFILENAME")') |
|
1519 | pdb.run('execfile("YOURFILENAME")') | |
1519 |
|
1520 | |||
1520 | with a breakpoint set on line 1 of your file. You can change the line |
|
1521 | with a breakpoint set on line 1 of your file. You can change the line | |
1521 | number for this automatic breakpoint to be <N> by using the -bN option |
|
1522 | number for this automatic breakpoint to be <N> by using the -bN option | |
1522 | (where N must be an integer). For example: |
|
1523 | (where N must be an integer). For example: | |
1523 |
|
1524 | |||
1524 | %run -d -b40 myscript |
|
1525 | %run -d -b40 myscript | |
1525 |
|
1526 | |||
1526 | will set the first breakpoint at line 40 in myscript.py. Note that |
|
1527 | will set the first breakpoint at line 40 in myscript.py. Note that | |
1527 | the first breakpoint must be set on a line which actually does |
|
1528 | the first breakpoint must be set on a line which actually does | |
1528 | something (not a comment or docstring) for it to stop execution. |
|
1529 | something (not a comment or docstring) for it to stop execution. | |
1529 |
|
1530 | |||
1530 | When the pdb debugger starts, you will see a (Pdb) prompt. You must |
|
1531 | When the pdb debugger starts, you will see a (Pdb) prompt. You must | |
1531 | first enter 'c' (without qoutes) to start execution up to the first |
|
1532 | first enter 'c' (without qoutes) to start execution up to the first | |
1532 | breakpoint. |
|
1533 | breakpoint. | |
1533 |
|
1534 | |||
1534 | Entering 'help' gives information about the use of the debugger. You |
|
1535 | Entering 'help' gives information about the use of the debugger. You | |
1535 | can easily see pdb's full documentation with "import pdb;pdb.help()" |
|
1536 | can easily see pdb's full documentation with "import pdb;pdb.help()" | |
1536 | at a prompt. |
|
1537 | at a prompt. | |
1537 |
|
1538 | |||
1538 | -p: run program under the control of the Python profiler module (which |
|
1539 | -p: run program under the control of the Python profiler module (which | |
1539 | prints a detailed report of execution times, function calls, etc). |
|
1540 | prints a detailed report of execution times, function calls, etc). | |
1540 |
|
1541 | |||
1541 | You can pass other options after -p which affect the behavior of the |
|
1542 | You can pass other options after -p which affect the behavior of the | |
1542 | profiler itself. See the docs for %prun for details. |
|
1543 | profiler itself. See the docs for %prun for details. | |
1543 |
|
1544 | |||
1544 | In this mode, the program's variables do NOT propagate back to the |
|
1545 | In this mode, the program's variables do NOT propagate back to the | |
1545 | IPython interactive namespace (because they remain in the namespace |
|
1546 | IPython interactive namespace (because they remain in the namespace | |
1546 | where the profiler executes them). |
|
1547 | where the profiler executes them). | |
1547 |
|
1548 | |||
1548 | Internally this triggers a call to %prun, see its documentation for |
|
1549 | Internally this triggers a call to %prun, see its documentation for | |
1549 | details on the options available specifically for profiling. |
|
1550 | details on the options available specifically for profiling. | |
1550 |
|
1551 | |||
1551 | There is one special usage for which the text above doesn't apply: |
|
1552 | There is one special usage for which the text above doesn't apply: | |
1552 | if the filename ends with .ipy, the file is run as ipython script, |
|
1553 | if the filename ends with .ipy, the file is run as ipython script, | |
1553 | just as if the commands were written on IPython prompt. |
|
1554 | just as if the commands were written on IPython prompt. | |
1554 | """ |
|
1555 | """ | |
1555 |
|
1556 | |||
1556 | # get arguments and set sys.argv for program to be run. |
|
1557 | # get arguments and set sys.argv for program to be run. | |
1557 | opts,arg_lst = self.parse_options(parameter_s,'nidtN:b:pD:l:rs:T:e', |
|
1558 | opts,arg_lst = self.parse_options(parameter_s,'nidtN:b:pD:l:rs:T:e', | |
1558 | mode='list',list_all=1) |
|
1559 | mode='list',list_all=1) | |
1559 |
|
1560 | |||
1560 | try: |
|
1561 | try: | |
1561 | filename = file_finder(arg_lst[0]) |
|
1562 | filename = file_finder(arg_lst[0]) | |
1562 | except IndexError: |
|
1563 | except IndexError: | |
1563 | warn('you must provide at least a filename.') |
|
1564 | warn('you must provide at least a filename.') | |
1564 | print '\n%run:\n',OInspect.getdoc(self.magic_run) |
|
1565 | print '\n%run:\n',OInspect.getdoc(self.magic_run) | |
1565 | return |
|
1566 | return | |
1566 | except IOError,msg: |
|
1567 | except IOError,msg: | |
1567 | error(msg) |
|
1568 | error(msg) | |
1568 | return |
|
1569 | return | |
1569 |
|
1570 | |||
1570 | if filename.lower().endswith('.ipy'): |
|
1571 | if filename.lower().endswith('.ipy'): | |
1571 | self.api.runlines(open(filename).read()) |
|
1572 | self.api.runlines(open(filename).read()) | |
1572 | return |
|
1573 | return | |
1573 |
|
1574 | |||
1574 | # Control the response to exit() calls made by the script being run |
|
1575 | # Control the response to exit() calls made by the script being run | |
1575 | exit_ignore = opts.has_key('e') |
|
1576 | exit_ignore = opts.has_key('e') | |
1576 |
|
1577 | |||
1577 | # Make sure that the running script gets a proper sys.argv as if it |
|
1578 | # Make sure that the running script gets a proper sys.argv as if it | |
1578 | # were run from a system shell. |
|
1579 | # were run from a system shell. | |
1579 | save_argv = sys.argv # save it for later restoring |
|
1580 | save_argv = sys.argv # save it for later restoring | |
1580 | sys.argv = [filename]+ arg_lst[1:] # put in the proper filename |
|
1581 | sys.argv = [filename]+ arg_lst[1:] # put in the proper filename | |
1581 |
|
1582 | |||
1582 | if opts.has_key('i'): |
|
1583 | if opts.has_key('i'): | |
1583 | # Run in user's interactive namespace |
|
1584 | # Run in user's interactive namespace | |
1584 | prog_ns = self.shell.user_ns |
|
1585 | prog_ns = self.shell.user_ns | |
1585 | __name__save = self.shell.user_ns['__name__'] |
|
1586 | __name__save = self.shell.user_ns['__name__'] | |
1586 | prog_ns['__name__'] = '__main__' |
|
1587 | prog_ns['__name__'] = '__main__' | |
1587 | main_mod = self.shell.new_main_mod(prog_ns) |
|
1588 | main_mod = self.shell.new_main_mod(prog_ns) | |
1588 | else: |
|
1589 | else: | |
1589 | # Run in a fresh, empty namespace |
|
1590 | # Run in a fresh, empty namespace | |
1590 | if opts.has_key('n'): |
|
1591 | if opts.has_key('n'): | |
1591 | name = os.path.splitext(os.path.basename(filename))[0] |
|
1592 | name = os.path.splitext(os.path.basename(filename))[0] | |
1592 | else: |
|
1593 | else: | |
1593 | name = '__main__' |
|
1594 | name = '__main__' | |
1594 |
|
1595 | |||
1595 | main_mod = self.shell.new_main_mod() |
|
1596 | main_mod = self.shell.new_main_mod() | |
1596 | prog_ns = main_mod.__dict__ |
|
1597 | prog_ns = main_mod.__dict__ | |
1597 | prog_ns['__name__'] = name |
|
1598 | prog_ns['__name__'] = name | |
1598 |
|
1599 | |||
1599 | # Since '%run foo' emulates 'python foo.py' at the cmd line, we must |
|
1600 | # Since '%run foo' emulates 'python foo.py' at the cmd line, we must | |
1600 | # set the __file__ global in the script's namespace |
|
1601 | # set the __file__ global in the script's namespace | |
1601 | prog_ns['__file__'] = filename |
|
1602 | prog_ns['__file__'] = filename | |
1602 |
|
1603 | |||
1603 | # pickle fix. See iplib for an explanation. But we need to make sure |
|
1604 | # pickle fix. See iplib for an explanation. But we need to make sure | |
1604 | # that, if we overwrite __main__, we replace it at the end |
|
1605 | # that, if we overwrite __main__, we replace it at the end | |
1605 | main_mod_name = prog_ns['__name__'] |
|
1606 | main_mod_name = prog_ns['__name__'] | |
1606 |
|
1607 | |||
1607 | if main_mod_name == '__main__': |
|
1608 | if main_mod_name == '__main__': | |
1608 | restore_main = sys.modules['__main__'] |
|
1609 | restore_main = sys.modules['__main__'] | |
1609 | else: |
|
1610 | else: | |
1610 | restore_main = False |
|
1611 | restore_main = False | |
1611 |
|
1612 | |||
1612 | # This needs to be undone at the end to prevent holding references to |
|
1613 | # This needs to be undone at the end to prevent holding references to | |
1613 | # every single object ever created. |
|
1614 | # every single object ever created. | |
1614 | sys.modules[main_mod_name] = main_mod |
|
1615 | sys.modules[main_mod_name] = main_mod | |
1615 |
|
1616 | |||
1616 | stats = None |
|
1617 | stats = None | |
1617 | try: |
|
1618 | try: | |
1618 | self.shell.savehist() |
|
1619 | self.shell.savehist() | |
1619 |
|
1620 | |||
1620 | if opts.has_key('p'): |
|
1621 | if opts.has_key('p'): | |
1621 | stats = self.magic_prun('',0,opts,arg_lst,prog_ns) |
|
1622 | stats = self.magic_prun('',0,opts,arg_lst,prog_ns) | |
1622 | else: |
|
1623 | else: | |
1623 | if opts.has_key('d'): |
|
1624 | if opts.has_key('d'): | |
1624 |
deb = |
|
1625 | deb = debugger.Pdb(self.shell.rc.colors) | |
1625 | # reset Breakpoint state, which is moronically kept |
|
1626 | # reset Breakpoint state, which is moronically kept | |
1626 | # in a class |
|
1627 | # in a class | |
1627 | bdb.Breakpoint.next = 1 |
|
1628 | bdb.Breakpoint.next = 1 | |
1628 | bdb.Breakpoint.bplist = {} |
|
1629 | bdb.Breakpoint.bplist = {} | |
1629 | bdb.Breakpoint.bpbynumber = [None] |
|
1630 | bdb.Breakpoint.bpbynumber = [None] | |
1630 | # Set an initial breakpoint to stop execution |
|
1631 | # Set an initial breakpoint to stop execution | |
1631 | maxtries = 10 |
|
1632 | maxtries = 10 | |
1632 | bp = int(opts.get('b',[1])[0]) |
|
1633 | bp = int(opts.get('b',[1])[0]) | |
1633 | checkline = deb.checkline(filename,bp) |
|
1634 | checkline = deb.checkline(filename,bp) | |
1634 | if not checkline: |
|
1635 | if not checkline: | |
1635 | for bp in range(bp+1,bp+maxtries+1): |
|
1636 | for bp in range(bp+1,bp+maxtries+1): | |
1636 | if deb.checkline(filename,bp): |
|
1637 | if deb.checkline(filename,bp): | |
1637 | break |
|
1638 | break | |
1638 | else: |
|
1639 | else: | |
1639 | msg = ("\nI failed to find a valid line to set " |
|
1640 | msg = ("\nI failed to find a valid line to set " | |
1640 | "a breakpoint\n" |
|
1641 | "a breakpoint\n" | |
1641 | "after trying up to line: %s.\n" |
|
1642 | "after trying up to line: %s.\n" | |
1642 | "Please set a valid breakpoint manually " |
|
1643 | "Please set a valid breakpoint manually " | |
1643 | "with the -b option." % bp) |
|
1644 | "with the -b option." % bp) | |
1644 | error(msg) |
|
1645 | error(msg) | |
1645 | return |
|
1646 | return | |
1646 | # if we find a good linenumber, set the breakpoint |
|
1647 | # if we find a good linenumber, set the breakpoint | |
1647 | deb.do_break('%s:%s' % (filename,bp)) |
|
1648 | deb.do_break('%s:%s' % (filename,bp)) | |
1648 | # Start file run |
|
1649 | # Start file run | |
1649 | print "NOTE: Enter 'c' at the", |
|
1650 | print "NOTE: Enter 'c' at the", | |
1650 | print "%s prompt to start your script." % deb.prompt |
|
1651 | print "%s prompt to start your script." % deb.prompt | |
1651 | try: |
|
1652 | try: | |
1652 | deb.run('execfile("%s")' % filename,prog_ns) |
|
1653 | deb.run('execfile("%s")' % filename,prog_ns) | |
1653 |
|
1654 | |||
1654 | except: |
|
1655 | except: | |
1655 | etype, value, tb = sys.exc_info() |
|
1656 | etype, value, tb = sys.exc_info() | |
1656 | # Skip three frames in the traceback: the %run one, |
|
1657 | # Skip three frames in the traceback: the %run one, | |
1657 | # one inside bdb.py, and the command-line typed by the |
|
1658 | # one inside bdb.py, and the command-line typed by the | |
1658 | # user (run by exec in pdb itself). |
|
1659 | # user (run by exec in pdb itself). | |
1659 | self.shell.InteractiveTB(etype,value,tb,tb_offset=3) |
|
1660 | self.shell.InteractiveTB(etype,value,tb,tb_offset=3) | |
1660 | else: |
|
1661 | else: | |
1661 | if runner is None: |
|
1662 | if runner is None: | |
1662 | runner = self.shell.safe_execfile |
|
1663 | runner = self.shell.safe_execfile | |
1663 | if opts.has_key('t'): |
|
1664 | if opts.has_key('t'): | |
1664 | # timed execution |
|
1665 | # timed execution | |
1665 | try: |
|
1666 | try: | |
1666 | nruns = int(opts['N'][0]) |
|
1667 | nruns = int(opts['N'][0]) | |
1667 | if nruns < 1: |
|
1668 | if nruns < 1: | |
1668 | error('Number of runs must be >=1') |
|
1669 | error('Number of runs must be >=1') | |
1669 | return |
|
1670 | return | |
1670 | except (KeyError): |
|
1671 | except (KeyError): | |
1671 | nruns = 1 |
|
1672 | nruns = 1 | |
1672 | if nruns == 1: |
|
1673 | if nruns == 1: | |
1673 | t0 = clock2() |
|
1674 | t0 = clock2() | |
1674 | runner(filename,prog_ns,prog_ns, |
|
1675 | runner(filename,prog_ns,prog_ns, | |
1675 | exit_ignore=exit_ignore) |
|
1676 | exit_ignore=exit_ignore) | |
1676 | t1 = clock2() |
|
1677 | t1 = clock2() | |
1677 | t_usr = t1[0]-t0[0] |
|
1678 | t_usr = t1[0]-t0[0] | |
1678 | t_sys = t1[1]-t0[1] |
|
1679 | t_sys = t1[1]-t0[1] | |
1679 | print "\nIPython CPU timings (estimated):" |
|
1680 | print "\nIPython CPU timings (estimated):" | |
1680 | print " User : %10s s." % t_usr |
|
1681 | print " User : %10s s." % t_usr | |
1681 | print " System: %10s s." % t_sys |
|
1682 | print " System: %10s s." % t_sys | |
1682 | else: |
|
1683 | else: | |
1683 | runs = range(nruns) |
|
1684 | runs = range(nruns) | |
1684 | t0 = clock2() |
|
1685 | t0 = clock2() | |
1685 | for nr in runs: |
|
1686 | for nr in runs: | |
1686 | runner(filename,prog_ns,prog_ns, |
|
1687 | runner(filename,prog_ns,prog_ns, | |
1687 | exit_ignore=exit_ignore) |
|
1688 | exit_ignore=exit_ignore) | |
1688 | t1 = clock2() |
|
1689 | t1 = clock2() | |
1689 | t_usr = t1[0]-t0[0] |
|
1690 | t_usr = t1[0]-t0[0] | |
1690 | t_sys = t1[1]-t0[1] |
|
1691 | t_sys = t1[1]-t0[1] | |
1691 | print "\nIPython CPU timings (estimated):" |
|
1692 | print "\nIPython CPU timings (estimated):" | |
1692 | print "Total runs performed:",nruns |
|
1693 | print "Total runs performed:",nruns | |
1693 | print " Times : %10s %10s" % ('Total','Per run') |
|
1694 | print " Times : %10s %10s" % ('Total','Per run') | |
1694 | print " User : %10s s, %10s s." % (t_usr,t_usr/nruns) |
|
1695 | print " User : %10s s, %10s s." % (t_usr,t_usr/nruns) | |
1695 | print " System: %10s s, %10s s." % (t_sys,t_sys/nruns) |
|
1696 | print " System: %10s s, %10s s." % (t_sys,t_sys/nruns) | |
1696 |
|
1697 | |||
1697 | else: |
|
1698 | else: | |
1698 | # regular execution |
|
1699 | # regular execution | |
1699 | runner(filename,prog_ns,prog_ns,exit_ignore=exit_ignore) |
|
1700 | runner(filename,prog_ns,prog_ns,exit_ignore=exit_ignore) | |
1700 |
|
1701 | |||
1701 | if opts.has_key('i'): |
|
1702 | if opts.has_key('i'): | |
1702 | self.shell.user_ns['__name__'] = __name__save |
|
1703 | self.shell.user_ns['__name__'] = __name__save | |
1703 | else: |
|
1704 | else: | |
1704 | # The shell MUST hold a reference to prog_ns so after %run |
|
1705 | # The shell MUST hold a reference to prog_ns so after %run | |
1705 | # exits, the python deletion mechanism doesn't zero it out |
|
1706 | # exits, the python deletion mechanism doesn't zero it out | |
1706 | # (leaving dangling references). |
|
1707 | # (leaving dangling references). | |
1707 | self.shell.cache_main_mod(prog_ns,filename) |
|
1708 | self.shell.cache_main_mod(prog_ns,filename) | |
1708 | # update IPython interactive namespace |
|
1709 | # update IPython interactive namespace | |
1709 | del prog_ns['__name__'] |
|
1710 | del prog_ns['__name__'] | |
1710 | self.shell.user_ns.update(prog_ns) |
|
1711 | self.shell.user_ns.update(prog_ns) | |
1711 | finally: |
|
1712 | finally: | |
1712 | # It's a bit of a mystery why, but __builtins__ can change from |
|
1713 | # It's a bit of a mystery why, but __builtins__ can change from | |
1713 | # being a module to becoming a dict missing some key data after |
|
1714 | # being a module to becoming a dict missing some key data after | |
1714 | # %run. As best I can see, this is NOT something IPython is doing |
|
1715 | # %run. As best I can see, this is NOT something IPython is doing | |
1715 | # at all, and similar problems have been reported before: |
|
1716 | # at all, and similar problems have been reported before: | |
1716 | # http://coding.derkeiler.com/Archive/Python/comp.lang.python/2004-10/0188.html |
|
1717 | # http://coding.derkeiler.com/Archive/Python/comp.lang.python/2004-10/0188.html | |
1717 | # Since this seems to be done by the interpreter itself, the best |
|
1718 | # Since this seems to be done by the interpreter itself, the best | |
1718 | # we can do is to at least restore __builtins__ for the user on |
|
1719 | # we can do is to at least restore __builtins__ for the user on | |
1719 | # exit. |
|
1720 | # exit. | |
1720 | self.shell.user_ns['__builtins__'] = __builtin__ |
|
1721 | self.shell.user_ns['__builtins__'] = __builtin__ | |
1721 |
|
1722 | |||
1722 | # Ensure key global structures are restored |
|
1723 | # Ensure key global structures are restored | |
1723 | sys.argv = save_argv |
|
1724 | sys.argv = save_argv | |
1724 | if restore_main: |
|
1725 | if restore_main: | |
1725 | sys.modules['__main__'] = restore_main |
|
1726 | sys.modules['__main__'] = restore_main | |
1726 | else: |
|
1727 | else: | |
1727 | # Remove from sys.modules the reference to main_mod we'd |
|
1728 | # Remove from sys.modules the reference to main_mod we'd | |
1728 | # added. Otherwise it will trap references to objects |
|
1729 | # added. Otherwise it will trap references to objects | |
1729 | # contained therein. |
|
1730 | # contained therein. | |
1730 | del sys.modules[main_mod_name] |
|
1731 | del sys.modules[main_mod_name] | |
1731 |
|
1732 | |||
1732 | self.shell.reloadhist() |
|
1733 | self.shell.reloadhist() | |
1733 |
|
1734 | |||
1734 | return stats |
|
1735 | return stats | |
1735 |
|
1736 | |||
1736 | def magic_runlog(self, parameter_s =''): |
|
1737 | def magic_runlog(self, parameter_s =''): | |
1737 | """Run files as logs. |
|
1738 | """Run files as logs. | |
1738 |
|
1739 | |||
1739 | Usage:\\ |
|
1740 | Usage:\\ | |
1740 | %runlog file1 file2 ... |
|
1741 | %runlog file1 file2 ... | |
1741 |
|
1742 | |||
1742 | Run the named files (treating them as log files) in sequence inside |
|
1743 | Run the named files (treating them as log files) in sequence inside | |
1743 | the interpreter, and return to the prompt. This is much slower than |
|
1744 | the interpreter, and return to the prompt. This is much slower than | |
1744 | %run because each line is executed in a try/except block, but it |
|
1745 | %run because each line is executed in a try/except block, but it | |
1745 | allows running files with syntax errors in them. |
|
1746 | allows running files with syntax errors in them. | |
1746 |
|
1747 | |||
1747 | Normally IPython will guess when a file is one of its own logfiles, so |
|
1748 | Normally IPython will guess when a file is one of its own logfiles, so | |
1748 | you can typically use %run even for logs. This shorthand allows you to |
|
1749 | you can typically use %run even for logs. This shorthand allows you to | |
1749 | force any file to be treated as a log file.""" |
|
1750 | force any file to be treated as a log file.""" | |
1750 |
|
1751 | |||
1751 | for f in parameter_s.split(): |
|
1752 | for f in parameter_s.split(): | |
1752 | self.shell.safe_execfile(f,self.shell.user_ns, |
|
1753 | self.shell.safe_execfile(f,self.shell.user_ns, | |
1753 | self.shell.user_ns,islog=1) |
|
1754 | self.shell.user_ns,islog=1) | |
1754 |
|
1755 | |||
1755 | @testdec.skip_doctest |
|
1756 | @testdec.skip_doctest | |
1756 | def magic_timeit(self, parameter_s =''): |
|
1757 | def magic_timeit(self, parameter_s =''): | |
1757 | """Time execution of a Python statement or expression |
|
1758 | """Time execution of a Python statement or expression | |
1758 |
|
1759 | |||
1759 | Usage:\\ |
|
1760 | Usage:\\ | |
1760 | %timeit [-n<N> -r<R> [-t|-c]] statement |
|
1761 | %timeit [-n<N> -r<R> [-t|-c]] statement | |
1761 |
|
1762 | |||
1762 | Time execution of a Python statement or expression using the timeit |
|
1763 | Time execution of a Python statement or expression using the timeit | |
1763 | module. |
|
1764 | module. | |
1764 |
|
1765 | |||
1765 | Options: |
|
1766 | Options: | |
1766 | -n<N>: execute the given statement <N> times in a loop. If this value |
|
1767 | -n<N>: execute the given statement <N> times in a loop. If this value | |
1767 | is not given, a fitting value is chosen. |
|
1768 | is not given, a fitting value is chosen. | |
1768 |
|
1769 | |||
1769 | -r<R>: repeat the loop iteration <R> times and take the best result. |
|
1770 | -r<R>: repeat the loop iteration <R> times and take the best result. | |
1770 | Default: 3 |
|
1771 | Default: 3 | |
1771 |
|
1772 | |||
1772 | -t: use time.time to measure the time, which is the default on Unix. |
|
1773 | -t: use time.time to measure the time, which is the default on Unix. | |
1773 | This function measures wall time. |
|
1774 | This function measures wall time. | |
1774 |
|
1775 | |||
1775 | -c: use time.clock to measure the time, which is the default on |
|
1776 | -c: use time.clock to measure the time, which is the default on | |
1776 | Windows and measures wall time. On Unix, resource.getrusage is used |
|
1777 | Windows and measures wall time. On Unix, resource.getrusage is used | |
1777 | instead and returns the CPU user time. |
|
1778 | instead and returns the CPU user time. | |
1778 |
|
1779 | |||
1779 | -p<P>: use a precision of <P> digits to display the timing result. |
|
1780 | -p<P>: use a precision of <P> digits to display the timing result. | |
1780 | Default: 3 |
|
1781 | Default: 3 | |
1781 |
|
1782 | |||
1782 |
|
1783 | |||
1783 | Examples: |
|
1784 | Examples: | |
1784 |
|
1785 | |||
1785 | In [1]: %timeit pass |
|
1786 | In [1]: %timeit pass | |
1786 | 10000000 loops, best of 3: 53.3 ns per loop |
|
1787 | 10000000 loops, best of 3: 53.3 ns per loop | |
1787 |
|
1788 | |||
1788 | In [2]: u = None |
|
1789 | In [2]: u = None | |
1789 |
|
1790 | |||
1790 | In [3]: %timeit u is None |
|
1791 | In [3]: %timeit u is None | |
1791 | 10000000 loops, best of 3: 184 ns per loop |
|
1792 | 10000000 loops, best of 3: 184 ns per loop | |
1792 |
|
1793 | |||
1793 | In [4]: %timeit -r 4 u == None |
|
1794 | In [4]: %timeit -r 4 u == None | |
1794 | 1000000 loops, best of 4: 242 ns per loop |
|
1795 | 1000000 loops, best of 4: 242 ns per loop | |
1795 |
|
1796 | |||
1796 | In [5]: import time |
|
1797 | In [5]: import time | |
1797 |
|
1798 | |||
1798 | In [6]: %timeit -n1 time.sleep(2) |
|
1799 | In [6]: %timeit -n1 time.sleep(2) | |
1799 | 1 loops, best of 3: 2 s per loop |
|
1800 | 1 loops, best of 3: 2 s per loop | |
1800 |
|
1801 | |||
1801 |
|
1802 | |||
1802 | The times reported by %timeit will be slightly higher than those |
|
1803 | The times reported by %timeit will be slightly higher than those | |
1803 | reported by the timeit.py script when variables are accessed. This is |
|
1804 | reported by the timeit.py script when variables are accessed. This is | |
1804 | due to the fact that %timeit executes the statement in the namespace |
|
1805 | due to the fact that %timeit executes the statement in the namespace | |
1805 | of the shell, compared with timeit.py, which uses a single setup |
|
1806 | of the shell, compared with timeit.py, which uses a single setup | |
1806 | statement to import function or create variables. Generally, the bias |
|
1807 | statement to import function or create variables. Generally, the bias | |
1807 | does not matter as long as results from timeit.py are not mixed with |
|
1808 | does not matter as long as results from timeit.py are not mixed with | |
1808 | those from %timeit.""" |
|
1809 | those from %timeit.""" | |
1809 |
|
1810 | |||
1810 | import timeit |
|
1811 | import timeit | |
1811 | import math |
|
1812 | import math | |
1812 |
|
1813 | |||
1813 | # XXX: Unfortunately the unicode 'micro' symbol can cause problems in |
|
1814 | # XXX: Unfortunately the unicode 'micro' symbol can cause problems in | |
1814 | # certain terminals. Until we figure out a robust way of |
|
1815 | # certain terminals. Until we figure out a robust way of | |
1815 | # auto-detecting if the terminal can deal with it, use plain 'us' for |
|
1816 | # auto-detecting if the terminal can deal with it, use plain 'us' for | |
1816 | # microseconds. I am really NOT happy about disabling the proper |
|
1817 | # microseconds. I am really NOT happy about disabling the proper | |
1817 | # 'micro' prefix, but crashing is worse... If anyone knows what the |
|
1818 | # 'micro' prefix, but crashing is worse... If anyone knows what the | |
1818 | # right solution for this is, I'm all ears... |
|
1819 | # right solution for this is, I'm all ears... | |
1819 | # |
|
1820 | # | |
1820 | # Note: using |
|
1821 | # Note: using | |
1821 | # |
|
1822 | # | |
1822 | # s = u'\xb5' |
|
1823 | # s = u'\xb5' | |
1823 | # s.encode(sys.getdefaultencoding()) |
|
1824 | # s.encode(sys.getdefaultencoding()) | |
1824 | # |
|
1825 | # | |
1825 | # is not sufficient, as I've seen terminals where that fails but |
|
1826 | # is not sufficient, as I've seen terminals where that fails but | |
1826 | # print s |
|
1827 | # print s | |
1827 | # |
|
1828 | # | |
1828 | # succeeds |
|
1829 | # succeeds | |
1829 | # |
|
1830 | # | |
1830 | # See bug: https://bugs.launchpad.net/ipython/+bug/348466 |
|
1831 | # See bug: https://bugs.launchpad.net/ipython/+bug/348466 | |
1831 |
|
1832 | |||
1832 | #units = [u"s", u"ms",u'\xb5',"ns"] |
|
1833 | #units = [u"s", u"ms",u'\xb5',"ns"] | |
1833 | units = [u"s", u"ms",u'us',"ns"] |
|
1834 | units = [u"s", u"ms",u'us',"ns"] | |
1834 |
|
1835 | |||
1835 | scaling = [1, 1e3, 1e6, 1e9] |
|
1836 | scaling = [1, 1e3, 1e6, 1e9] | |
1836 |
|
1837 | |||
1837 | opts, stmt = self.parse_options(parameter_s,'n:r:tcp:', |
|
1838 | opts, stmt = self.parse_options(parameter_s,'n:r:tcp:', | |
1838 | posix=False) |
|
1839 | posix=False) | |
1839 | if stmt == "": |
|
1840 | if stmt == "": | |
1840 | return |
|
1841 | return | |
1841 | timefunc = timeit.default_timer |
|
1842 | timefunc = timeit.default_timer | |
1842 | number = int(getattr(opts, "n", 0)) |
|
1843 | number = int(getattr(opts, "n", 0)) | |
1843 | repeat = int(getattr(opts, "r", timeit.default_repeat)) |
|
1844 | repeat = int(getattr(opts, "r", timeit.default_repeat)) | |
1844 | precision = int(getattr(opts, "p", 3)) |
|
1845 | precision = int(getattr(opts, "p", 3)) | |
1845 | if hasattr(opts, "t"): |
|
1846 | if hasattr(opts, "t"): | |
1846 | timefunc = time.time |
|
1847 | timefunc = time.time | |
1847 | if hasattr(opts, "c"): |
|
1848 | if hasattr(opts, "c"): | |
1848 | timefunc = clock |
|
1849 | timefunc = clock | |
1849 |
|
1850 | |||
1850 | timer = timeit.Timer(timer=timefunc) |
|
1851 | timer = timeit.Timer(timer=timefunc) | |
1851 | # this code has tight coupling to the inner workings of timeit.Timer, |
|
1852 | # this code has tight coupling to the inner workings of timeit.Timer, | |
1852 | # but is there a better way to achieve that the code stmt has access |
|
1853 | # but is there a better way to achieve that the code stmt has access | |
1853 | # to the shell namespace? |
|
1854 | # to the shell namespace? | |
1854 |
|
1855 | |||
1855 | src = timeit.template % {'stmt': timeit.reindent(stmt, 8), |
|
1856 | src = timeit.template % {'stmt': timeit.reindent(stmt, 8), | |
1856 | 'setup': "pass"} |
|
1857 | 'setup': "pass"} | |
1857 | # Track compilation time so it can be reported if too long |
|
1858 | # Track compilation time so it can be reported if too long | |
1858 | # Minimum time above which compilation time will be reported |
|
1859 | # Minimum time above which compilation time will be reported | |
1859 | tc_min = 0.1 |
|
1860 | tc_min = 0.1 | |
1860 |
|
1861 | |||
1861 | t0 = clock() |
|
1862 | t0 = clock() | |
1862 | code = compile(src, "<magic-timeit>", "exec") |
|
1863 | code = compile(src, "<magic-timeit>", "exec") | |
1863 | tc = clock()-t0 |
|
1864 | tc = clock()-t0 | |
1864 |
|
1865 | |||
1865 | ns = {} |
|
1866 | ns = {} | |
1866 | exec code in self.shell.user_ns, ns |
|
1867 | exec code in self.shell.user_ns, ns | |
1867 | timer.inner = ns["inner"] |
|
1868 | timer.inner = ns["inner"] | |
1868 |
|
1869 | |||
1869 | if number == 0: |
|
1870 | if number == 0: | |
1870 | # determine number so that 0.2 <= total time < 2.0 |
|
1871 | # determine number so that 0.2 <= total time < 2.0 | |
1871 | number = 1 |
|
1872 | number = 1 | |
1872 | for i in range(1, 10): |
|
1873 | for i in range(1, 10): | |
1873 | if timer.timeit(number) >= 0.2: |
|
1874 | if timer.timeit(number) >= 0.2: | |
1874 | break |
|
1875 | break | |
1875 | number *= 10 |
|
1876 | number *= 10 | |
1876 |
|
1877 | |||
1877 | best = min(timer.repeat(repeat, number)) / number |
|
1878 | best = min(timer.repeat(repeat, number)) / number | |
1878 |
|
1879 | |||
1879 | if best > 0.0: |
|
1880 | if best > 0.0: | |
1880 | order = min(-int(math.floor(math.log10(best)) // 3), 3) |
|
1881 | order = min(-int(math.floor(math.log10(best)) // 3), 3) | |
1881 | else: |
|
1882 | else: | |
1882 | order = 3 |
|
1883 | order = 3 | |
1883 | print u"%d loops, best of %d: %.*g %s per loop" % (number, repeat, |
|
1884 | print u"%d loops, best of %d: %.*g %s per loop" % (number, repeat, | |
1884 | precision, |
|
1885 | precision, | |
1885 | best * scaling[order], |
|
1886 | best * scaling[order], | |
1886 | units[order]) |
|
1887 | units[order]) | |
1887 | if tc > tc_min: |
|
1888 | if tc > tc_min: | |
1888 | print "Compiler time: %.2f s" % tc |
|
1889 | print "Compiler time: %.2f s" % tc | |
1889 |
|
1890 | |||
1890 | @testdec.skip_doctest |
|
1891 | @testdec.skip_doctest | |
1891 | def magic_time(self,parameter_s = ''): |
|
1892 | def magic_time(self,parameter_s = ''): | |
1892 | """Time execution of a Python statement or expression. |
|
1893 | """Time execution of a Python statement or expression. | |
1893 |
|
1894 | |||
1894 | The CPU and wall clock times are printed, and the value of the |
|
1895 | The CPU and wall clock times are printed, and the value of the | |
1895 | expression (if any) is returned. Note that under Win32, system time |
|
1896 | expression (if any) is returned. Note that under Win32, system time | |
1896 | is always reported as 0, since it can not be measured. |
|
1897 | is always reported as 0, since it can not be measured. | |
1897 |
|
1898 | |||
1898 | This function provides very basic timing functionality. In Python |
|
1899 | This function provides very basic timing functionality. In Python | |
1899 | 2.3, the timeit module offers more control and sophistication, so this |
|
1900 | 2.3, the timeit module offers more control and sophistication, so this | |
1900 | could be rewritten to use it (patches welcome). |
|
1901 | could be rewritten to use it (patches welcome). | |
1901 |
|
1902 | |||
1902 | Some examples: |
|
1903 | Some examples: | |
1903 |
|
1904 | |||
1904 | In [1]: time 2**128 |
|
1905 | In [1]: time 2**128 | |
1905 | CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s |
|
1906 | CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s | |
1906 | Wall time: 0.00 |
|
1907 | Wall time: 0.00 | |
1907 | Out[1]: 340282366920938463463374607431768211456L |
|
1908 | Out[1]: 340282366920938463463374607431768211456L | |
1908 |
|
1909 | |||
1909 | In [2]: n = 1000000 |
|
1910 | In [2]: n = 1000000 | |
1910 |
|
1911 | |||
1911 | In [3]: time sum(range(n)) |
|
1912 | In [3]: time sum(range(n)) | |
1912 | CPU times: user 1.20 s, sys: 0.05 s, total: 1.25 s |
|
1913 | CPU times: user 1.20 s, sys: 0.05 s, total: 1.25 s | |
1913 | Wall time: 1.37 |
|
1914 | Wall time: 1.37 | |
1914 | Out[3]: 499999500000L |
|
1915 | Out[3]: 499999500000L | |
1915 |
|
1916 | |||
1916 | In [4]: time print 'hello world' |
|
1917 | In [4]: time print 'hello world' | |
1917 | hello world |
|
1918 | hello world | |
1918 | CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s |
|
1919 | CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s | |
1919 | Wall time: 0.00 |
|
1920 | Wall time: 0.00 | |
1920 |
|
1921 | |||
1921 | Note that the time needed by Python to compile the given expression |
|
1922 | Note that the time needed by Python to compile the given expression | |
1922 | will be reported if it is more than 0.1s. In this example, the |
|
1923 | will be reported if it is more than 0.1s. In this example, the | |
1923 | actual exponentiation is done by Python at compilation time, so while |
|
1924 | actual exponentiation is done by Python at compilation time, so while | |
1924 | the expression can take a noticeable amount of time to compute, that |
|
1925 | the expression can take a noticeable amount of time to compute, that | |
1925 | time is purely due to the compilation: |
|
1926 | time is purely due to the compilation: | |
1926 |
|
1927 | |||
1927 | In [5]: time 3**9999; |
|
1928 | In [5]: time 3**9999; | |
1928 | CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s |
|
1929 | CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s | |
1929 | Wall time: 0.00 s |
|
1930 | Wall time: 0.00 s | |
1930 |
|
1931 | |||
1931 | In [6]: time 3**999999; |
|
1932 | In [6]: time 3**999999; | |
1932 | CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s |
|
1933 | CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s | |
1933 | Wall time: 0.00 s |
|
1934 | Wall time: 0.00 s | |
1934 | Compiler : 0.78 s |
|
1935 | Compiler : 0.78 s | |
1935 | """ |
|
1936 | """ | |
1936 |
|
1937 | |||
1937 | # fail immediately if the given expression can't be compiled |
|
1938 | # fail immediately if the given expression can't be compiled | |
1938 |
|
1939 | |||
1939 | expr = self.shell.prefilter(parameter_s,False) |
|
1940 | expr = self.shell.prefilter(parameter_s,False) | |
1940 |
|
1941 | |||
1941 | # Minimum time above which compilation time will be reported |
|
1942 | # Minimum time above which compilation time will be reported | |
1942 | tc_min = 0.1 |
|
1943 | tc_min = 0.1 | |
1943 |
|
1944 | |||
1944 | try: |
|
1945 | try: | |
1945 | mode = 'eval' |
|
1946 | mode = 'eval' | |
1946 | t0 = clock() |
|
1947 | t0 = clock() | |
1947 | code = compile(expr,'<timed eval>',mode) |
|
1948 | code = compile(expr,'<timed eval>',mode) | |
1948 | tc = clock()-t0 |
|
1949 | tc = clock()-t0 | |
1949 | except SyntaxError: |
|
1950 | except SyntaxError: | |
1950 | mode = 'exec' |
|
1951 | mode = 'exec' | |
1951 | t0 = clock() |
|
1952 | t0 = clock() | |
1952 | code = compile(expr,'<timed exec>',mode) |
|
1953 | code = compile(expr,'<timed exec>',mode) | |
1953 | tc = clock()-t0 |
|
1954 | tc = clock()-t0 | |
1954 | # skew measurement as little as possible |
|
1955 | # skew measurement as little as possible | |
1955 | glob = self.shell.user_ns |
|
1956 | glob = self.shell.user_ns | |
1956 | clk = clock2 |
|
1957 | clk = clock2 | |
1957 | wtime = time.time |
|
1958 | wtime = time.time | |
1958 | # time execution |
|
1959 | # time execution | |
1959 | wall_st = wtime() |
|
1960 | wall_st = wtime() | |
1960 | if mode=='eval': |
|
1961 | if mode=='eval': | |
1961 | st = clk() |
|
1962 | st = clk() | |
1962 | out = eval(code,glob) |
|
1963 | out = eval(code,glob) | |
1963 | end = clk() |
|
1964 | end = clk() | |
1964 | else: |
|
1965 | else: | |
1965 | st = clk() |
|
1966 | st = clk() | |
1966 | exec code in glob |
|
1967 | exec code in glob | |
1967 | end = clk() |
|
1968 | end = clk() | |
1968 | out = None |
|
1969 | out = None | |
1969 | wall_end = wtime() |
|
1970 | wall_end = wtime() | |
1970 | # Compute actual times and report |
|
1971 | # Compute actual times and report | |
1971 | wall_time = wall_end-wall_st |
|
1972 | wall_time = wall_end-wall_st | |
1972 | cpu_user = end[0]-st[0] |
|
1973 | cpu_user = end[0]-st[0] | |
1973 | cpu_sys = end[1]-st[1] |
|
1974 | cpu_sys = end[1]-st[1] | |
1974 | cpu_tot = cpu_user+cpu_sys |
|
1975 | cpu_tot = cpu_user+cpu_sys | |
1975 | print "CPU times: user %.2f s, sys: %.2f s, total: %.2f s" % \ |
|
1976 | print "CPU times: user %.2f s, sys: %.2f s, total: %.2f s" % \ | |
1976 | (cpu_user,cpu_sys,cpu_tot) |
|
1977 | (cpu_user,cpu_sys,cpu_tot) | |
1977 | print "Wall time: %.2f s" % wall_time |
|
1978 | print "Wall time: %.2f s" % wall_time | |
1978 | if tc > tc_min: |
|
1979 | if tc > tc_min: | |
1979 | print "Compiler : %.2f s" % tc |
|
1980 | print "Compiler : %.2f s" % tc | |
1980 | return out |
|
1981 | return out | |
1981 |
|
1982 | |||
1982 | @testdec.skip_doctest |
|
1983 | @testdec.skip_doctest | |
1983 | def magic_macro(self,parameter_s = ''): |
|
1984 | def magic_macro(self,parameter_s = ''): | |
1984 | """Define a set of input lines as a macro for future re-execution. |
|
1985 | """Define a set of input lines as a macro for future re-execution. | |
1985 |
|
1986 | |||
1986 | Usage:\\ |
|
1987 | Usage:\\ | |
1987 | %macro [options] name n1-n2 n3-n4 ... n5 .. n6 ... |
|
1988 | %macro [options] name n1-n2 n3-n4 ... n5 .. n6 ... | |
1988 |
|
1989 | |||
1989 | Options: |
|
1990 | Options: | |
1990 |
|
1991 | |||
1991 | -r: use 'raw' input. By default, the 'processed' history is used, |
|
1992 | -r: use 'raw' input. By default, the 'processed' history is used, | |
1992 | so that magics are loaded in their transformed version to valid |
|
1993 | so that magics are loaded in their transformed version to valid | |
1993 | Python. If this option is given, the raw input as typed as the |
|
1994 | Python. If this option is given, the raw input as typed as the | |
1994 | command line is used instead. |
|
1995 | command line is used instead. | |
1995 |
|
1996 | |||
1996 | This will define a global variable called `name` which is a string |
|
1997 | This will define a global variable called `name` which is a string | |
1997 | made of joining the slices and lines you specify (n1,n2,... numbers |
|
1998 | made of joining the slices and lines you specify (n1,n2,... numbers | |
1998 | above) from your input history into a single string. This variable |
|
1999 | above) from your input history into a single string. This variable | |
1999 | acts like an automatic function which re-executes those lines as if |
|
2000 | acts like an automatic function which re-executes those lines as if | |
2000 | you had typed them. You just type 'name' at the prompt and the code |
|
2001 | you had typed them. You just type 'name' at the prompt and the code | |
2001 | executes. |
|
2002 | executes. | |
2002 |
|
2003 | |||
2003 | The notation for indicating number ranges is: n1-n2 means 'use line |
|
2004 | The notation for indicating number ranges is: n1-n2 means 'use line | |
2004 | numbers n1,...n2' (the endpoint is included). That is, '5-7' means |
|
2005 | numbers n1,...n2' (the endpoint is included). That is, '5-7' means | |
2005 | using the lines numbered 5,6 and 7. |
|
2006 | using the lines numbered 5,6 and 7. | |
2006 |
|
2007 | |||
2007 | Note: as a 'hidden' feature, you can also use traditional python slice |
|
2008 | Note: as a 'hidden' feature, you can also use traditional python slice | |
2008 | notation, where N:M means numbers N through M-1. |
|
2009 | notation, where N:M means numbers N through M-1. | |
2009 |
|
2010 | |||
2010 | For example, if your history contains (%hist prints it): |
|
2011 | For example, if your history contains (%hist prints it): | |
2011 |
|
2012 | |||
2012 | 44: x=1 |
|
2013 | 44: x=1 | |
2013 | 45: y=3 |
|
2014 | 45: y=3 | |
2014 | 46: z=x+y |
|
2015 | 46: z=x+y | |
2015 | 47: print x |
|
2016 | 47: print x | |
2016 | 48: a=5 |
|
2017 | 48: a=5 | |
2017 | 49: print 'x',x,'y',y |
|
2018 | 49: print 'x',x,'y',y | |
2018 |
|
2019 | |||
2019 | you can create a macro with lines 44 through 47 (included) and line 49 |
|
2020 | you can create a macro with lines 44 through 47 (included) and line 49 | |
2020 | called my_macro with: |
|
2021 | called my_macro with: | |
2021 |
|
2022 | |||
2022 | In [55]: %macro my_macro 44-47 49 |
|
2023 | In [55]: %macro my_macro 44-47 49 | |
2023 |
|
2024 | |||
2024 | Now, typing `my_macro` (without quotes) will re-execute all this code |
|
2025 | Now, typing `my_macro` (without quotes) will re-execute all this code | |
2025 | in one pass. |
|
2026 | in one pass. | |
2026 |
|
2027 | |||
2027 | You don't need to give the line-numbers in order, and any given line |
|
2028 | You don't need to give the line-numbers in order, and any given line | |
2028 | number can appear multiple times. You can assemble macros with any |
|
2029 | number can appear multiple times. You can assemble macros with any | |
2029 | lines from your input history in any order. |
|
2030 | lines from your input history in any order. | |
2030 |
|
2031 | |||
2031 | The macro is a simple object which holds its value in an attribute, |
|
2032 | The macro is a simple object which holds its value in an attribute, | |
2032 | but IPython's display system checks for macros and executes them as |
|
2033 | but IPython's display system checks for macros and executes them as | |
2033 | code instead of printing them when you type their name. |
|
2034 | code instead of printing them when you type their name. | |
2034 |
|
2035 | |||
2035 | You can view a macro's contents by explicitly printing it with: |
|
2036 | You can view a macro's contents by explicitly printing it with: | |
2036 |
|
2037 | |||
2037 | 'print macro_name'. |
|
2038 | 'print macro_name'. | |
2038 |
|
2039 | |||
2039 | For one-off cases which DON'T contain magic function calls in them you |
|
2040 | For one-off cases which DON'T contain magic function calls in them you | |
2040 | can obtain similar results by explicitly executing slices from your |
|
2041 | can obtain similar results by explicitly executing slices from your | |
2041 | input history with: |
|
2042 | input history with: | |
2042 |
|
2043 | |||
2043 | In [60]: exec In[44:48]+In[49]""" |
|
2044 | In [60]: exec In[44:48]+In[49]""" | |
2044 |
|
2045 | |||
2045 | opts,args = self.parse_options(parameter_s,'r',mode='list') |
|
2046 | opts,args = self.parse_options(parameter_s,'r',mode='list') | |
2046 | if not args: |
|
2047 | if not args: | |
2047 | macs = [k for k,v in self.shell.user_ns.items() if isinstance(v, Macro)] |
|
2048 | macs = [k for k,v in self.shell.user_ns.items() if isinstance(v, Macro)] | |
2048 | macs.sort() |
|
2049 | macs.sort() | |
2049 | return macs |
|
2050 | return macs | |
2050 | if len(args) == 1: |
|
2051 | if len(args) == 1: | |
2051 | raise UsageError( |
|
2052 | raise UsageError( | |
2052 | "%macro insufficient args; usage '%macro name n1-n2 n3-4...") |
|
2053 | "%macro insufficient args; usage '%macro name n1-n2 n3-4...") | |
2053 | name,ranges = args[0], args[1:] |
|
2054 | name,ranges = args[0], args[1:] | |
2054 |
|
2055 | |||
2055 | #print 'rng',ranges # dbg |
|
2056 | #print 'rng',ranges # dbg | |
2056 | lines = self.extract_input_slices(ranges,opts.has_key('r')) |
|
2057 | lines = self.extract_input_slices(ranges,opts.has_key('r')) | |
2057 | macro = Macro(lines) |
|
2058 | macro = Macro(lines) | |
2058 | self.shell.user_ns.update({name:macro}) |
|
2059 | self.shell.user_ns.update({name:macro}) | |
2059 | print 'Macro `%s` created. To execute, type its name (without quotes).' % name |
|
2060 | print 'Macro `%s` created. To execute, type its name (without quotes).' % name | |
2060 | print 'Macro contents:' |
|
2061 | print 'Macro contents:' | |
2061 | print macro, |
|
2062 | print macro, | |
2062 |
|
2063 | |||
2063 | def magic_save(self,parameter_s = ''): |
|
2064 | def magic_save(self,parameter_s = ''): | |
2064 | """Save a set of lines to a given filename. |
|
2065 | """Save a set of lines to a given filename. | |
2065 |
|
2066 | |||
2066 | Usage:\\ |
|
2067 | Usage:\\ | |
2067 | %save [options] filename n1-n2 n3-n4 ... n5 .. n6 ... |
|
2068 | %save [options] filename n1-n2 n3-n4 ... n5 .. n6 ... | |
2068 |
|
2069 | |||
2069 | Options: |
|
2070 | Options: | |
2070 |
|
2071 | |||
2071 | -r: use 'raw' input. By default, the 'processed' history is used, |
|
2072 | -r: use 'raw' input. By default, the 'processed' history is used, | |
2072 | so that magics are loaded in their transformed version to valid |
|
2073 | so that magics are loaded in their transformed version to valid | |
2073 | Python. If this option is given, the raw input as typed as the |
|
2074 | Python. If this option is given, the raw input as typed as the | |
2074 | command line is used instead. |
|
2075 | command line is used instead. | |
2075 |
|
2076 | |||
2076 | This function uses the same syntax as %macro for line extraction, but |
|
2077 | This function uses the same syntax as %macro for line extraction, but | |
2077 | instead of creating a macro it saves the resulting string to the |
|
2078 | instead of creating a macro it saves the resulting string to the | |
2078 | filename you specify. |
|
2079 | filename you specify. | |
2079 |
|
2080 | |||
2080 | It adds a '.py' extension to the file if you don't do so yourself, and |
|
2081 | It adds a '.py' extension to the file if you don't do so yourself, and | |
2081 | it asks for confirmation before overwriting existing files.""" |
|
2082 | it asks for confirmation before overwriting existing files.""" | |
2082 |
|
2083 | |||
2083 | opts,args = self.parse_options(parameter_s,'r',mode='list') |
|
2084 | opts,args = self.parse_options(parameter_s,'r',mode='list') | |
2084 | fname,ranges = args[0], args[1:] |
|
2085 | fname,ranges = args[0], args[1:] | |
2085 | if not fname.endswith('.py'): |
|
2086 | if not fname.endswith('.py'): | |
2086 | fname += '.py' |
|
2087 | fname += '.py' | |
2087 | if os.path.isfile(fname): |
|
2088 | if os.path.isfile(fname): | |
2088 | ans = raw_input('File `%s` exists. Overwrite (y/[N])? ' % fname) |
|
2089 | ans = raw_input('File `%s` exists. Overwrite (y/[N])? ' % fname) | |
2089 | if ans.lower() not in ['y','yes']: |
|
2090 | if ans.lower() not in ['y','yes']: | |
2090 | print 'Operation cancelled.' |
|
2091 | print 'Operation cancelled.' | |
2091 | return |
|
2092 | return | |
2092 | cmds = ''.join(self.extract_input_slices(ranges,opts.has_key('r'))) |
|
2093 | cmds = ''.join(self.extract_input_slices(ranges,opts.has_key('r'))) | |
2093 | f = file(fname,'w') |
|
2094 | f = file(fname,'w') | |
2094 | f.write(cmds) |
|
2095 | f.write(cmds) | |
2095 | f.close() |
|
2096 | f.close() | |
2096 | print 'The following commands were written to file `%s`:' % fname |
|
2097 | print 'The following commands were written to file `%s`:' % fname | |
2097 | print cmds |
|
2098 | print cmds | |
2098 |
|
2099 | |||
2099 | def _edit_macro(self,mname,macro): |
|
2100 | def _edit_macro(self,mname,macro): | |
2100 | """open an editor with the macro data in a file""" |
|
2101 | """open an editor with the macro data in a file""" | |
2101 | filename = self.shell.mktempfile(macro.value) |
|
2102 | filename = self.shell.mktempfile(macro.value) | |
2102 | self.shell.hooks.editor(filename) |
|
2103 | self.shell.hooks.editor(filename) | |
2103 |
|
2104 | |||
2104 | # and make a new macro object, to replace the old one |
|
2105 | # and make a new macro object, to replace the old one | |
2105 | mfile = open(filename) |
|
2106 | mfile = open(filename) | |
2106 | mvalue = mfile.read() |
|
2107 | mvalue = mfile.read() | |
2107 | mfile.close() |
|
2108 | mfile.close() | |
2108 | self.shell.user_ns[mname] = Macro(mvalue) |
|
2109 | self.shell.user_ns[mname] = Macro(mvalue) | |
2109 |
|
2110 | |||
2110 | def magic_ed(self,parameter_s=''): |
|
2111 | def magic_ed(self,parameter_s=''): | |
2111 | """Alias to %edit.""" |
|
2112 | """Alias to %edit.""" | |
2112 | return self.magic_edit(parameter_s) |
|
2113 | return self.magic_edit(parameter_s) | |
2113 |
|
2114 | |||
2114 | @testdec.skip_doctest |
|
2115 | @testdec.skip_doctest | |
2115 | def magic_edit(self,parameter_s='',last_call=['','']): |
|
2116 | def magic_edit(self,parameter_s='',last_call=['','']): | |
2116 | """Bring up an editor and execute the resulting code. |
|
2117 | """Bring up an editor and execute the resulting code. | |
2117 |
|
2118 | |||
2118 | Usage: |
|
2119 | Usage: | |
2119 | %edit [options] [args] |
|
2120 | %edit [options] [args] | |
2120 |
|
2121 | |||
2121 | %edit runs IPython's editor hook. The default version of this hook is |
|
2122 | %edit runs IPython's editor hook. The default version of this hook is | |
2122 | set to call the __IPYTHON__.rc.editor command. This is read from your |
|
2123 | set to call the __IPYTHON__.rc.editor command. This is read from your | |
2123 | environment variable $EDITOR. If this isn't found, it will default to |
|
2124 | environment variable $EDITOR. If this isn't found, it will default to | |
2124 | vi under Linux/Unix and to notepad under Windows. See the end of this |
|
2125 | vi under Linux/Unix and to notepad under Windows. See the end of this | |
2125 | docstring for how to change the editor hook. |
|
2126 | docstring for how to change the editor hook. | |
2126 |
|
2127 | |||
2127 | You can also set the value of this editor via the command line option |
|
2128 | You can also set the value of this editor via the command line option | |
2128 | '-editor' or in your ipythonrc file. This is useful if you wish to use |
|
2129 | '-editor' or in your ipythonrc file. This is useful if you wish to use | |
2129 | specifically for IPython an editor different from your typical default |
|
2130 | specifically for IPython an editor different from your typical default | |
2130 | (and for Windows users who typically don't set environment variables). |
|
2131 | (and for Windows users who typically don't set environment variables). | |
2131 |
|
2132 | |||
2132 | This command allows you to conveniently edit multi-line code right in |
|
2133 | This command allows you to conveniently edit multi-line code right in | |
2133 | your IPython session. |
|
2134 | your IPython session. | |
2134 |
|
2135 | |||
2135 | If called without arguments, %edit opens up an empty editor with a |
|
2136 | If called without arguments, %edit opens up an empty editor with a | |
2136 | temporary file and will execute the contents of this file when you |
|
2137 | temporary file and will execute the contents of this file when you | |
2137 | close it (don't forget to save it!). |
|
2138 | close it (don't forget to save it!). | |
2138 |
|
2139 | |||
2139 |
|
2140 | |||
2140 | Options: |
|
2141 | Options: | |
2141 |
|
2142 | |||
2142 | -n <number>: open the editor at a specified line number. By default, |
|
2143 | -n <number>: open the editor at a specified line number. By default, | |
2143 | the IPython editor hook uses the unix syntax 'editor +N filename', but |
|
2144 | the IPython editor hook uses the unix syntax 'editor +N filename', but | |
2144 | you can configure this by providing your own modified hook if your |
|
2145 | you can configure this by providing your own modified hook if your | |
2145 | favorite editor supports line-number specifications with a different |
|
2146 | favorite editor supports line-number specifications with a different | |
2146 | syntax. |
|
2147 | syntax. | |
2147 |
|
2148 | |||
2148 | -p: this will call the editor with the same data as the previous time |
|
2149 | -p: this will call the editor with the same data as the previous time | |
2149 | it was used, regardless of how long ago (in your current session) it |
|
2150 | it was used, regardless of how long ago (in your current session) it | |
2150 | was. |
|
2151 | was. | |
2151 |
|
2152 | |||
2152 | -r: use 'raw' input. This option only applies to input taken from the |
|
2153 | -r: use 'raw' input. This option only applies to input taken from the | |
2153 | user's history. By default, the 'processed' history is used, so that |
|
2154 | user's history. By default, the 'processed' history is used, so that | |
2154 | magics are loaded in their transformed version to valid Python. If |
|
2155 | magics are loaded in their transformed version to valid Python. If | |
2155 | this option is given, the raw input as typed as the command line is |
|
2156 | this option is given, the raw input as typed as the command line is | |
2156 | used instead. When you exit the editor, it will be executed by |
|
2157 | used instead. When you exit the editor, it will be executed by | |
2157 | IPython's own processor. |
|
2158 | IPython's own processor. | |
2158 |
|
2159 | |||
2159 | -x: do not execute the edited code immediately upon exit. This is |
|
2160 | -x: do not execute the edited code immediately upon exit. This is | |
2160 | mainly useful if you are editing programs which need to be called with |
|
2161 | mainly useful if you are editing programs which need to be called with | |
2161 | command line arguments, which you can then do using %run. |
|
2162 | command line arguments, which you can then do using %run. | |
2162 |
|
2163 | |||
2163 |
|
2164 | |||
2164 | Arguments: |
|
2165 | Arguments: | |
2165 |
|
2166 | |||
2166 | If arguments are given, the following possibilites exist: |
|
2167 | If arguments are given, the following possibilites exist: | |
2167 |
|
2168 | |||
2168 | - The arguments are numbers or pairs of colon-separated numbers (like |
|
2169 | - The arguments are numbers or pairs of colon-separated numbers (like | |
2169 | 1 4:8 9). These are interpreted as lines of previous input to be |
|
2170 | 1 4:8 9). These are interpreted as lines of previous input to be | |
2170 | loaded into the editor. The syntax is the same of the %macro command. |
|
2171 | loaded into the editor. The syntax is the same of the %macro command. | |
2171 |
|
2172 | |||
2172 | - If the argument doesn't start with a number, it is evaluated as a |
|
2173 | - If the argument doesn't start with a number, it is evaluated as a | |
2173 | variable and its contents loaded into the editor. You can thus edit |
|
2174 | variable and its contents loaded into the editor. You can thus edit | |
2174 | any string which contains python code (including the result of |
|
2175 | any string which contains python code (including the result of | |
2175 | previous edits). |
|
2176 | previous edits). | |
2176 |
|
2177 | |||
2177 | - If the argument is the name of an object (other than a string), |
|
2178 | - If the argument is the name of an object (other than a string), | |
2178 | IPython will try to locate the file where it was defined and open the |
|
2179 | IPython will try to locate the file where it was defined and open the | |
2179 | editor at the point where it is defined. You can use `%edit function` |
|
2180 | editor at the point where it is defined. You can use `%edit function` | |
2180 | to load an editor exactly at the point where 'function' is defined, |
|
2181 | to load an editor exactly at the point where 'function' is defined, | |
2181 | edit it and have the file be executed automatically. |
|
2182 | edit it and have the file be executed automatically. | |
2182 |
|
2183 | |||
2183 | If the object is a macro (see %macro for details), this opens up your |
|
2184 | If the object is a macro (see %macro for details), this opens up your | |
2184 | specified editor with a temporary file containing the macro's data. |
|
2185 | specified editor with a temporary file containing the macro's data. | |
2185 | Upon exit, the macro is reloaded with the contents of the file. |
|
2186 | Upon exit, the macro is reloaded with the contents of the file. | |
2186 |
|
2187 | |||
2187 | Note: opening at an exact line is only supported under Unix, and some |
|
2188 | Note: opening at an exact line is only supported under Unix, and some | |
2188 | editors (like kedit and gedit up to Gnome 2.8) do not understand the |
|
2189 | editors (like kedit and gedit up to Gnome 2.8) do not understand the | |
2189 | '+NUMBER' parameter necessary for this feature. Good editors like |
|
2190 | '+NUMBER' parameter necessary for this feature. Good editors like | |
2190 | (X)Emacs, vi, jed, pico and joe all do. |
|
2191 | (X)Emacs, vi, jed, pico and joe all do. | |
2191 |
|
2192 | |||
2192 | - If the argument is not found as a variable, IPython will look for a |
|
2193 | - If the argument is not found as a variable, IPython will look for a | |
2193 | file with that name (adding .py if necessary) and load it into the |
|
2194 | file with that name (adding .py if necessary) and load it into the | |
2194 | editor. It will execute its contents with execfile() when you exit, |
|
2195 | editor. It will execute its contents with execfile() when you exit, | |
2195 | loading any code in the file into your interactive namespace. |
|
2196 | loading any code in the file into your interactive namespace. | |
2196 |
|
2197 | |||
2197 | After executing your code, %edit will return as output the code you |
|
2198 | After executing your code, %edit will return as output the code you | |
2198 | typed in the editor (except when it was an existing file). This way |
|
2199 | typed in the editor (except when it was an existing file). This way | |
2199 | you can reload the code in further invocations of %edit as a variable, |
|
2200 | you can reload the code in further invocations of %edit as a variable, | |
2200 | via _<NUMBER> or Out[<NUMBER>], where <NUMBER> is the prompt number of |
|
2201 | via _<NUMBER> or Out[<NUMBER>], where <NUMBER> is the prompt number of | |
2201 | the output. |
|
2202 | the output. | |
2202 |
|
2203 | |||
2203 | Note that %edit is also available through the alias %ed. |
|
2204 | Note that %edit is also available through the alias %ed. | |
2204 |
|
2205 | |||
2205 | This is an example of creating a simple function inside the editor and |
|
2206 | This is an example of creating a simple function inside the editor and | |
2206 | then modifying it. First, start up the editor: |
|
2207 | then modifying it. First, start up the editor: | |
2207 |
|
2208 | |||
2208 | In [1]: ed |
|
2209 | In [1]: ed | |
2209 | Editing... done. Executing edited code... |
|
2210 | Editing... done. Executing edited code... | |
2210 | Out[1]: 'def foo():n print "foo() was defined in an editing session"n' |
|
2211 | Out[1]: 'def foo():n print "foo() was defined in an editing session"n' | |
2211 |
|
2212 | |||
2212 | We can then call the function foo(): |
|
2213 | We can then call the function foo(): | |
2213 |
|
2214 | |||
2214 | In [2]: foo() |
|
2215 | In [2]: foo() | |
2215 | foo() was defined in an editing session |
|
2216 | foo() was defined in an editing session | |
2216 |
|
2217 | |||
2217 | Now we edit foo. IPython automatically loads the editor with the |
|
2218 | Now we edit foo. IPython automatically loads the editor with the | |
2218 | (temporary) file where foo() was previously defined: |
|
2219 | (temporary) file where foo() was previously defined: | |
2219 |
|
2220 | |||
2220 | In [3]: ed foo |
|
2221 | In [3]: ed foo | |
2221 | Editing... done. Executing edited code... |
|
2222 | Editing... done. Executing edited code... | |
2222 |
|
2223 | |||
2223 | And if we call foo() again we get the modified version: |
|
2224 | And if we call foo() again we get the modified version: | |
2224 |
|
2225 | |||
2225 | In [4]: foo() |
|
2226 | In [4]: foo() | |
2226 | foo() has now been changed! |
|
2227 | foo() has now been changed! | |
2227 |
|
2228 | |||
2228 | Here is an example of how to edit a code snippet successive |
|
2229 | Here is an example of how to edit a code snippet successive | |
2229 | times. First we call the editor: |
|
2230 | times. First we call the editor: | |
2230 |
|
2231 | |||
2231 | In [5]: ed |
|
2232 | In [5]: ed | |
2232 | Editing... done. Executing edited code... |
|
2233 | Editing... done. Executing edited code... | |
2233 | hello |
|
2234 | hello | |
2234 | Out[5]: "print 'hello'n" |
|
2235 | Out[5]: "print 'hello'n" | |
2235 |
|
2236 | |||
2236 | Now we call it again with the previous output (stored in _): |
|
2237 | Now we call it again with the previous output (stored in _): | |
2237 |
|
2238 | |||
2238 | In [6]: ed _ |
|
2239 | In [6]: ed _ | |
2239 | Editing... done. Executing edited code... |
|
2240 | Editing... done. Executing edited code... | |
2240 | hello world |
|
2241 | hello world | |
2241 | Out[6]: "print 'hello world'n" |
|
2242 | Out[6]: "print 'hello world'n" | |
2242 |
|
2243 | |||
2243 | Now we call it with the output #8 (stored in _8, also as Out[8]): |
|
2244 | Now we call it with the output #8 (stored in _8, also as Out[8]): | |
2244 |
|
2245 | |||
2245 | In [7]: ed _8 |
|
2246 | In [7]: ed _8 | |
2246 | Editing... done. Executing edited code... |
|
2247 | Editing... done. Executing edited code... | |
2247 | hello again |
|
2248 | hello again | |
2248 | Out[7]: "print 'hello again'n" |
|
2249 | Out[7]: "print 'hello again'n" | |
2249 |
|
2250 | |||
2250 |
|
2251 | |||
2251 | Changing the default editor hook: |
|
2252 | Changing the default editor hook: | |
2252 |
|
2253 | |||
2253 | If you wish to write your own editor hook, you can put it in a |
|
2254 | If you wish to write your own editor hook, you can put it in a | |
2254 | configuration file which you load at startup time. The default hook |
|
2255 | configuration file which you load at startup time. The default hook | |
2255 | is defined in the IPython.hooks module, and you can use that as a |
|
2256 | is defined in the IPython.hooks module, and you can use that as a | |
2256 | starting example for further modifications. That file also has |
|
2257 | starting example for further modifications. That file also has | |
2257 | general instructions on how to set a new hook for use once you've |
|
2258 | general instructions on how to set a new hook for use once you've | |
2258 | defined it.""" |
|
2259 | defined it.""" | |
2259 |
|
2260 | |||
2260 | # FIXME: This function has become a convoluted mess. It needs a |
|
2261 | # FIXME: This function has become a convoluted mess. It needs a | |
2261 | # ground-up rewrite with clean, simple logic. |
|
2262 | # ground-up rewrite with clean, simple logic. | |
2262 |
|
2263 | |||
2263 | def make_filename(arg): |
|
2264 | def make_filename(arg): | |
2264 | "Make a filename from the given args" |
|
2265 | "Make a filename from the given args" | |
2265 | try: |
|
2266 | try: | |
2266 | filename = get_py_filename(arg) |
|
2267 | filename = get_py_filename(arg) | |
2267 | except IOError: |
|
2268 | except IOError: | |
2268 | if args.endswith('.py'): |
|
2269 | if args.endswith('.py'): | |
2269 | filename = arg |
|
2270 | filename = arg | |
2270 | else: |
|
2271 | else: | |
2271 | filename = None |
|
2272 | filename = None | |
2272 | return filename |
|
2273 | return filename | |
2273 |
|
2274 | |||
2274 | # custom exceptions |
|
2275 | # custom exceptions | |
2275 | class DataIsObject(Exception): pass |
|
2276 | class DataIsObject(Exception): pass | |
2276 |
|
2277 | |||
2277 | opts,args = self.parse_options(parameter_s,'prxn:') |
|
2278 | opts,args = self.parse_options(parameter_s,'prxn:') | |
2278 | # Set a few locals from the options for convenience: |
|
2279 | # Set a few locals from the options for convenience: | |
2279 | opts_p = opts.has_key('p') |
|
2280 | opts_p = opts.has_key('p') | |
2280 | opts_r = opts.has_key('r') |
|
2281 | opts_r = opts.has_key('r') | |
2281 |
|
2282 | |||
2282 | # Default line number value |
|
2283 | # Default line number value | |
2283 | lineno = opts.get('n',None) |
|
2284 | lineno = opts.get('n',None) | |
2284 |
|
2285 | |||
2285 | if opts_p: |
|
2286 | if opts_p: | |
2286 | args = '_%s' % last_call[0] |
|
2287 | args = '_%s' % last_call[0] | |
2287 | if not self.shell.user_ns.has_key(args): |
|
2288 | if not self.shell.user_ns.has_key(args): | |
2288 | args = last_call[1] |
|
2289 | args = last_call[1] | |
2289 |
|
2290 | |||
2290 | # use last_call to remember the state of the previous call, but don't |
|
2291 | # use last_call to remember the state of the previous call, but don't | |
2291 | # let it be clobbered by successive '-p' calls. |
|
2292 | # let it be clobbered by successive '-p' calls. | |
2292 | try: |
|
2293 | try: | |
2293 | last_call[0] = self.shell.outputcache.prompt_count |
|
2294 | last_call[0] = self.shell.outputcache.prompt_count | |
2294 | if not opts_p: |
|
2295 | if not opts_p: | |
2295 | last_call[1] = parameter_s |
|
2296 | last_call[1] = parameter_s | |
2296 | except: |
|
2297 | except: | |
2297 | pass |
|
2298 | pass | |
2298 |
|
2299 | |||
2299 | # by default this is done with temp files, except when the given |
|
2300 | # by default this is done with temp files, except when the given | |
2300 | # arg is a filename |
|
2301 | # arg is a filename | |
2301 | use_temp = 1 |
|
2302 | use_temp = 1 | |
2302 |
|
2303 | |||
2303 | if re.match(r'\d',args): |
|
2304 | if re.match(r'\d',args): | |
2304 | # Mode where user specifies ranges of lines, like in %macro. |
|
2305 | # Mode where user specifies ranges of lines, like in %macro. | |
2305 | # This means that you can't edit files whose names begin with |
|
2306 | # This means that you can't edit files whose names begin with | |
2306 | # numbers this way. Tough. |
|
2307 | # numbers this way. Tough. | |
2307 | ranges = args.split() |
|
2308 | ranges = args.split() | |
2308 | data = ''.join(self.extract_input_slices(ranges,opts_r)) |
|
2309 | data = ''.join(self.extract_input_slices(ranges,opts_r)) | |
2309 | elif args.endswith('.py'): |
|
2310 | elif args.endswith('.py'): | |
2310 | filename = make_filename(args) |
|
2311 | filename = make_filename(args) | |
2311 | data = '' |
|
2312 | data = '' | |
2312 | use_temp = 0 |
|
2313 | use_temp = 0 | |
2313 | elif args: |
|
2314 | elif args: | |
2314 | try: |
|
2315 | try: | |
2315 | # Load the parameter given as a variable. If not a string, |
|
2316 | # Load the parameter given as a variable. If not a string, | |
2316 | # process it as an object instead (below) |
|
2317 | # process it as an object instead (below) | |
2317 |
|
2318 | |||
2318 | #print '*** args',args,'type',type(args) # dbg |
|
2319 | #print '*** args',args,'type',type(args) # dbg | |
2319 | data = eval(args,self.shell.user_ns) |
|
2320 | data = eval(args,self.shell.user_ns) | |
2320 | if not type(data) in StringTypes: |
|
2321 | if not type(data) in StringTypes: | |
2321 | raise DataIsObject |
|
2322 | raise DataIsObject | |
2322 |
|
2323 | |||
2323 | except (NameError,SyntaxError): |
|
2324 | except (NameError,SyntaxError): | |
2324 | # given argument is not a variable, try as a filename |
|
2325 | # given argument is not a variable, try as a filename | |
2325 | filename = make_filename(args) |
|
2326 | filename = make_filename(args) | |
2326 | if filename is None: |
|
2327 | if filename is None: | |
2327 | warn("Argument given (%s) can't be found as a variable " |
|
2328 | warn("Argument given (%s) can't be found as a variable " | |
2328 | "or as a filename." % args) |
|
2329 | "or as a filename." % args) | |
2329 | return |
|
2330 | return | |
2330 |
|
2331 | |||
2331 | data = '' |
|
2332 | data = '' | |
2332 | use_temp = 0 |
|
2333 | use_temp = 0 | |
2333 | except DataIsObject: |
|
2334 | except DataIsObject: | |
2334 |
|
2335 | |||
2335 | # macros have a special edit function |
|
2336 | # macros have a special edit function | |
2336 | if isinstance(data,Macro): |
|
2337 | if isinstance(data,Macro): | |
2337 | self._edit_macro(args,data) |
|
2338 | self._edit_macro(args,data) | |
2338 | return |
|
2339 | return | |
2339 |
|
2340 | |||
2340 | # For objects, try to edit the file where they are defined |
|
2341 | # For objects, try to edit the file where they are defined | |
2341 | try: |
|
2342 | try: | |
2342 | filename = inspect.getabsfile(data) |
|
2343 | filename = inspect.getabsfile(data) | |
2343 | if 'fakemodule' in filename.lower() and inspect.isclass(data): |
|
2344 | if 'fakemodule' in filename.lower() and inspect.isclass(data): | |
2344 | # class created by %edit? Try to find source |
|
2345 | # class created by %edit? Try to find source | |
2345 | # by looking for method definitions instead, the |
|
2346 | # by looking for method definitions instead, the | |
2346 | # __module__ in those classes is FakeModule. |
|
2347 | # __module__ in those classes is FakeModule. | |
2347 | attrs = [getattr(data, aname) for aname in dir(data)] |
|
2348 | attrs = [getattr(data, aname) for aname in dir(data)] | |
2348 | for attr in attrs: |
|
2349 | for attr in attrs: | |
2349 | if not inspect.ismethod(attr): |
|
2350 | if not inspect.ismethod(attr): | |
2350 | continue |
|
2351 | continue | |
2351 | filename = inspect.getabsfile(attr) |
|
2352 | filename = inspect.getabsfile(attr) | |
2352 | if filename and 'fakemodule' not in filename.lower(): |
|
2353 | if filename and 'fakemodule' not in filename.lower(): | |
2353 | # change the attribute to be the edit target instead |
|
2354 | # change the attribute to be the edit target instead | |
2354 | data = attr |
|
2355 | data = attr | |
2355 | break |
|
2356 | break | |
2356 |
|
2357 | |||
2357 | datafile = 1 |
|
2358 | datafile = 1 | |
2358 | except TypeError: |
|
2359 | except TypeError: | |
2359 | filename = make_filename(args) |
|
2360 | filename = make_filename(args) | |
2360 | datafile = 1 |
|
2361 | datafile = 1 | |
2361 | warn('Could not find file where `%s` is defined.\n' |
|
2362 | warn('Could not find file where `%s` is defined.\n' | |
2362 | 'Opening a file named `%s`' % (args,filename)) |
|
2363 | 'Opening a file named `%s`' % (args,filename)) | |
2363 | # Now, make sure we can actually read the source (if it was in |
|
2364 | # Now, make sure we can actually read the source (if it was in | |
2364 | # a temp file it's gone by now). |
|
2365 | # a temp file it's gone by now). | |
2365 | if datafile: |
|
2366 | if datafile: | |
2366 | try: |
|
2367 | try: | |
2367 | if lineno is None: |
|
2368 | if lineno is None: | |
2368 | lineno = inspect.getsourcelines(data)[1] |
|
2369 | lineno = inspect.getsourcelines(data)[1] | |
2369 | except IOError: |
|
2370 | except IOError: | |
2370 | filename = make_filename(args) |
|
2371 | filename = make_filename(args) | |
2371 | if filename is None: |
|
2372 | if filename is None: | |
2372 | warn('The file `%s` where `%s` was defined cannot ' |
|
2373 | warn('The file `%s` where `%s` was defined cannot ' | |
2373 | 'be read.' % (filename,data)) |
|
2374 | 'be read.' % (filename,data)) | |
2374 | return |
|
2375 | return | |
2375 | use_temp = 0 |
|
2376 | use_temp = 0 | |
2376 | else: |
|
2377 | else: | |
2377 | data = '' |
|
2378 | data = '' | |
2378 |
|
2379 | |||
2379 | if use_temp: |
|
2380 | if use_temp: | |
2380 | filename = self.shell.mktempfile(data) |
|
2381 | filename = self.shell.mktempfile(data) | |
2381 | print 'IPython will make a temporary file named:',filename |
|
2382 | print 'IPython will make a temporary file named:',filename | |
2382 |
|
2383 | |||
2383 | # do actual editing here |
|
2384 | # do actual editing here | |
2384 | print 'Editing...', |
|
2385 | print 'Editing...', | |
2385 | sys.stdout.flush() |
|
2386 | sys.stdout.flush() | |
2386 | try: |
|
2387 | try: | |
2387 | self.shell.hooks.editor(filename,lineno) |
|
2388 | self.shell.hooks.editor(filename,lineno) | |
2388 | except IPython.ipapi.TryNext: |
|
2389 | except IPython.ipapi.TryNext: | |
2389 | warn('Could not open editor') |
|
2390 | warn('Could not open editor') | |
2390 | return |
|
2391 | return | |
2391 |
|
2392 | |||
2392 | # XXX TODO: should this be generalized for all string vars? |
|
2393 | # XXX TODO: should this be generalized for all string vars? | |
2393 | # For now, this is special-cased to blocks created by cpaste |
|
2394 | # For now, this is special-cased to blocks created by cpaste | |
2394 | if args.strip() == 'pasted_block': |
|
2395 | if args.strip() == 'pasted_block': | |
2395 | self.shell.user_ns['pasted_block'] = file_read(filename) |
|
2396 | self.shell.user_ns['pasted_block'] = file_read(filename) | |
2396 |
|
2397 | |||
2397 | if opts.has_key('x'): # -x prevents actual execution |
|
2398 | if opts.has_key('x'): # -x prevents actual execution | |
2398 |
|
2399 | |||
2399 | else: |
|
2400 | else: | |
2400 | print 'done. Executing edited code...' |
|
2401 | print 'done. Executing edited code...' | |
2401 | if opts_r: |
|
2402 | if opts_r: | |
2402 | self.shell.runlines(file_read(filename)) |
|
2403 | self.shell.runlines(file_read(filename)) | |
2403 | else: |
|
2404 | else: | |
2404 | self.shell.safe_execfile(filename,self.shell.user_ns, |
|
2405 | self.shell.safe_execfile(filename,self.shell.user_ns, | |
2405 | self.shell.user_ns) |
|
2406 | self.shell.user_ns) | |
2406 |
|
2407 | |||
2407 |
|
2408 | |||
2408 | if use_temp: |
|
2409 | if use_temp: | |
2409 | try: |
|
2410 | try: | |
2410 | return open(filename).read() |
|
2411 | return open(filename).read() | |
2411 | except IOError,msg: |
|
2412 | except IOError,msg: | |
2412 | if msg.filename == filename: |
|
2413 | if msg.filename == filename: | |
2413 | warn('File not found. Did you forget to save?') |
|
2414 | warn('File not found. Did you forget to save?') | |
2414 | return |
|
2415 | return | |
2415 | else: |
|
2416 | else: | |
2416 | self.shell.showtraceback() |
|
2417 | self.shell.showtraceback() | |
2417 |
|
2418 | |||
2418 | def magic_xmode(self,parameter_s = ''): |
|
2419 | def magic_xmode(self,parameter_s = ''): | |
2419 | """Switch modes for the exception handlers. |
|
2420 | """Switch modes for the exception handlers. | |
2420 |
|
2421 | |||
2421 | Valid modes: Plain, Context and Verbose. |
|
2422 | Valid modes: Plain, Context and Verbose. | |
2422 |
|
2423 | |||
2423 | If called without arguments, acts as a toggle.""" |
|
2424 | If called without arguments, acts as a toggle.""" | |
2424 |
|
2425 | |||
2425 | def xmode_switch_err(name): |
|
2426 | def xmode_switch_err(name): | |
2426 | warn('Error changing %s exception modes.\n%s' % |
|
2427 | warn('Error changing %s exception modes.\n%s' % | |
2427 | (name,sys.exc_info()[1])) |
|
2428 | (name,sys.exc_info()[1])) | |
2428 |
|
2429 | |||
2429 | shell = self.shell |
|
2430 | shell = self.shell | |
2430 | new_mode = parameter_s.strip().capitalize() |
|
2431 | new_mode = parameter_s.strip().capitalize() | |
2431 | try: |
|
2432 | try: | |
2432 | shell.InteractiveTB.set_mode(mode=new_mode) |
|
2433 | shell.InteractiveTB.set_mode(mode=new_mode) | |
2433 | print 'Exception reporting mode:',shell.InteractiveTB.mode |
|
2434 | print 'Exception reporting mode:',shell.InteractiveTB.mode | |
2434 | except: |
|
2435 | except: | |
2435 | xmode_switch_err('user') |
|
2436 | xmode_switch_err('user') | |
2436 |
|
2437 | |||
2437 | # threaded shells use a special handler in sys.excepthook |
|
2438 | # threaded shells use a special handler in sys.excepthook | |
2438 | if shell.isthreaded: |
|
2439 | if shell.isthreaded: | |
2439 | try: |
|
2440 | try: | |
2440 | shell.sys_excepthook.set_mode(mode=new_mode) |
|
2441 | shell.sys_excepthook.set_mode(mode=new_mode) | |
2441 | except: |
|
2442 | except: | |
2442 | xmode_switch_err('threaded') |
|
2443 | xmode_switch_err('threaded') | |
2443 |
|
2444 | |||
2444 | def magic_colors(self,parameter_s = ''): |
|
2445 | def magic_colors(self,parameter_s = ''): | |
2445 | """Switch color scheme for prompts, info system and exception handlers. |
|
2446 | """Switch color scheme for prompts, info system and exception handlers. | |
2446 |
|
2447 | |||
2447 | Currently implemented schemes: NoColor, Linux, LightBG. |
|
2448 | Currently implemented schemes: NoColor, Linux, LightBG. | |
2448 |
|
2449 | |||
2449 | Color scheme names are not case-sensitive.""" |
|
2450 | Color scheme names are not case-sensitive.""" | |
2450 |
|
2451 | |||
2451 | def color_switch_err(name): |
|
2452 | def color_switch_err(name): | |
2452 | warn('Error changing %s color schemes.\n%s' % |
|
2453 | warn('Error changing %s color schemes.\n%s' % | |
2453 | (name,sys.exc_info()[1])) |
|
2454 | (name,sys.exc_info()[1])) | |
2454 |
|
2455 | |||
2455 |
|
2456 | |||
2456 | new_scheme = parameter_s.strip() |
|
2457 | new_scheme = parameter_s.strip() | |
2457 | if not new_scheme: |
|
2458 | if not new_scheme: | |
2458 | raise UsageError( |
|
2459 | raise UsageError( | |
2459 | "%colors: you must specify a color scheme. See '%colors?'") |
|
2460 | "%colors: you must specify a color scheme. See '%colors?'") | |
2460 | return |
|
2461 | return | |
2461 | # local shortcut |
|
2462 | # local shortcut | |
2462 | shell = self.shell |
|
2463 | shell = self.shell | |
2463 |
|
2464 | |||
2464 | import IPython.rlineimpl as readline |
|
2465 | import IPython.rlineimpl as readline | |
2465 |
|
2466 | |||
2466 | if not readline.have_readline and sys.platform == "win32": |
|
2467 | if not readline.have_readline and sys.platform == "win32": | |
2467 | msg = """\ |
|
2468 | msg = """\ | |
2468 | Proper color support under MS Windows requires the pyreadline library. |
|
2469 | Proper color support under MS Windows requires the pyreadline library. | |
2469 | You can find it at: |
|
2470 | You can find it at: | |
2470 | http://ipython.scipy.org/moin/PyReadline/Intro |
|
2471 | http://ipython.scipy.org/moin/PyReadline/Intro | |
2471 | Gary's readline needs the ctypes module, from: |
|
2472 | Gary's readline needs the ctypes module, from: | |
2472 | http://starship.python.net/crew/theller/ctypes |
|
2473 | http://starship.python.net/crew/theller/ctypes | |
2473 | (Note that ctypes is already part of Python versions 2.5 and newer). |
|
2474 | (Note that ctypes is already part of Python versions 2.5 and newer). | |
2474 |
|
2475 | |||
2475 | Defaulting color scheme to 'NoColor'""" |
|
2476 | Defaulting color scheme to 'NoColor'""" | |
2476 | new_scheme = 'NoColor' |
|
2477 | new_scheme = 'NoColor' | |
2477 | warn(msg) |
|
2478 | warn(msg) | |
2478 |
|
2479 | |||
2479 | # readline option is 0 |
|
2480 | # readline option is 0 | |
2480 | if not shell.has_readline: |
|
2481 | if not shell.has_readline: | |
2481 | new_scheme = 'NoColor' |
|
2482 | new_scheme = 'NoColor' | |
2482 |
|
2483 | |||
2483 | # Set prompt colors |
|
2484 | # Set prompt colors | |
2484 | try: |
|
2485 | try: | |
2485 | shell.outputcache.set_colors(new_scheme) |
|
2486 | shell.outputcache.set_colors(new_scheme) | |
2486 | except: |
|
2487 | except: | |
2487 | color_switch_err('prompt') |
|
2488 | color_switch_err('prompt') | |
2488 | else: |
|
2489 | else: | |
2489 | shell.rc.colors = \ |
|
2490 | shell.rc.colors = \ | |
2490 | shell.outputcache.color_table.active_scheme_name |
|
2491 | shell.outputcache.color_table.active_scheme_name | |
2491 | # Set exception colors |
|
2492 | # Set exception colors | |
2492 | try: |
|
2493 | try: | |
2493 | shell.InteractiveTB.set_colors(scheme = new_scheme) |
|
2494 | shell.InteractiveTB.set_colors(scheme = new_scheme) | |
2494 | shell.SyntaxTB.set_colors(scheme = new_scheme) |
|
2495 | shell.SyntaxTB.set_colors(scheme = new_scheme) | |
2495 | except: |
|
2496 | except: | |
2496 | color_switch_err('exception') |
|
2497 | color_switch_err('exception') | |
2497 |
|
2498 | |||
2498 | # threaded shells use a verbose traceback in sys.excepthook |
|
2499 | # threaded shells use a verbose traceback in sys.excepthook | |
2499 | if shell.isthreaded: |
|
2500 | if shell.isthreaded: | |
2500 | try: |
|
2501 | try: | |
2501 | shell.sys_excepthook.set_colors(scheme=new_scheme) |
|
2502 | shell.sys_excepthook.set_colors(scheme=new_scheme) | |
2502 | except: |
|
2503 | except: | |
2503 | color_switch_err('system exception handler') |
|
2504 | color_switch_err('system exception handler') | |
2504 |
|
2505 | |||
2505 | # Set info (for 'object?') colors |
|
2506 | # Set info (for 'object?') colors | |
2506 | if shell.rc.color_info: |
|
2507 | if shell.rc.color_info: | |
2507 | try: |
|
2508 | try: | |
2508 | shell.inspector.set_active_scheme(new_scheme) |
|
2509 | shell.inspector.set_active_scheme(new_scheme) | |
2509 | except: |
|
2510 | except: | |
2510 | color_switch_err('object inspector') |
|
2511 | color_switch_err('object inspector') | |
2511 | else: |
|
2512 | else: | |
2512 | shell.inspector.set_active_scheme('NoColor') |
|
2513 | shell.inspector.set_active_scheme('NoColor') | |
2513 |
|
2514 | |||
2514 | def magic_color_info(self,parameter_s = ''): |
|
2515 | def magic_color_info(self,parameter_s = ''): | |
2515 | """Toggle color_info. |
|
2516 | """Toggle color_info. | |
2516 |
|
2517 | |||
2517 | The color_info configuration parameter controls whether colors are |
|
2518 | The color_info configuration parameter controls whether colors are | |
2518 | used for displaying object details (by things like %psource, %pfile or |
|
2519 | used for displaying object details (by things like %psource, %pfile or | |
2519 | the '?' system). This function toggles this value with each call. |
|
2520 | the '?' system). This function toggles this value with each call. | |
2520 |
|
2521 | |||
2521 | Note that unless you have a fairly recent pager (less works better |
|
2522 | Note that unless you have a fairly recent pager (less works better | |
2522 | than more) in your system, using colored object information displays |
|
2523 | than more) in your system, using colored object information displays | |
2523 | will not work properly. Test it and see.""" |
|
2524 | will not work properly. Test it and see.""" | |
2524 |
|
2525 | |||
2525 | self.shell.rc.color_info = 1 - self.shell.rc.color_info |
|
2526 | self.shell.rc.color_info = 1 - self.shell.rc.color_info | |
2526 | self.magic_colors(self.shell.rc.colors) |
|
2527 | self.magic_colors(self.shell.rc.colors) | |
2527 | print 'Object introspection functions have now coloring:', |
|
2528 | print 'Object introspection functions have now coloring:', | |
2528 | print ['OFF','ON'][self.shell.rc.color_info] |
|
2529 | print ['OFF','ON'][self.shell.rc.color_info] | |
2529 |
|
2530 | |||
2530 | def magic_Pprint(self, parameter_s=''): |
|
2531 | def magic_Pprint(self, parameter_s=''): | |
2531 | """Toggle pretty printing on/off.""" |
|
2532 | """Toggle pretty printing on/off.""" | |
2532 |
|
2533 | |||
2533 | self.shell.rc.pprint = 1 - self.shell.rc.pprint |
|
2534 | self.shell.rc.pprint = 1 - self.shell.rc.pprint | |
2534 | print 'Pretty printing has been turned', \ |
|
2535 | print 'Pretty printing has been turned', \ | |
2535 | ['OFF','ON'][self.shell.rc.pprint] |
|
2536 | ['OFF','ON'][self.shell.rc.pprint] | |
2536 |
|
2537 | |||
2537 | def magic_exit(self, parameter_s=''): |
|
2538 | def magic_exit(self, parameter_s=''): | |
2538 | """Exit IPython, confirming if configured to do so. |
|
2539 | """Exit IPython, confirming if configured to do so. | |
2539 |
|
2540 | |||
2540 | You can configure whether IPython asks for confirmation upon exit by |
|
2541 | You can configure whether IPython asks for confirmation upon exit by | |
2541 | setting the confirm_exit flag in the ipythonrc file.""" |
|
2542 | setting the confirm_exit flag in the ipythonrc file.""" | |
2542 |
|
2543 | |||
2543 | self.shell.exit() |
|
2544 | self.shell.exit() | |
2544 |
|
2545 | |||
2545 | def magic_quit(self, parameter_s=''): |
|
2546 | def magic_quit(self, parameter_s=''): | |
2546 | """Exit IPython, confirming if configured to do so (like %exit)""" |
|
2547 | """Exit IPython, confirming if configured to do so (like %exit)""" | |
2547 |
|
2548 | |||
2548 | self.shell.exit() |
|
2549 | self.shell.exit() | |
2549 |
|
2550 | |||
2550 | def magic_Exit(self, parameter_s=''): |
|
2551 | def magic_Exit(self, parameter_s=''): | |
2551 | """Exit IPython without confirmation.""" |
|
2552 | """Exit IPython without confirmation.""" | |
2552 |
|
2553 | |||
2553 | self.shell.ask_exit() |
|
2554 | self.shell.ask_exit() | |
2554 |
|
2555 | |||
2555 | #...................................................................... |
|
2556 | #...................................................................... | |
2556 | # Functions to implement unix shell-type things |
|
2557 | # Functions to implement unix shell-type things | |
2557 |
|
2558 | |||
2558 | @testdec.skip_doctest |
|
2559 | @testdec.skip_doctest | |
2559 | def magic_alias(self, parameter_s = ''): |
|
2560 | def magic_alias(self, parameter_s = ''): | |
2560 | """Define an alias for a system command. |
|
2561 | """Define an alias for a system command. | |
2561 |
|
2562 | |||
2562 | '%alias alias_name cmd' defines 'alias_name' as an alias for 'cmd' |
|
2563 | '%alias alias_name cmd' defines 'alias_name' as an alias for 'cmd' | |
2563 |
|
2564 | |||
2564 | Then, typing 'alias_name params' will execute the system command 'cmd |
|
2565 | Then, typing 'alias_name params' will execute the system command 'cmd | |
2565 | params' (from your underlying operating system). |
|
2566 | params' (from your underlying operating system). | |
2566 |
|
2567 | |||
2567 | Aliases have lower precedence than magic functions and Python normal |
|
2568 | Aliases have lower precedence than magic functions and Python normal | |
2568 | variables, so if 'foo' is both a Python variable and an alias, the |
|
2569 | variables, so if 'foo' is both a Python variable and an alias, the | |
2569 | alias can not be executed until 'del foo' removes the Python variable. |
|
2570 | alias can not be executed until 'del foo' removes the Python variable. | |
2570 |
|
2571 | |||
2571 | You can use the %l specifier in an alias definition to represent the |
|
2572 | You can use the %l specifier in an alias definition to represent the | |
2572 | whole line when the alias is called. For example: |
|
2573 | whole line when the alias is called. For example: | |
2573 |
|
2574 | |||
2574 | In [2]: alias all echo "Input in brackets: <%l>" |
|
2575 | In [2]: alias all echo "Input in brackets: <%l>" | |
2575 | In [3]: all hello world |
|
2576 | In [3]: all hello world | |
2576 | Input in brackets: <hello world> |
|
2577 | Input in brackets: <hello world> | |
2577 |
|
2578 | |||
2578 | You can also define aliases with parameters using %s specifiers (one |
|
2579 | You can also define aliases with parameters using %s specifiers (one | |
2579 | per parameter): |
|
2580 | per parameter): | |
2580 |
|
2581 | |||
2581 | In [1]: alias parts echo first %s second %s |
|
2582 | In [1]: alias parts echo first %s second %s | |
2582 | In [2]: %parts A B |
|
2583 | In [2]: %parts A B | |
2583 | first A second B |
|
2584 | first A second B | |
2584 | In [3]: %parts A |
|
2585 | In [3]: %parts A | |
2585 | Incorrect number of arguments: 2 expected. |
|
2586 | Incorrect number of arguments: 2 expected. | |
2586 | parts is an alias to: 'echo first %s second %s' |
|
2587 | parts is an alias to: 'echo first %s second %s' | |
2587 |
|
2588 | |||
2588 | Note that %l and %s are mutually exclusive. You can only use one or |
|
2589 | Note that %l and %s are mutually exclusive. You can only use one or | |
2589 | the other in your aliases. |
|
2590 | the other in your aliases. | |
2590 |
|
2591 | |||
2591 | Aliases expand Python variables just like system calls using ! or !! |
|
2592 | Aliases expand Python variables just like system calls using ! or !! | |
2592 | do: all expressions prefixed with '$' get expanded. For details of |
|
2593 | do: all expressions prefixed with '$' get expanded. For details of | |
2593 | the semantic rules, see PEP-215: |
|
2594 | the semantic rules, see PEP-215: | |
2594 | http://www.python.org/peps/pep-0215.html. This is the library used by |
|
2595 | http://www.python.org/peps/pep-0215.html. This is the library used by | |
2595 | IPython for variable expansion. If you want to access a true shell |
|
2596 | IPython for variable expansion. If you want to access a true shell | |
2596 | variable, an extra $ is necessary to prevent its expansion by IPython: |
|
2597 | variable, an extra $ is necessary to prevent its expansion by IPython: | |
2597 |
|
2598 | |||
2598 | In [6]: alias show echo |
|
2599 | In [6]: alias show echo | |
2599 | In [7]: PATH='A Python string' |
|
2600 | In [7]: PATH='A Python string' | |
2600 | In [8]: show $PATH |
|
2601 | In [8]: show $PATH | |
2601 | A Python string |
|
2602 | A Python string | |
2602 | In [9]: show $$PATH |
|
2603 | In [9]: show $$PATH | |
2603 | /usr/local/lf9560/bin:/usr/local/intel/compiler70/ia32/bin:... |
|
2604 | /usr/local/lf9560/bin:/usr/local/intel/compiler70/ia32/bin:... | |
2604 |
|
2605 | |||
2605 | You can use the alias facility to acess all of $PATH. See the %rehash |
|
2606 | You can use the alias facility to acess all of $PATH. See the %rehash | |
2606 | and %rehashx functions, which automatically create aliases for the |
|
2607 | and %rehashx functions, which automatically create aliases for the | |
2607 | contents of your $PATH. |
|
2608 | contents of your $PATH. | |
2608 |
|
2609 | |||
2609 | If called with no parameters, %alias prints the current alias table.""" |
|
2610 | If called with no parameters, %alias prints the current alias table.""" | |
2610 |
|
2611 | |||
2611 | par = parameter_s.strip() |
|
2612 | par = parameter_s.strip() | |
2612 | if not par: |
|
2613 | if not par: | |
2613 | stored = self.db.get('stored_aliases', {} ) |
|
2614 | stored = self.db.get('stored_aliases', {} ) | |
2614 | atab = self.shell.alias_table |
|
2615 | atab = self.shell.alias_table | |
2615 | aliases = atab.keys() |
|
2616 | aliases = atab.keys() | |
2616 | aliases.sort() |
|
2617 | aliases.sort() | |
2617 | res = [] |
|
2618 | res = [] | |
2618 | showlast = [] |
|
2619 | showlast = [] | |
2619 | for alias in aliases: |
|
2620 | for alias in aliases: | |
2620 | special = False |
|
2621 | special = False | |
2621 | try: |
|
2622 | try: | |
2622 | tgt = atab[alias][1] |
|
2623 | tgt = atab[alias][1] | |
2623 | except (TypeError, AttributeError): |
|
2624 | except (TypeError, AttributeError): | |
2624 | # unsubscriptable? probably a callable |
|
2625 | # unsubscriptable? probably a callable | |
2625 | tgt = atab[alias] |
|
2626 | tgt = atab[alias] | |
2626 | special = True |
|
2627 | special = True | |
2627 | # 'interesting' aliases |
|
2628 | # 'interesting' aliases | |
2628 | if (alias in stored or |
|
2629 | if (alias in stored or | |
2629 | special or |
|
2630 | special or | |
2630 | alias.lower() != os.path.splitext(tgt)[0].lower() or |
|
2631 | alias.lower() != os.path.splitext(tgt)[0].lower() or | |
2631 | ' ' in tgt): |
|
2632 | ' ' in tgt): | |
2632 | showlast.append((alias, tgt)) |
|
2633 | showlast.append((alias, tgt)) | |
2633 | else: |
|
2634 | else: | |
2634 | res.append((alias, tgt )) |
|
2635 | res.append((alias, tgt )) | |
2635 |
|
2636 | |||
2636 | # show most interesting aliases last |
|
2637 | # show most interesting aliases last | |
2637 | res.extend(showlast) |
|
2638 | res.extend(showlast) | |
2638 | print "Total number of aliases:",len(aliases) |
|
2639 | print "Total number of aliases:",len(aliases) | |
2639 | return res |
|
2640 | return res | |
2640 | try: |
|
2641 | try: | |
2641 | alias,cmd = par.split(None,1) |
|
2642 | alias,cmd = par.split(None,1) | |
2642 | except: |
|
2643 | except: | |
2643 | print OInspect.getdoc(self.magic_alias) |
|
2644 | print OInspect.getdoc(self.magic_alias) | |
2644 | else: |
|
2645 | else: | |
2645 | nargs = cmd.count('%s') |
|
2646 | nargs = cmd.count('%s') | |
2646 | if nargs>0 and cmd.find('%l')>=0: |
|
2647 | if nargs>0 and cmd.find('%l')>=0: | |
2647 | error('The %s and %l specifiers are mutually exclusive ' |
|
2648 | error('The %s and %l specifiers are mutually exclusive ' | |
2648 | 'in alias definitions.') |
|
2649 | 'in alias definitions.') | |
2649 | else: # all looks OK |
|
2650 | else: # all looks OK | |
2650 | self.shell.alias_table[alias] = (nargs,cmd) |
|
2651 | self.shell.alias_table[alias] = (nargs,cmd) | |
2651 | self.shell.alias_table_validate(verbose=0) |
|
2652 | self.shell.alias_table_validate(verbose=0) | |
2652 | # end magic_alias |
|
2653 | # end magic_alias | |
2653 |
|
2654 | |||
2654 | def magic_unalias(self, parameter_s = ''): |
|
2655 | def magic_unalias(self, parameter_s = ''): | |
2655 | """Remove an alias""" |
|
2656 | """Remove an alias""" | |
2656 |
|
2657 | |||
2657 | aname = parameter_s.strip() |
|
2658 | aname = parameter_s.strip() | |
2658 | if aname in self.shell.alias_table: |
|
2659 | if aname in self.shell.alias_table: | |
2659 | del self.shell.alias_table[aname] |
|
2660 | del self.shell.alias_table[aname] | |
2660 | stored = self.db.get('stored_aliases', {} ) |
|
2661 | stored = self.db.get('stored_aliases', {} ) | |
2661 | if aname in stored: |
|
2662 | if aname in stored: | |
2662 | print "Removing %stored alias",aname |
|
2663 | print "Removing %stored alias",aname | |
2663 | del stored[aname] |
|
2664 | del stored[aname] | |
2664 | self.db['stored_aliases'] = stored |
|
2665 | self.db['stored_aliases'] = stored | |
2665 |
|
2666 | |||
2666 |
|
2667 | |||
2667 | def magic_rehashx(self, parameter_s = ''): |
|
2668 | def magic_rehashx(self, parameter_s = ''): | |
2668 | """Update the alias table with all executable files in $PATH. |
|
2669 | """Update the alias table with all executable files in $PATH. | |
2669 |
|
2670 | |||
2670 | This version explicitly checks that every entry in $PATH is a file |
|
2671 | This version explicitly checks that every entry in $PATH is a file | |
2671 | with execute access (os.X_OK), so it is much slower than %rehash. |
|
2672 | with execute access (os.X_OK), so it is much slower than %rehash. | |
2672 |
|
2673 | |||
2673 | Under Windows, it checks executability as a match agains a |
|
2674 | Under Windows, it checks executability as a match agains a | |
2674 | '|'-separated string of extensions, stored in the IPython config |
|
2675 | '|'-separated string of extensions, stored in the IPython config | |
2675 | variable win_exec_ext. This defaults to 'exe|com|bat'. |
|
2676 | variable win_exec_ext. This defaults to 'exe|com|bat'. | |
2676 |
|
2677 | |||
2677 | This function also resets the root module cache of module completer, |
|
2678 | This function also resets the root module cache of module completer, | |
2678 | used on slow filesystems. |
|
2679 | used on slow filesystems. | |
2679 | """ |
|
2680 | """ | |
2680 |
|
2681 | |||
2681 |
|
2682 | |||
2682 | ip = self.api |
|
2683 | ip = self.api | |
2683 |
|
2684 | |||
2684 | # for the benefit of module completer in ipy_completers.py |
|
2685 | # for the benefit of module completer in ipy_completers.py | |
2685 | del ip.db['rootmodules'] |
|
2686 | del ip.db['rootmodules'] | |
2686 |
|
2687 | |||
2687 | path = [os.path.abspath(os.path.expanduser(p)) for p in |
|
2688 | path = [os.path.abspath(os.path.expanduser(p)) for p in | |
2688 | os.environ.get('PATH','').split(os.pathsep)] |
|
2689 | os.environ.get('PATH','').split(os.pathsep)] | |
2689 | path = filter(os.path.isdir,path) |
|
2690 | path = filter(os.path.isdir,path) | |
2690 |
|
2691 | |||
2691 | alias_table = self.shell.alias_table |
|
2692 | alias_table = self.shell.alias_table | |
2692 | syscmdlist = [] |
|
2693 | syscmdlist = [] | |
2693 | if os.name == 'posix': |
|
2694 | if os.name == 'posix': | |
2694 | isexec = lambda fname:os.path.isfile(fname) and \ |
|
2695 | isexec = lambda fname:os.path.isfile(fname) and \ | |
2695 | os.access(fname,os.X_OK) |
|
2696 | os.access(fname,os.X_OK) | |
2696 | else: |
|
2697 | else: | |
2697 |
|
2698 | |||
2698 | try: |
|
2699 | try: | |
2699 | winext = os.environ['pathext'].replace(';','|').replace('.','') |
|
2700 | winext = os.environ['pathext'].replace(';','|').replace('.','') | |
2700 | except KeyError: |
|
2701 | except KeyError: | |
2701 | winext = 'exe|com|bat|py' |
|
2702 | winext = 'exe|com|bat|py' | |
2702 | if 'py' not in winext: |
|
2703 | if 'py' not in winext: | |
2703 | winext += '|py' |
|
2704 | winext += '|py' | |
2704 | execre = re.compile(r'(.*)\.(%s)$' % winext,re.IGNORECASE) |
|
2705 | execre = re.compile(r'(.*)\.(%s)$' % winext,re.IGNORECASE) | |
2705 | isexec = lambda fname:os.path.isfile(fname) and execre.match(fname) |
|
2706 | isexec = lambda fname:os.path.isfile(fname) and execre.match(fname) | |
2706 | savedir = os.getcwd() |
|
2707 | savedir = os.getcwd() | |
2707 | try: |
|
2708 | try: | |
2708 | # write the whole loop for posix/Windows so we don't have an if in |
|
2709 | # write the whole loop for posix/Windows so we don't have an if in | |
2709 | # the innermost part |
|
2710 | # the innermost part | |
2710 | if os.name == 'posix': |
|
2711 | if os.name == 'posix': | |
2711 | for pdir in path: |
|
2712 | for pdir in path: | |
2712 | os.chdir(pdir) |
|
2713 | os.chdir(pdir) | |
2713 | for ff in os.listdir(pdir): |
|
2714 | for ff in os.listdir(pdir): | |
2714 | if isexec(ff) and ff not in self.shell.no_alias: |
|
2715 | if isexec(ff) and ff not in self.shell.no_alias: | |
2715 | # each entry in the alias table must be (N,name), |
|
2716 | # each entry in the alias table must be (N,name), | |
2716 | # where N is the number of positional arguments of the |
|
2717 | # where N is the number of positional arguments of the | |
2717 | # alias. |
|
2718 | # alias. | |
2718 | # Dots will be removed from alias names, since ipython |
|
2719 | # Dots will be removed from alias names, since ipython | |
2719 | # assumes names with dots to be python code |
|
2720 | # assumes names with dots to be python code | |
2720 | alias_table[ff.replace('.','')] = (0,ff) |
|
2721 | alias_table[ff.replace('.','')] = (0,ff) | |
2721 | syscmdlist.append(ff) |
|
2722 | syscmdlist.append(ff) | |
2722 | else: |
|
2723 | else: | |
2723 | for pdir in path: |
|
2724 | for pdir in path: | |
2724 | os.chdir(pdir) |
|
2725 | os.chdir(pdir) | |
2725 | for ff in os.listdir(pdir): |
|
2726 | for ff in os.listdir(pdir): | |
2726 | base, ext = os.path.splitext(ff) |
|
2727 | base, ext = os.path.splitext(ff) | |
2727 | if isexec(ff) and base.lower() not in self.shell.no_alias: |
|
2728 | if isexec(ff) and base.lower() not in self.shell.no_alias: | |
2728 | if ext.lower() == '.exe': |
|
2729 | if ext.lower() == '.exe': | |
2729 | ff = base |
|
2730 | ff = base | |
2730 | alias_table[base.lower().replace('.','')] = (0,ff) |
|
2731 | alias_table[base.lower().replace('.','')] = (0,ff) | |
2731 | syscmdlist.append(ff) |
|
2732 | syscmdlist.append(ff) | |
2732 | # Make sure the alias table doesn't contain keywords or builtins |
|
2733 | # Make sure the alias table doesn't contain keywords or builtins | |
2733 | self.shell.alias_table_validate() |
|
2734 | self.shell.alias_table_validate() | |
2734 | # Call again init_auto_alias() so we get 'rm -i' and other |
|
2735 | # Call again init_auto_alias() so we get 'rm -i' and other | |
2735 | # modified aliases since %rehashx will probably clobber them |
|
2736 | # modified aliases since %rehashx will probably clobber them | |
2736 |
|
2737 | |||
2737 | # no, we don't want them. if %rehashx clobbers them, good, |
|
2738 | # no, we don't want them. if %rehashx clobbers them, good, | |
2738 | # we'll probably get better versions |
|
2739 | # we'll probably get better versions | |
2739 | # self.shell.init_auto_alias() |
|
2740 | # self.shell.init_auto_alias() | |
2740 | db = ip.db |
|
2741 | db = ip.db | |
2741 | db['syscmdlist'] = syscmdlist |
|
2742 | db['syscmdlist'] = syscmdlist | |
2742 | finally: |
|
2743 | finally: | |
2743 | os.chdir(savedir) |
|
2744 | os.chdir(savedir) | |
2744 |
|
2745 | |||
2745 | def magic_pwd(self, parameter_s = ''): |
|
2746 | def magic_pwd(self, parameter_s = ''): | |
2746 | """Return the current working directory path.""" |
|
2747 | """Return the current working directory path.""" | |
2747 | return os.getcwd() |
|
2748 | return os.getcwd() | |
2748 |
|
2749 | |||
2749 | def magic_cd(self, parameter_s=''): |
|
2750 | def magic_cd(self, parameter_s=''): | |
2750 | """Change the current working directory. |
|
2751 | """Change the current working directory. | |
2751 |
|
2752 | |||
2752 | This command automatically maintains an internal list of directories |
|
2753 | This command automatically maintains an internal list of directories | |
2753 | you visit during your IPython session, in the variable _dh. The |
|
2754 | you visit during your IPython session, in the variable _dh. The | |
2754 | command %dhist shows this history nicely formatted. You can also |
|
2755 | command %dhist shows this history nicely formatted. You can also | |
2755 | do 'cd -<tab>' to see directory history conveniently. |
|
2756 | do 'cd -<tab>' to see directory history conveniently. | |
2756 |
|
2757 | |||
2757 | Usage: |
|
2758 | Usage: | |
2758 |
|
2759 | |||
2759 | cd 'dir': changes to directory 'dir'. |
|
2760 | cd 'dir': changes to directory 'dir'. | |
2760 |
|
2761 | |||
2761 | cd -: changes to the last visited directory. |
|
2762 | cd -: changes to the last visited directory. | |
2762 |
|
2763 | |||
2763 | cd -<n>: changes to the n-th directory in the directory history. |
|
2764 | cd -<n>: changes to the n-th directory in the directory history. | |
2764 |
|
2765 | |||
2765 | cd --foo: change to directory that matches 'foo' in history |
|
2766 | cd --foo: change to directory that matches 'foo' in history | |
2766 |
|
2767 | |||
2767 | cd -b <bookmark_name>: jump to a bookmark set by %bookmark |
|
2768 | cd -b <bookmark_name>: jump to a bookmark set by %bookmark | |
2768 | (note: cd <bookmark_name> is enough if there is no |
|
2769 | (note: cd <bookmark_name> is enough if there is no | |
2769 | directory <bookmark_name>, but a bookmark with the name exists.) |
|
2770 | directory <bookmark_name>, but a bookmark with the name exists.) | |
2770 | 'cd -b <tab>' allows you to tab-complete bookmark names. |
|
2771 | 'cd -b <tab>' allows you to tab-complete bookmark names. | |
2771 |
|
2772 | |||
2772 | Options: |
|
2773 | Options: | |
2773 |
|
2774 | |||
2774 | -q: quiet. Do not print the working directory after the cd command is |
|
2775 | -q: quiet. Do not print the working directory after the cd command is | |
2775 | executed. By default IPython's cd command does print this directory, |
|
2776 | executed. By default IPython's cd command does print this directory, | |
2776 | since the default prompts do not display path information. |
|
2777 | since the default prompts do not display path information. | |
2777 |
|
2778 | |||
2778 | Note that !cd doesn't work for this purpose because the shell where |
|
2779 | Note that !cd doesn't work for this purpose because the shell where | |
2779 | !command runs is immediately discarded after executing 'command'.""" |
|
2780 | !command runs is immediately discarded after executing 'command'.""" | |
2780 |
|
2781 | |||
2781 | parameter_s = parameter_s.strip() |
|
2782 | parameter_s = parameter_s.strip() | |
2782 | #bkms = self.shell.persist.get("bookmarks",{}) |
|
2783 | #bkms = self.shell.persist.get("bookmarks",{}) | |
2783 |
|
2784 | |||
2784 | oldcwd = os.getcwd() |
|
2785 | oldcwd = os.getcwd() | |
2785 | numcd = re.match(r'(-)(\d+)$',parameter_s) |
|
2786 | numcd = re.match(r'(-)(\d+)$',parameter_s) | |
2786 | # jump in directory history by number |
|
2787 | # jump in directory history by number | |
2787 | if numcd: |
|
2788 | if numcd: | |
2788 | nn = int(numcd.group(2)) |
|
2789 | nn = int(numcd.group(2)) | |
2789 | try: |
|
2790 | try: | |
2790 | ps = self.shell.user_ns['_dh'][nn] |
|
2791 | ps = self.shell.user_ns['_dh'][nn] | |
2791 | except IndexError: |
|
2792 | except IndexError: | |
2792 | print 'The requested directory does not exist in history.' |
|
2793 | print 'The requested directory does not exist in history.' | |
2793 | return |
|
2794 | return | |
2794 | else: |
|
2795 | else: | |
2795 | opts = {} |
|
2796 | opts = {} | |
2796 | elif parameter_s.startswith('--'): |
|
2797 | elif parameter_s.startswith('--'): | |
2797 | ps = None |
|
2798 | ps = None | |
2798 | fallback = None |
|
2799 | fallback = None | |
2799 | pat = parameter_s[2:] |
|
2800 | pat = parameter_s[2:] | |
2800 | dh = self.shell.user_ns['_dh'] |
|
2801 | dh = self.shell.user_ns['_dh'] | |
2801 | # first search only by basename (last component) |
|
2802 | # first search only by basename (last component) | |
2802 | for ent in reversed(dh): |
|
2803 | for ent in reversed(dh): | |
2803 | if pat in os.path.basename(ent) and os.path.isdir(ent): |
|
2804 | if pat in os.path.basename(ent) and os.path.isdir(ent): | |
2804 | ps = ent |
|
2805 | ps = ent | |
2805 | break |
|
2806 | break | |
2806 |
|
2807 | |||
2807 | if fallback is None and pat in ent and os.path.isdir(ent): |
|
2808 | if fallback is None and pat in ent and os.path.isdir(ent): | |
2808 | fallback = ent |
|
2809 | fallback = ent | |
2809 |
|
2810 | |||
2810 | # if we have no last part match, pick the first full path match |
|
2811 | # if we have no last part match, pick the first full path match | |
2811 | if ps is None: |
|
2812 | if ps is None: | |
2812 | ps = fallback |
|
2813 | ps = fallback | |
2813 |
|
2814 | |||
2814 | if ps is None: |
|
2815 | if ps is None: | |
2815 | print "No matching entry in directory history" |
|
2816 | print "No matching entry in directory history" | |
2816 | return |
|
2817 | return | |
2817 | else: |
|
2818 | else: | |
2818 | opts = {} |
|
2819 | opts = {} | |
2819 |
|
2820 | |||
2820 |
|
2821 | |||
2821 | else: |
|
2822 | else: | |
2822 | #turn all non-space-escaping backslashes to slashes, |
|
2823 | #turn all non-space-escaping backslashes to slashes, | |
2823 | # for c:\windows\directory\names\ |
|
2824 | # for c:\windows\directory\names\ | |
2824 | parameter_s = re.sub(r'\\(?! )','/', parameter_s) |
|
2825 | parameter_s = re.sub(r'\\(?! )','/', parameter_s) | |
2825 | opts,ps = self.parse_options(parameter_s,'qb',mode='string') |
|
2826 | opts,ps = self.parse_options(parameter_s,'qb',mode='string') | |
2826 | # jump to previous |
|
2827 | # jump to previous | |
2827 | if ps == '-': |
|
2828 | if ps == '-': | |
2828 | try: |
|
2829 | try: | |
2829 | ps = self.shell.user_ns['_dh'][-2] |
|
2830 | ps = self.shell.user_ns['_dh'][-2] | |
2830 | except IndexError: |
|
2831 | except IndexError: | |
2831 | raise UsageError('%cd -: No previous directory to change to.') |
|
2832 | raise UsageError('%cd -: No previous directory to change to.') | |
2832 | # jump to bookmark if needed |
|
2833 | # jump to bookmark if needed | |
2833 | else: |
|
2834 | else: | |
2834 | if not os.path.isdir(ps) or opts.has_key('b'): |
|
2835 | if not os.path.isdir(ps) or opts.has_key('b'): | |
2835 | bkms = self.db.get('bookmarks', {}) |
|
2836 | bkms = self.db.get('bookmarks', {}) | |
2836 |
|
2837 | |||
2837 | if bkms.has_key(ps): |
|
2838 | if bkms.has_key(ps): | |
2838 | target = bkms[ps] |
|
2839 | target = bkms[ps] | |
2839 | print '(bookmark:%s) -> %s' % (ps,target) |
|
2840 | print '(bookmark:%s) -> %s' % (ps,target) | |
2840 | ps = target |
|
2841 | ps = target | |
2841 | else: |
|
2842 | else: | |
2842 | if opts.has_key('b'): |
|
2843 | if opts.has_key('b'): | |
2843 | raise UsageError("Bookmark '%s' not found. " |
|
2844 | raise UsageError("Bookmark '%s' not found. " | |
2844 | "Use '%%bookmark -l' to see your bookmarks." % ps) |
|
2845 | "Use '%%bookmark -l' to see your bookmarks." % ps) | |
2845 |
|
2846 | |||
2846 | # at this point ps should point to the target dir |
|
2847 | # at this point ps should point to the target dir | |
2847 | if ps: |
|
2848 | if ps: | |
2848 | try: |
|
2849 | try: | |
2849 | os.chdir(os.path.expanduser(ps)) |
|
2850 | os.chdir(os.path.expanduser(ps)) | |
2850 | if self.shell.rc.term_title: |
|
2851 | if self.shell.rc.term_title: | |
2851 | #print 'set term title:',self.shell.rc.term_title # dbg |
|
2852 | #print 'set term title:',self.shell.rc.term_title # dbg | |
2852 | platutils.set_term_title('IPy ' + abbrev_cwd()) |
|
2853 | platutils.set_term_title('IPy ' + abbrev_cwd()) | |
2853 | except OSError: |
|
2854 | except OSError: | |
2854 | print sys.exc_info()[1] |
|
2855 | print sys.exc_info()[1] | |
2855 | else: |
|
2856 | else: | |
2856 | cwd = os.getcwd() |
|
2857 | cwd = os.getcwd() | |
2857 | dhist = self.shell.user_ns['_dh'] |
|
2858 | dhist = self.shell.user_ns['_dh'] | |
2858 | if oldcwd != cwd: |
|
2859 | if oldcwd != cwd: | |
2859 | dhist.append(cwd) |
|
2860 | dhist.append(cwd) | |
2860 | self.db['dhist'] = compress_dhist(dhist)[-100:] |
|
2861 | self.db['dhist'] = compress_dhist(dhist)[-100:] | |
2861 |
|
2862 | |||
2862 | else: |
|
2863 | else: | |
2863 | os.chdir(self.shell.home_dir) |
|
2864 | os.chdir(self.shell.home_dir) | |
2864 | if self.shell.rc.term_title: |
|
2865 | if self.shell.rc.term_title: | |
2865 | platutils.set_term_title("IPy ~") |
|
2866 | platutils.set_term_title("IPy ~") | |
2866 | cwd = os.getcwd() |
|
2867 | cwd = os.getcwd() | |
2867 | dhist = self.shell.user_ns['_dh'] |
|
2868 | dhist = self.shell.user_ns['_dh'] | |
2868 |
|
2869 | |||
2869 | if oldcwd != cwd: |
|
2870 | if oldcwd != cwd: | |
2870 | dhist.append(cwd) |
|
2871 | dhist.append(cwd) | |
2871 | self.db['dhist'] = compress_dhist(dhist)[-100:] |
|
2872 | self.db['dhist'] = compress_dhist(dhist)[-100:] | |
2872 | if not 'q' in opts and self.shell.user_ns['_dh']: |
|
2873 | if not 'q' in opts and self.shell.user_ns['_dh']: | |
2873 | print self.shell.user_ns['_dh'][-1] |
|
2874 | print self.shell.user_ns['_dh'][-1] | |
2874 |
|
2875 | |||
2875 |
|
2876 | |||
2876 | def magic_env(self, parameter_s=''): |
|
2877 | def magic_env(self, parameter_s=''): | |
2877 | """List environment variables.""" |
|
2878 | """List environment variables.""" | |
2878 |
|
2879 | |||
2879 | return os.environ.data |
|
2880 | return os.environ.data | |
2880 |
|
2881 | |||
2881 | def magic_pushd(self, parameter_s=''): |
|
2882 | def magic_pushd(self, parameter_s=''): | |
2882 | """Place the current dir on stack and change directory. |
|
2883 | """Place the current dir on stack and change directory. | |
2883 |
|
2884 | |||
2884 | Usage:\\ |
|
2885 | Usage:\\ | |
2885 | %pushd ['dirname'] |
|
2886 | %pushd ['dirname'] | |
2886 | """ |
|
2887 | """ | |
2887 |
|
2888 | |||
2888 | dir_s = self.shell.dir_stack |
|
2889 | dir_s = self.shell.dir_stack | |
2889 | tgt = os.path.expanduser(parameter_s) |
|
2890 | tgt = os.path.expanduser(parameter_s) | |
2890 | cwd = os.getcwd().replace(self.home_dir,'~') |
|
2891 | cwd = os.getcwd().replace(self.home_dir,'~') | |
2891 | if tgt: |
|
2892 | if tgt: | |
2892 | self.magic_cd(parameter_s) |
|
2893 | self.magic_cd(parameter_s) | |
2893 | dir_s.insert(0,cwd) |
|
2894 | dir_s.insert(0,cwd) | |
2894 | return self.magic_dirs() |
|
2895 | return self.magic_dirs() | |
2895 |
|
2896 | |||
2896 | def magic_popd(self, parameter_s=''): |
|
2897 | def magic_popd(self, parameter_s=''): | |
2897 | """Change to directory popped off the top of the stack. |
|
2898 | """Change to directory popped off the top of the stack. | |
2898 | """ |
|
2899 | """ | |
2899 | if not self.shell.dir_stack: |
|
2900 | if not self.shell.dir_stack: | |
2900 | raise UsageError("%popd on empty stack") |
|
2901 | raise UsageError("%popd on empty stack") | |
2901 | top = self.shell.dir_stack.pop(0) |
|
2902 | top = self.shell.dir_stack.pop(0) | |
2902 | self.magic_cd(top) |
|
2903 | self.magic_cd(top) | |
2903 | print "popd ->",top |
|
2904 | print "popd ->",top | |
2904 |
|
2905 | |||
2905 | def magic_dirs(self, parameter_s=''): |
|
2906 | def magic_dirs(self, parameter_s=''): | |
2906 | """Return the current directory stack.""" |
|
2907 | """Return the current directory stack.""" | |
2907 |
|
2908 | |||
2908 | return self.shell.dir_stack |
|
2909 | return self.shell.dir_stack | |
2909 |
|
2910 | |||
2910 | def magic_dhist(self, parameter_s=''): |
|
2911 | def magic_dhist(self, parameter_s=''): | |
2911 | """Print your history of visited directories. |
|
2912 | """Print your history of visited directories. | |
2912 |
|
2913 | |||
2913 | %dhist -> print full history\\ |
|
2914 | %dhist -> print full history\\ | |
2914 | %dhist n -> print last n entries only\\ |
|
2915 | %dhist n -> print last n entries only\\ | |
2915 | %dhist n1 n2 -> print entries between n1 and n2 (n1 not included)\\ |
|
2916 | %dhist n1 n2 -> print entries between n1 and n2 (n1 not included)\\ | |
2916 |
|
2917 | |||
2917 | This history is automatically maintained by the %cd command, and |
|
2918 | This history is automatically maintained by the %cd command, and | |
2918 | always available as the global list variable _dh. You can use %cd -<n> |
|
2919 | always available as the global list variable _dh. You can use %cd -<n> | |
2919 | to go to directory number <n>. |
|
2920 | to go to directory number <n>. | |
2920 |
|
2921 | |||
2921 | Note that most of time, you should view directory history by entering |
|
2922 | Note that most of time, you should view directory history by entering | |
2922 | cd -<TAB>. |
|
2923 | cd -<TAB>. | |
2923 |
|
2924 | |||
2924 | """ |
|
2925 | """ | |
2925 |
|
2926 | |||
2926 | dh = self.shell.user_ns['_dh'] |
|
2927 | dh = self.shell.user_ns['_dh'] | |
2927 | if parameter_s: |
|
2928 | if parameter_s: | |
2928 | try: |
|
2929 | try: | |
2929 | args = map(int,parameter_s.split()) |
|
2930 | args = map(int,parameter_s.split()) | |
2930 | except: |
|
2931 | except: | |
2931 | self.arg_err(Magic.magic_dhist) |
|
2932 | self.arg_err(Magic.magic_dhist) | |
2932 | return |
|
2933 | return | |
2933 | if len(args) == 1: |
|
2934 | if len(args) == 1: | |
2934 | ini,fin = max(len(dh)-(args[0]),0),len(dh) |
|
2935 | ini,fin = max(len(dh)-(args[0]),0),len(dh) | |
2935 | elif len(args) == 2: |
|
2936 | elif len(args) == 2: | |
2936 | ini,fin = args |
|
2937 | ini,fin = args | |
2937 | else: |
|
2938 | else: | |
2938 | self.arg_err(Magic.magic_dhist) |
|
2939 | self.arg_err(Magic.magic_dhist) | |
2939 | return |
|
2940 | return | |
2940 | else: |
|
2941 | else: | |
2941 | ini,fin = 0,len(dh) |
|
2942 | ini,fin = 0,len(dh) | |
2942 | nlprint(dh, |
|
2943 | nlprint(dh, | |
2943 | header = 'Directory history (kept in _dh)', |
|
2944 | header = 'Directory history (kept in _dh)', | |
2944 | start=ini,stop=fin) |
|
2945 | start=ini,stop=fin) | |
2945 |
|
2946 | |||
2946 | @testdec.skip_doctest |
|
2947 | @testdec.skip_doctest | |
2947 | def magic_sc(self, parameter_s=''): |
|
2948 | def magic_sc(self, parameter_s=''): | |
2948 | """Shell capture - execute a shell command and capture its output. |
|
2949 | """Shell capture - execute a shell command and capture its output. | |
2949 |
|
2950 | |||
2950 | DEPRECATED. Suboptimal, retained for backwards compatibility. |
|
2951 | DEPRECATED. Suboptimal, retained for backwards compatibility. | |
2951 |
|
2952 | |||
2952 | You should use the form 'var = !command' instead. Example: |
|
2953 | You should use the form 'var = !command' instead. Example: | |
2953 |
|
2954 | |||
2954 | "%sc -l myfiles = ls ~" should now be written as |
|
2955 | "%sc -l myfiles = ls ~" should now be written as | |
2955 |
|
2956 | |||
2956 | "myfiles = !ls ~" |
|
2957 | "myfiles = !ls ~" | |
2957 |
|
2958 | |||
2958 | myfiles.s, myfiles.l and myfiles.n still apply as documented |
|
2959 | myfiles.s, myfiles.l and myfiles.n still apply as documented | |
2959 | below. |
|
2960 | below. | |
2960 |
|
2961 | |||
2961 | -- |
|
2962 | -- | |
2962 | %sc [options] varname=command |
|
2963 | %sc [options] varname=command | |
2963 |
|
2964 | |||
2964 | IPython will run the given command using commands.getoutput(), and |
|
2965 | IPython will run the given command using commands.getoutput(), and | |
2965 | will then update the user's interactive namespace with a variable |
|
2966 | will then update the user's interactive namespace with a variable | |
2966 | called varname, containing the value of the call. Your command can |
|
2967 | called varname, containing the value of the call. Your command can | |
2967 | contain shell wildcards, pipes, etc. |
|
2968 | contain shell wildcards, pipes, etc. | |
2968 |
|
2969 | |||
2969 | The '=' sign in the syntax is mandatory, and the variable name you |
|
2970 | The '=' sign in the syntax is mandatory, and the variable name you | |
2970 | supply must follow Python's standard conventions for valid names. |
|
2971 | supply must follow Python's standard conventions for valid names. | |
2971 |
|
2972 | |||
2972 | (A special format without variable name exists for internal use) |
|
2973 | (A special format without variable name exists for internal use) | |
2973 |
|
2974 | |||
2974 | Options: |
|
2975 | Options: | |
2975 |
|
2976 | |||
2976 | -l: list output. Split the output on newlines into a list before |
|
2977 | -l: list output. Split the output on newlines into a list before | |
2977 | assigning it to the given variable. By default the output is stored |
|
2978 | assigning it to the given variable. By default the output is stored | |
2978 | as a single string. |
|
2979 | as a single string. | |
2979 |
|
2980 | |||
2980 | -v: verbose. Print the contents of the variable. |
|
2981 | -v: verbose. Print the contents of the variable. | |
2981 |
|
2982 | |||
2982 | In most cases you should not need to split as a list, because the |
|
2983 | In most cases you should not need to split as a list, because the | |
2983 | returned value is a special type of string which can automatically |
|
2984 | returned value is a special type of string which can automatically | |
2984 | provide its contents either as a list (split on newlines) or as a |
|
2985 | provide its contents either as a list (split on newlines) or as a | |
2985 | space-separated string. These are convenient, respectively, either |
|
2986 | space-separated string. These are convenient, respectively, either | |
2986 | for sequential processing or to be passed to a shell command. |
|
2987 | for sequential processing or to be passed to a shell command. | |
2987 |
|
2988 | |||
2988 | For example: |
|
2989 | For example: | |
2989 |
|
2990 | |||
2990 | # all-random |
|
2991 | # all-random | |
2991 |
|
2992 | |||
2992 | # Capture into variable a |
|
2993 | # Capture into variable a | |
2993 | In [1]: sc a=ls *py |
|
2994 | In [1]: sc a=ls *py | |
2994 |
|
2995 | |||
2995 | # a is a string with embedded newlines |
|
2996 | # a is a string with embedded newlines | |
2996 | In [2]: a |
|
2997 | In [2]: a | |
2997 | Out[2]: 'setup.py\\nwin32_manual_post_install.py' |
|
2998 | Out[2]: 'setup.py\\nwin32_manual_post_install.py' | |
2998 |
|
2999 | |||
2999 | # which can be seen as a list: |
|
3000 | # which can be seen as a list: | |
3000 | In [3]: a.l |
|
3001 | In [3]: a.l | |
3001 | Out[3]: ['setup.py', 'win32_manual_post_install.py'] |
|
3002 | Out[3]: ['setup.py', 'win32_manual_post_install.py'] | |
3002 |
|
3003 | |||
3003 | # or as a whitespace-separated string: |
|
3004 | # or as a whitespace-separated string: | |
3004 | In [4]: a.s |
|
3005 | In [4]: a.s | |
3005 | Out[4]: 'setup.py win32_manual_post_install.py' |
|
3006 | Out[4]: 'setup.py win32_manual_post_install.py' | |
3006 |
|
3007 | |||
3007 | # a.s is useful to pass as a single command line: |
|
3008 | # a.s is useful to pass as a single command line: | |
3008 | In [5]: !wc -l $a.s |
|
3009 | In [5]: !wc -l $a.s | |
3009 | 146 setup.py |
|
3010 | 146 setup.py | |
3010 | 130 win32_manual_post_install.py |
|
3011 | 130 win32_manual_post_install.py | |
3011 | 276 total |
|
3012 | 276 total | |
3012 |
|
3013 | |||
3013 | # while the list form is useful to loop over: |
|
3014 | # while the list form is useful to loop over: | |
3014 | In [6]: for f in a.l: |
|
3015 | In [6]: for f in a.l: | |
3015 | ...: !wc -l $f |
|
3016 | ...: !wc -l $f | |
3016 | ...: |
|
3017 | ...: | |
3017 | 146 setup.py |
|
3018 | 146 setup.py | |
3018 | 130 win32_manual_post_install.py |
|
3019 | 130 win32_manual_post_install.py | |
3019 |
|
3020 | |||
3020 | Similiarly, the lists returned by the -l option are also special, in |
|
3021 | Similiarly, the lists returned by the -l option are also special, in | |
3021 | the sense that you can equally invoke the .s attribute on them to |
|
3022 | the sense that you can equally invoke the .s attribute on them to | |
3022 | automatically get a whitespace-separated string from their contents: |
|
3023 | automatically get a whitespace-separated string from their contents: | |
3023 |
|
3024 | |||
3024 | In [7]: sc -l b=ls *py |
|
3025 | In [7]: sc -l b=ls *py | |
3025 |
|
3026 | |||
3026 | In [8]: b |
|
3027 | In [8]: b | |
3027 | Out[8]: ['setup.py', 'win32_manual_post_install.py'] |
|
3028 | Out[8]: ['setup.py', 'win32_manual_post_install.py'] | |
3028 |
|
3029 | |||
3029 | In [9]: b.s |
|
3030 | In [9]: b.s | |
3030 | Out[9]: 'setup.py win32_manual_post_install.py' |
|
3031 | Out[9]: 'setup.py win32_manual_post_install.py' | |
3031 |
|
3032 | |||
3032 | In summary, both the lists and strings used for ouptut capture have |
|
3033 | In summary, both the lists and strings used for ouptut capture have | |
3033 | the following special attributes: |
|
3034 | the following special attributes: | |
3034 |
|
3035 | |||
3035 | .l (or .list) : value as list. |
|
3036 | .l (or .list) : value as list. | |
3036 | .n (or .nlstr): value as newline-separated string. |
|
3037 | .n (or .nlstr): value as newline-separated string. | |
3037 | .s (or .spstr): value as space-separated string. |
|
3038 | .s (or .spstr): value as space-separated string. | |
3038 | """ |
|
3039 | """ | |
3039 |
|
3040 | |||
3040 | opts,args = self.parse_options(parameter_s,'lv') |
|
3041 | opts,args = self.parse_options(parameter_s,'lv') | |
3041 | # Try to get a variable name and command to run |
|
3042 | # Try to get a variable name and command to run | |
3042 | try: |
|
3043 | try: | |
3043 | # the variable name must be obtained from the parse_options |
|
3044 | # the variable name must be obtained from the parse_options | |
3044 | # output, which uses shlex.split to strip options out. |
|
3045 | # output, which uses shlex.split to strip options out. | |
3045 | var,_ = args.split('=',1) |
|
3046 | var,_ = args.split('=',1) | |
3046 | var = var.strip() |
|
3047 | var = var.strip() | |
3047 | # But the the command has to be extracted from the original input |
|
3048 | # But the the command has to be extracted from the original input | |
3048 | # parameter_s, not on what parse_options returns, to avoid the |
|
3049 | # parameter_s, not on what parse_options returns, to avoid the | |
3049 | # quote stripping which shlex.split performs on it. |
|
3050 | # quote stripping which shlex.split performs on it. | |
3050 | _,cmd = parameter_s.split('=',1) |
|
3051 | _,cmd = parameter_s.split('=',1) | |
3051 | except ValueError: |
|
3052 | except ValueError: | |
3052 | var,cmd = '','' |
|
3053 | var,cmd = '','' | |
3053 | # If all looks ok, proceed |
|
3054 | # If all looks ok, proceed | |
3054 | out,err = self.shell.getoutputerror(cmd) |
|
3055 | out,err = self.shell.getoutputerror(cmd) | |
3055 | if err: |
|
3056 | if err: | |
3056 | print >> Term.cerr,err |
|
3057 | print >> Term.cerr,err | |
3057 | if opts.has_key('l'): |
|
3058 | if opts.has_key('l'): | |
3058 | out = SList(out.split('\n')) |
|
3059 | out = SList(out.split('\n')) | |
3059 | else: |
|
3060 | else: | |
3060 | out = LSString(out) |
|
3061 | out = LSString(out) | |
3061 | if opts.has_key('v'): |
|
3062 | if opts.has_key('v'): | |
3062 | print '%s ==\n%s' % (var,pformat(out)) |
|
3063 | print '%s ==\n%s' % (var,pformat(out)) | |
3063 | if var: |
|
3064 | if var: | |
3064 | self.shell.user_ns.update({var:out}) |
|
3065 | self.shell.user_ns.update({var:out}) | |
3065 | else: |
|
3066 | else: | |
3066 | return out |
|
3067 | return out | |
3067 |
|
3068 | |||
3068 | def magic_sx(self, parameter_s=''): |
|
3069 | def magic_sx(self, parameter_s=''): | |
3069 | """Shell execute - run a shell command and capture its output. |
|
3070 | """Shell execute - run a shell command and capture its output. | |
3070 |
|
3071 | |||
3071 | %sx command |
|
3072 | %sx command | |
3072 |
|
3073 | |||
3073 | IPython will run the given command using commands.getoutput(), and |
|
3074 | IPython will run the given command using commands.getoutput(), and | |
3074 | return the result formatted as a list (split on '\\n'). Since the |
|
3075 | return the result formatted as a list (split on '\\n'). Since the | |
3075 | output is _returned_, it will be stored in ipython's regular output |
|
3076 | output is _returned_, it will be stored in ipython's regular output | |
3076 | cache Out[N] and in the '_N' automatic variables. |
|
3077 | cache Out[N] and in the '_N' automatic variables. | |
3077 |
|
3078 | |||
3078 | Notes: |
|
3079 | Notes: | |
3079 |
|
3080 | |||
3080 | 1) If an input line begins with '!!', then %sx is automatically |
|
3081 | 1) If an input line begins with '!!', then %sx is automatically | |
3081 | invoked. That is, while: |
|
3082 | invoked. That is, while: | |
3082 | !ls |
|
3083 | !ls | |
3083 | causes ipython to simply issue system('ls'), typing |
|
3084 | causes ipython to simply issue system('ls'), typing | |
3084 | !!ls |
|
3085 | !!ls | |
3085 | is a shorthand equivalent to: |
|
3086 | is a shorthand equivalent to: | |
3086 | %sx ls |
|
3087 | %sx ls | |
3087 |
|
3088 | |||
3088 | 2) %sx differs from %sc in that %sx automatically splits into a list, |
|
3089 | 2) %sx differs from %sc in that %sx automatically splits into a list, | |
3089 | like '%sc -l'. The reason for this is to make it as easy as possible |
|
3090 | like '%sc -l'. The reason for this is to make it as easy as possible | |
3090 | to process line-oriented shell output via further python commands. |
|
3091 | to process line-oriented shell output via further python commands. | |
3091 | %sc is meant to provide much finer control, but requires more |
|
3092 | %sc is meant to provide much finer control, but requires more | |
3092 | typing. |
|
3093 | typing. | |
3093 |
|
3094 | |||
3094 | 3) Just like %sc -l, this is a list with special attributes: |
|
3095 | 3) Just like %sc -l, this is a list with special attributes: | |
3095 |
|
3096 | |||
3096 | .l (or .list) : value as list. |
|
3097 | .l (or .list) : value as list. | |
3097 | .n (or .nlstr): value as newline-separated string. |
|
3098 | .n (or .nlstr): value as newline-separated string. | |
3098 | .s (or .spstr): value as whitespace-separated string. |
|
3099 | .s (or .spstr): value as whitespace-separated string. | |
3099 |
|
3100 | |||
3100 | This is very useful when trying to use such lists as arguments to |
|
3101 | This is very useful when trying to use such lists as arguments to | |
3101 | system commands.""" |
|
3102 | system commands.""" | |
3102 |
|
3103 | |||
3103 | if parameter_s: |
|
3104 | if parameter_s: | |
3104 | out,err = self.shell.getoutputerror(parameter_s) |
|
3105 | out,err = self.shell.getoutputerror(parameter_s) | |
3105 | if err: |
|
3106 | if err: | |
3106 | print >> Term.cerr,err |
|
3107 | print >> Term.cerr,err | |
3107 | return SList(out.split('\n')) |
|
3108 | return SList(out.split('\n')) | |
3108 |
|
3109 | |||
3109 | def magic_bg(self, parameter_s=''): |
|
3110 | def magic_bg(self, parameter_s=''): | |
3110 | """Run a job in the background, in a separate thread. |
|
3111 | """Run a job in the background, in a separate thread. | |
3111 |
|
3112 | |||
3112 | For example, |
|
3113 | For example, | |
3113 |
|
3114 | |||
3114 | %bg myfunc(x,y,z=1) |
|
3115 | %bg myfunc(x,y,z=1) | |
3115 |
|
3116 | |||
3116 | will execute 'myfunc(x,y,z=1)' in a background thread. As soon as the |
|
3117 | will execute 'myfunc(x,y,z=1)' in a background thread. As soon as the | |
3117 | execution starts, a message will be printed indicating the job |
|
3118 | execution starts, a message will be printed indicating the job | |
3118 | number. If your job number is 5, you can use |
|
3119 | number. If your job number is 5, you can use | |
3119 |
|
3120 | |||
3120 | myvar = jobs.result(5) or myvar = jobs[5].result |
|
3121 | myvar = jobs.result(5) or myvar = jobs[5].result | |
3121 |
|
3122 | |||
3122 | to assign this result to variable 'myvar'. |
|
3123 | to assign this result to variable 'myvar'. | |
3123 |
|
3124 | |||
3124 | IPython has a job manager, accessible via the 'jobs' object. You can |
|
3125 | IPython has a job manager, accessible via the 'jobs' object. You can | |
3125 | type jobs? to get more information about it, and use jobs.<TAB> to see |
|
3126 | type jobs? to get more information about it, and use jobs.<TAB> to see | |
3126 | its attributes. All attributes not starting with an underscore are |
|
3127 | its attributes. All attributes not starting with an underscore are | |
3127 | meant for public use. |
|
3128 | meant for public use. | |
3128 |
|
3129 | |||
3129 | In particular, look at the jobs.new() method, which is used to create |
|
3130 | In particular, look at the jobs.new() method, which is used to create | |
3130 | new jobs. This magic %bg function is just a convenience wrapper |
|
3131 | new jobs. This magic %bg function is just a convenience wrapper | |
3131 | around jobs.new(), for expression-based jobs. If you want to create a |
|
3132 | around jobs.new(), for expression-based jobs. If you want to create a | |
3132 | new job with an explicit function object and arguments, you must call |
|
3133 | new job with an explicit function object and arguments, you must call | |
3133 | jobs.new() directly. |
|
3134 | jobs.new() directly. | |
3134 |
|
3135 | |||
3135 | The jobs.new docstring also describes in detail several important |
|
3136 | The jobs.new docstring also describes in detail several important | |
3136 | caveats associated with a thread-based model for background job |
|
3137 | caveats associated with a thread-based model for background job | |
3137 | execution. Type jobs.new? for details. |
|
3138 | execution. Type jobs.new? for details. | |
3138 |
|
3139 | |||
3139 | You can check the status of all jobs with jobs.status(). |
|
3140 | You can check the status of all jobs with jobs.status(). | |
3140 |
|
3141 | |||
3141 | The jobs variable is set by IPython into the Python builtin namespace. |
|
3142 | The jobs variable is set by IPython into the Python builtin namespace. | |
3142 | If you ever declare a variable named 'jobs', you will shadow this |
|
3143 | If you ever declare a variable named 'jobs', you will shadow this | |
3143 | name. You can either delete your global jobs variable to regain |
|
3144 | name. You can either delete your global jobs variable to regain | |
3144 | access to the job manager, or make a new name and assign it manually |
|
3145 | access to the job manager, or make a new name and assign it manually | |
3145 | to the manager (stored in IPython's namespace). For example, to |
|
3146 | to the manager (stored in IPython's namespace). For example, to | |
3146 | assign the job manager to the Jobs name, use: |
|
3147 | assign the job manager to the Jobs name, use: | |
3147 |
|
3148 | |||
3148 | Jobs = __builtins__.jobs""" |
|
3149 | Jobs = __builtins__.jobs""" | |
3149 |
|
3150 | |||
3150 | self.shell.jobs.new(parameter_s,self.shell.user_ns) |
|
3151 | self.shell.jobs.new(parameter_s,self.shell.user_ns) | |
3151 |
|
3152 | |||
3152 | def magic_r(self, parameter_s=''): |
|
3153 | def magic_r(self, parameter_s=''): | |
3153 | """Repeat previous input. |
|
3154 | """Repeat previous input. | |
3154 |
|
3155 | |||
3155 | Note: Consider using the more powerfull %rep instead! |
|
3156 | Note: Consider using the more powerfull %rep instead! | |
3156 |
|
3157 | |||
3157 | If given an argument, repeats the previous command which starts with |
|
3158 | If given an argument, repeats the previous command which starts with | |
3158 | the same string, otherwise it just repeats the previous input. |
|
3159 | the same string, otherwise it just repeats the previous input. | |
3159 |
|
3160 | |||
3160 | Shell escaped commands (with ! as first character) are not recognized |
|
3161 | Shell escaped commands (with ! as first character) are not recognized | |
3161 | by this system, only pure python code and magic commands. |
|
3162 | by this system, only pure python code and magic commands. | |
3162 | """ |
|
3163 | """ | |
3163 |
|
3164 | |||
3164 | start = parameter_s.strip() |
|
3165 | start = parameter_s.strip() | |
3165 | esc_magic = self.shell.ESC_MAGIC |
|
3166 | esc_magic = self.shell.ESC_MAGIC | |
3166 | # Identify magic commands even if automagic is on (which means |
|
3167 | # Identify magic commands even if automagic is on (which means | |
3167 | # the in-memory version is different from that typed by the user). |
|
3168 | # the in-memory version is different from that typed by the user). | |
3168 | if self.shell.rc.automagic: |
|
3169 | if self.shell.rc.automagic: | |
3169 | start_magic = esc_magic+start |
|
3170 | start_magic = esc_magic+start | |
3170 | else: |
|
3171 | else: | |
3171 | start_magic = start |
|
3172 | start_magic = start | |
3172 | # Look through the input history in reverse |
|
3173 | # Look through the input history in reverse | |
3173 | for n in range(len(self.shell.input_hist)-2,0,-1): |
|
3174 | for n in range(len(self.shell.input_hist)-2,0,-1): | |
3174 | input = self.shell.input_hist[n] |
|
3175 | input = self.shell.input_hist[n] | |
3175 | # skip plain 'r' lines so we don't recurse to infinity |
|
3176 | # skip plain 'r' lines so we don't recurse to infinity | |
3176 | if input != '_ip.magic("r")\n' and \ |
|
3177 | if input != '_ip.magic("r")\n' and \ | |
3177 | (input.startswith(start) or input.startswith(start_magic)): |
|
3178 | (input.startswith(start) or input.startswith(start_magic)): | |
3178 | #print 'match',`input` # dbg |
|
3179 | #print 'match',`input` # dbg | |
3179 | print 'Executing:',input, |
|
3180 | print 'Executing:',input, | |
3180 | self.shell.runlines(input) |
|
3181 | self.shell.runlines(input) | |
3181 | return |
|
3182 | return | |
3182 | print 'No previous input matching `%s` found.' % start |
|
3183 | print 'No previous input matching `%s` found.' % start | |
3183 |
|
3184 | |||
3184 |
|
3185 | |||
3185 | def magic_bookmark(self, parameter_s=''): |
|
3186 | def magic_bookmark(self, parameter_s=''): | |
3186 | """Manage IPython's bookmark system. |
|
3187 | """Manage IPython's bookmark system. | |
3187 |
|
3188 | |||
3188 | %bookmark <name> - set bookmark to current dir |
|
3189 | %bookmark <name> - set bookmark to current dir | |
3189 | %bookmark <name> <dir> - set bookmark to <dir> |
|
3190 | %bookmark <name> <dir> - set bookmark to <dir> | |
3190 | %bookmark -l - list all bookmarks |
|
3191 | %bookmark -l - list all bookmarks | |
3191 | %bookmark -d <name> - remove bookmark |
|
3192 | %bookmark -d <name> - remove bookmark | |
3192 | %bookmark -r - remove all bookmarks |
|
3193 | %bookmark -r - remove all bookmarks | |
3193 |
|
3194 | |||
3194 | You can later on access a bookmarked folder with: |
|
3195 | You can later on access a bookmarked folder with: | |
3195 | %cd -b <name> |
|
3196 | %cd -b <name> | |
3196 | or simply '%cd <name>' if there is no directory called <name> AND |
|
3197 | or simply '%cd <name>' if there is no directory called <name> AND | |
3197 | there is such a bookmark defined. |
|
3198 | there is such a bookmark defined. | |
3198 |
|
3199 | |||
3199 | Your bookmarks persist through IPython sessions, but they are |
|
3200 | Your bookmarks persist through IPython sessions, but they are | |
3200 | associated with each profile.""" |
|
3201 | associated with each profile.""" | |
3201 |
|
3202 | |||
3202 | opts,args = self.parse_options(parameter_s,'drl',mode='list') |
|
3203 | opts,args = self.parse_options(parameter_s,'drl',mode='list') | |
3203 | if len(args) > 2: |
|
3204 | if len(args) > 2: | |
3204 | raise UsageError("%bookmark: too many arguments") |
|
3205 | raise UsageError("%bookmark: too many arguments") | |
3205 |
|
3206 | |||
3206 | bkms = self.db.get('bookmarks',{}) |
|
3207 | bkms = self.db.get('bookmarks',{}) | |
3207 |
|
3208 | |||
3208 | if opts.has_key('d'): |
|
3209 | if opts.has_key('d'): | |
3209 | try: |
|
3210 | try: | |
3210 | todel = args[0] |
|
3211 | todel = args[0] | |
3211 | except IndexError: |
|
3212 | except IndexError: | |
3212 | raise UsageError( |
|
3213 | raise UsageError( | |
3213 | "%bookmark -d: must provide a bookmark to delete") |
|
3214 | "%bookmark -d: must provide a bookmark to delete") | |
3214 | else: |
|
3215 | else: | |
3215 | try: |
|
3216 | try: | |
3216 | del bkms[todel] |
|
3217 | del bkms[todel] | |
3217 | except KeyError: |
|
3218 | except KeyError: | |
3218 | raise UsageError( |
|
3219 | raise UsageError( | |
3219 | "%%bookmark -d: Can't delete bookmark '%s'" % todel) |
|
3220 | "%%bookmark -d: Can't delete bookmark '%s'" % todel) | |
3220 |
|
3221 | |||
3221 | elif opts.has_key('r'): |
|
3222 | elif opts.has_key('r'): | |
3222 | bkms = {} |
|
3223 | bkms = {} | |
3223 | elif opts.has_key('l'): |
|
3224 | elif opts.has_key('l'): | |
3224 | bks = bkms.keys() |
|
3225 | bks = bkms.keys() | |
3225 | bks.sort() |
|
3226 | bks.sort() | |
3226 | if bks: |
|
3227 | if bks: | |
3227 | size = max(map(len,bks)) |
|
3228 | size = max(map(len,bks)) | |
3228 | else: |
|
3229 | else: | |
3229 | size = 0 |
|
3230 | size = 0 | |
3230 | fmt = '%-'+str(size)+'s -> %s' |
|
3231 | fmt = '%-'+str(size)+'s -> %s' | |
3231 | print 'Current bookmarks:' |
|
3232 | print 'Current bookmarks:' | |
3232 | for bk in bks: |
|
3233 | for bk in bks: | |
3233 | print fmt % (bk,bkms[bk]) |
|
3234 | print fmt % (bk,bkms[bk]) | |
3234 | else: |
|
3235 | else: | |
3235 | if not args: |
|
3236 | if not args: | |
3236 | raise UsageError("%bookmark: You must specify the bookmark name") |
|
3237 | raise UsageError("%bookmark: You must specify the bookmark name") | |
3237 | elif len(args)==1: |
|
3238 | elif len(args)==1: | |
3238 | bkms[args[0]] = os.getcwd() |
|
3239 | bkms[args[0]] = os.getcwd() | |
3239 | elif len(args)==2: |
|
3240 | elif len(args)==2: | |
3240 | bkms[args[0]] = args[1] |
|
3241 | bkms[args[0]] = args[1] | |
3241 | self.db['bookmarks'] = bkms |
|
3242 | self.db['bookmarks'] = bkms | |
3242 |
|
3243 | |||
3243 | def magic_pycat(self, parameter_s=''): |
|
3244 | def magic_pycat(self, parameter_s=''): | |
3244 | """Show a syntax-highlighted file through a pager. |
|
3245 | """Show a syntax-highlighted file through a pager. | |
3245 |
|
3246 | |||
3246 | This magic is similar to the cat utility, but it will assume the file |
|
3247 | This magic is similar to the cat utility, but it will assume the file | |
3247 | to be Python source and will show it with syntax highlighting. """ |
|
3248 | to be Python source and will show it with syntax highlighting. """ | |
3248 |
|
3249 | |||
3249 | try: |
|
3250 | try: | |
3250 | filename = get_py_filename(parameter_s) |
|
3251 | filename = get_py_filename(parameter_s) | |
3251 | cont = file_read(filename) |
|
3252 | cont = file_read(filename) | |
3252 | except IOError: |
|
3253 | except IOError: | |
3253 | try: |
|
3254 | try: | |
3254 | cont = eval(parameter_s,self.user_ns) |
|
3255 | cont = eval(parameter_s,self.user_ns) | |
3255 | except NameError: |
|
3256 | except NameError: | |
3256 | cont = None |
|
3257 | cont = None | |
3257 | if cont is None: |
|
3258 | if cont is None: | |
3258 | print "Error: no such file or variable" |
|
3259 | print "Error: no such file or variable" | |
3259 | return |
|
3260 | return | |
3260 |
|
3261 | |||
3261 | page(self.shell.pycolorize(cont), |
|
3262 | page(self.shell.pycolorize(cont), | |
3262 | screen_lines=self.shell.rc.screen_length) |
|
3263 | screen_lines=self.shell.rc.screen_length) | |
3263 |
|
3264 | |||
3264 | def magic_cpaste(self, parameter_s=''): |
|
3265 | def magic_cpaste(self, parameter_s=''): | |
3265 | """Allows you to paste & execute a pre-formatted code block from clipboard. |
|
3266 | """Allows you to paste & execute a pre-formatted code block from clipboard. | |
3266 |
|
3267 | |||
3267 | You must terminate the block with '--' (two minus-signs) alone on the |
|
3268 | You must terminate the block with '--' (two minus-signs) alone on the | |
3268 | line. You can also provide your own sentinel with '%paste -s %%' ('%%' |
|
3269 | line. You can also provide your own sentinel with '%paste -s %%' ('%%' | |
3269 | is the new sentinel for this operation) |
|
3270 | is the new sentinel for this operation) | |
3270 |
|
3271 | |||
3271 | The block is dedented prior to execution to enable execution of method |
|
3272 | The block is dedented prior to execution to enable execution of method | |
3272 | definitions. '>' and '+' characters at the beginning of a line are |
|
3273 | definitions. '>' and '+' characters at the beginning of a line are | |
3273 | ignored, to allow pasting directly from e-mails, diff files and |
|
3274 | ignored, to allow pasting directly from e-mails, diff files and | |
3274 | doctests (the '...' continuation prompt is also stripped). The |
|
3275 | doctests (the '...' continuation prompt is also stripped). The | |
3275 | executed block is also assigned to variable named 'pasted_block' for |
|
3276 | executed block is also assigned to variable named 'pasted_block' for | |
3276 | later editing with '%edit pasted_block'. |
|
3277 | later editing with '%edit pasted_block'. | |
3277 |
|
3278 | |||
3278 | You can also pass a variable name as an argument, e.g. '%cpaste foo'. |
|
3279 | You can also pass a variable name as an argument, e.g. '%cpaste foo'. | |
3279 | This assigns the pasted block to variable 'foo' as string, without |
|
3280 | This assigns the pasted block to variable 'foo' as string, without | |
3280 | dedenting or executing it (preceding >>> and + is still stripped) |
|
3281 | dedenting or executing it (preceding >>> and + is still stripped) | |
3281 |
|
3282 | |||
3282 | '%cpaste -r' re-executes the block previously entered by cpaste. |
|
3283 | '%cpaste -r' re-executes the block previously entered by cpaste. | |
3283 |
|
3284 | |||
3284 | Do not be alarmed by garbled output on Windows (it's a readline bug). |
|
3285 | Do not be alarmed by garbled output on Windows (it's a readline bug). | |
3285 | Just press enter and type -- (and press enter again) and the block |
|
3286 | Just press enter and type -- (and press enter again) and the block | |
3286 | will be what was just pasted. |
|
3287 | will be what was just pasted. | |
3287 |
|
3288 | |||
3288 | IPython statements (magics, shell escapes) are not supported (yet). |
|
3289 | IPython statements (magics, shell escapes) are not supported (yet). | |
3289 | """ |
|
3290 | """ | |
3290 | opts,args = self.parse_options(parameter_s,'rs:',mode='string') |
|
3291 | opts,args = self.parse_options(parameter_s,'rs:',mode='string') | |
3291 | par = args.strip() |
|
3292 | par = args.strip() | |
3292 | if opts.has_key('r'): |
|
3293 | if opts.has_key('r'): | |
3293 | b = self.user_ns.get('pasted_block', None) |
|
3294 | b = self.user_ns.get('pasted_block', None) | |
3294 | if b is None: |
|
3295 | if b is None: | |
3295 | raise UsageError('No previous pasted block available') |
|
3296 | raise UsageError('No previous pasted block available') | |
3296 | print "Re-executing '%s...' (%d chars)"% (b.split('\n',1)[0], len(b)) |
|
3297 | print "Re-executing '%s...' (%d chars)"% (b.split('\n',1)[0], len(b)) | |
3297 | exec b in self.user_ns |
|
3298 | exec b in self.user_ns | |
3298 | return |
|
3299 | return | |
3299 |
|
3300 | |||
3300 | sentinel = opts.get('s','--') |
|
3301 | sentinel = opts.get('s','--') | |
3301 |
|
3302 | |||
3302 | # Regular expressions that declare text we strip from the input: |
|
3303 | # Regular expressions that declare text we strip from the input: | |
3303 | strip_re = [r'^\s*In \[\d+\]:', # IPython input prompt |
|
3304 | strip_re = [r'^\s*In \[\d+\]:', # IPython input prompt | |
3304 | r'^\s*(\s?>)+', # Python input prompt |
|
3305 | r'^\s*(\s?>)+', # Python input prompt | |
3305 | r'^\s*\.{3,}', # Continuation prompts |
|
3306 | r'^\s*\.{3,}', # Continuation prompts | |
3306 | r'^\++', |
|
3307 | r'^\++', | |
3307 | ] |
|
3308 | ] | |
3308 |
|
3309 | |||
3309 | strip_from_start = map(re.compile,strip_re) |
|
3310 | strip_from_start = map(re.compile,strip_re) | |
3310 |
|
3311 | |||
3311 | from IPython import iplib |
|
3312 | from IPython import iplib | |
3312 | lines = [] |
|
3313 | lines = [] | |
3313 | print "Pasting code; enter '%s' alone on the line to stop." % sentinel |
|
3314 | print "Pasting code; enter '%s' alone on the line to stop." % sentinel | |
3314 | while 1: |
|
3315 | while 1: | |
3315 | l = iplib.raw_input_original(':') |
|
3316 | l = iplib.raw_input_original(':') | |
3316 | if l ==sentinel: |
|
3317 | if l ==sentinel: | |
3317 | break |
|
3318 | break | |
3318 |
|
3319 | |||
3319 | for pat in strip_from_start: |
|
3320 | for pat in strip_from_start: | |
3320 | l = pat.sub('',l) |
|
3321 | l = pat.sub('',l) | |
3321 | lines.append(l) |
|
3322 | lines.append(l) | |
3322 |
|
3323 | |||
3323 | block = "\n".join(lines) + '\n' |
|
3324 | block = "\n".join(lines) + '\n' | |
3324 | #print "block:\n",block |
|
3325 | #print "block:\n",block | |
3325 | if not par: |
|
3326 | if not par: | |
3326 | b = textwrap.dedent(block) |
|
3327 | b = textwrap.dedent(block) | |
3327 | self.user_ns['pasted_block'] = b |
|
3328 | self.user_ns['pasted_block'] = b | |
3328 | exec b in self.user_ns |
|
3329 | exec b in self.user_ns | |
3329 | else: |
|
3330 | else: | |
3330 | self.user_ns[par] = SList(block.splitlines()) |
|
3331 | self.user_ns[par] = SList(block.splitlines()) | |
3331 | print "Block assigned to '%s'" % par |
|
3332 | print "Block assigned to '%s'" % par | |
3332 |
|
3333 | |||
3333 | def magic_quickref(self,arg): |
|
3334 | def magic_quickref(self,arg): | |
3334 | """ Show a quick reference sheet """ |
|
3335 | """ Show a quick reference sheet """ | |
3335 | import IPython.usage |
|
3336 | import IPython.usage | |
3336 | qr = IPython.usage.quick_reference + self.magic_magic('-brief') |
|
3337 | qr = IPython.usage.quick_reference + self.magic_magic('-brief') | |
3337 |
|
3338 | |||
3338 | page(qr) |
|
3339 | page(qr) | |
3339 |
|
3340 | |||
3340 | def magic_upgrade(self,arg): |
|
3341 | def magic_upgrade(self,arg): | |
3341 | """ Upgrade your IPython installation |
|
3342 | """ Upgrade your IPython installation | |
3342 |
|
3343 | |||
3343 | This will copy the config files that don't yet exist in your |
|
3344 | This will copy the config files that don't yet exist in your | |
3344 | ipython dir from the system config dir. Use this after upgrading |
|
3345 | ipython dir from the system config dir. Use this after upgrading | |
3345 | IPython if you don't wish to delete your .ipython dir. |
|
3346 | IPython if you don't wish to delete your .ipython dir. | |
3346 |
|
3347 | |||
3347 | Call with -nolegacy to get rid of ipythonrc* files (recommended for |
|
3348 | Call with -nolegacy to get rid of ipythonrc* files (recommended for | |
3348 | new users) |
|
3349 | new users) | |
3349 |
|
3350 | |||
3350 | """ |
|
3351 | """ | |
3351 | ip = self.getapi() |
|
3352 | ip = self.getapi() | |
3352 | ipinstallation = path(IPython.__file__).dirname() |
|
3353 | ipinstallation = path(IPython.__file__).dirname() | |
3353 | upgrade_script = '%s "%s"' % (sys.executable,ipinstallation / 'upgrade_dir.py') |
|
3354 | upgrade_script = '%s "%s"' % (sys.executable,ipinstallation / 'upgrade_dir.py') | |
3354 | src_config = ipinstallation / 'UserConfig' |
|
3355 | src_config = ipinstallation / 'UserConfig' | |
3355 | userdir = path(ip.options.ipythondir) |
|
3356 | userdir = path(ip.options.ipythondir) | |
3356 | cmd = '%s "%s" "%s"' % (upgrade_script, src_config, userdir) |
|
3357 | cmd = '%s "%s" "%s"' % (upgrade_script, src_config, userdir) | |
3357 | print ">",cmd |
|
3358 | print ">",cmd | |
3358 | shell(cmd) |
|
3359 | shell(cmd) | |
3359 | if arg == '-nolegacy': |
|
3360 | if arg == '-nolegacy': | |
3360 | legacy = userdir.files('ipythonrc*') |
|
3361 | legacy = userdir.files('ipythonrc*') | |
3361 | print "Nuking legacy files:",legacy |
|
3362 | print "Nuking legacy files:",legacy | |
3362 |
|
3363 | |||
3363 | [p.remove() for p in legacy] |
|
3364 | [p.remove() for p in legacy] | |
3364 | suffix = (sys.platform == 'win32' and '.ini' or '') |
|
3365 | suffix = (sys.platform == 'win32' and '.ini' or '') | |
3365 | (userdir / ('ipythonrc' + suffix)).write_text('# Empty, see ipy_user_conf.py\n') |
|
3366 | (userdir / ('ipythonrc' + suffix)).write_text('# Empty, see ipy_user_conf.py\n') | |
3366 |
|
3367 | |||
3367 |
|
3368 | |||
3368 | def magic_doctest_mode(self,parameter_s=''): |
|
3369 | def magic_doctest_mode(self,parameter_s=''): | |
3369 | """Toggle doctest mode on and off. |
|
3370 | """Toggle doctest mode on and off. | |
3370 |
|
3371 | |||
3371 | This mode allows you to toggle the prompt behavior between normal |
|
3372 | This mode allows you to toggle the prompt behavior between normal | |
3372 | IPython prompts and ones that are as similar to the default IPython |
|
3373 | IPython prompts and ones that are as similar to the default IPython | |
3373 | interpreter as possible. |
|
3374 | interpreter as possible. | |
3374 |
|
3375 | |||
3375 | It also supports the pasting of code snippets that have leading '>>>' |
|
3376 | It also supports the pasting of code snippets that have leading '>>>' | |
3376 | and '...' prompts in them. This means that you can paste doctests from |
|
3377 | and '...' prompts in them. This means that you can paste doctests from | |
3377 | files or docstrings (even if they have leading whitespace), and the |
|
3378 | files or docstrings (even if they have leading whitespace), and the | |
3378 | code will execute correctly. You can then use '%history -tn' to see |
|
3379 | code will execute correctly. You can then use '%history -tn' to see | |
3379 | the translated history without line numbers; this will give you the |
|
3380 | the translated history without line numbers; this will give you the | |
3380 | input after removal of all the leading prompts and whitespace, which |
|
3381 | input after removal of all the leading prompts and whitespace, which | |
3381 | can be pasted back into an editor. |
|
3382 | can be pasted back into an editor. | |
3382 |
|
3383 | |||
3383 | With these features, you can switch into this mode easily whenever you |
|
3384 | With these features, you can switch into this mode easily whenever you | |
3384 | need to do testing and changes to doctests, without having to leave |
|
3385 | need to do testing and changes to doctests, without having to leave | |
3385 | your existing IPython session. |
|
3386 | your existing IPython session. | |
3386 | """ |
|
3387 | """ | |
3387 |
|
3388 | |||
3388 | # XXX - Fix this to have cleaner activate/deactivate calls. |
|
3389 | # XXX - Fix this to have cleaner activate/deactivate calls. | |
3389 | from IPython.Extensions import InterpreterPasteInput as ipaste |
|
3390 | from IPython.Extensions import InterpreterPasteInput as ipaste | |
3390 | from IPython.ipstruct import Struct |
|
3391 | from IPython.ipstruct import Struct | |
3391 |
|
3392 | |||
3392 | # Shorthands |
|
3393 | # Shorthands | |
3393 | shell = self.shell |
|
3394 | shell = self.shell | |
3394 | oc = shell.outputcache |
|
3395 | oc = shell.outputcache | |
3395 | rc = shell.rc |
|
3396 | rc = shell.rc | |
3396 | meta = shell.meta |
|
3397 | meta = shell.meta | |
3397 | # dstore is a data store kept in the instance metadata bag to track any |
|
3398 | # dstore is a data store kept in the instance metadata bag to track any | |
3398 | # changes we make, so we can undo them later. |
|
3399 | # changes we make, so we can undo them later. | |
3399 | dstore = meta.setdefault('doctest_mode',Struct()) |
|
3400 | dstore = meta.setdefault('doctest_mode',Struct()) | |
3400 | save_dstore = dstore.setdefault |
|
3401 | save_dstore = dstore.setdefault | |
3401 |
|
3402 | |||
3402 | # save a few values we'll need to recover later |
|
3403 | # save a few values we'll need to recover later | |
3403 | mode = save_dstore('mode',False) |
|
3404 | mode = save_dstore('mode',False) | |
3404 | save_dstore('rc_pprint',rc.pprint) |
|
3405 | save_dstore('rc_pprint',rc.pprint) | |
3405 | save_dstore('xmode',shell.InteractiveTB.mode) |
|
3406 | save_dstore('xmode',shell.InteractiveTB.mode) | |
3406 | save_dstore('rc_separate_out',rc.separate_out) |
|
3407 | save_dstore('rc_separate_out',rc.separate_out) | |
3407 | save_dstore('rc_separate_out2',rc.separate_out2) |
|
3408 | save_dstore('rc_separate_out2',rc.separate_out2) | |
3408 | save_dstore('rc_prompts_pad_left',rc.prompts_pad_left) |
|
3409 | save_dstore('rc_prompts_pad_left',rc.prompts_pad_left) | |
3409 | save_dstore('rc_separate_in',rc.separate_in) |
|
3410 | save_dstore('rc_separate_in',rc.separate_in) | |
3410 |
|
3411 | |||
3411 | if mode == False: |
|
3412 | if mode == False: | |
3412 | # turn on |
|
3413 | # turn on | |
3413 | ipaste.activate_prefilter() |
|
3414 | ipaste.activate_prefilter() | |
3414 |
|
3415 | |||
3415 | oc.prompt1.p_template = '>>> ' |
|
3416 | oc.prompt1.p_template = '>>> ' | |
3416 | oc.prompt2.p_template = '... ' |
|
3417 | oc.prompt2.p_template = '... ' | |
3417 | oc.prompt_out.p_template = '' |
|
3418 | oc.prompt_out.p_template = '' | |
3418 |
|
3419 | |||
3419 | # Prompt separators like plain python |
|
3420 | # Prompt separators like plain python | |
3420 | oc.input_sep = oc.prompt1.sep = '' |
|
3421 | oc.input_sep = oc.prompt1.sep = '' | |
3421 | oc.output_sep = '' |
|
3422 | oc.output_sep = '' | |
3422 | oc.output_sep2 = '' |
|
3423 | oc.output_sep2 = '' | |
3423 |
|
3424 | |||
3424 | oc.prompt1.pad_left = oc.prompt2.pad_left = \ |
|
3425 | oc.prompt1.pad_left = oc.prompt2.pad_left = \ | |
3425 | oc.prompt_out.pad_left = False |
|
3426 | oc.prompt_out.pad_left = False | |
3426 |
|
3427 | |||
3427 | rc.pprint = False |
|
3428 | rc.pprint = False | |
3428 |
|
3429 | |||
3429 | shell.magic_xmode('Plain') |
|
3430 | shell.magic_xmode('Plain') | |
3430 |
|
3431 | |||
3431 | else: |
|
3432 | else: | |
3432 | # turn off |
|
3433 | # turn off | |
3433 | ipaste.deactivate_prefilter() |
|
3434 | ipaste.deactivate_prefilter() | |
3434 |
|
3435 | |||
3435 | oc.prompt1.p_template = rc.prompt_in1 |
|
3436 | oc.prompt1.p_template = rc.prompt_in1 | |
3436 | oc.prompt2.p_template = rc.prompt_in2 |
|
3437 | oc.prompt2.p_template = rc.prompt_in2 | |
3437 | oc.prompt_out.p_template = rc.prompt_out |
|
3438 | oc.prompt_out.p_template = rc.prompt_out | |
3438 |
|
3439 | |||
3439 | oc.input_sep = oc.prompt1.sep = dstore.rc_separate_in |
|
3440 | oc.input_sep = oc.prompt1.sep = dstore.rc_separate_in | |
3440 |
|
3441 | |||
3441 | oc.output_sep = dstore.rc_separate_out |
|
3442 | oc.output_sep = dstore.rc_separate_out | |
3442 | oc.output_sep2 = dstore.rc_separate_out2 |
|
3443 | oc.output_sep2 = dstore.rc_separate_out2 | |
3443 |
|
3444 | |||
3444 | oc.prompt1.pad_left = oc.prompt2.pad_left = \ |
|
3445 | oc.prompt1.pad_left = oc.prompt2.pad_left = \ | |
3445 | oc.prompt_out.pad_left = dstore.rc_prompts_pad_left |
|
3446 | oc.prompt_out.pad_left = dstore.rc_prompts_pad_left | |
3446 |
|
3447 | |||
3447 | rc.pprint = dstore.rc_pprint |
|
3448 | rc.pprint = dstore.rc_pprint | |
3448 |
|
3449 | |||
3449 | shell.magic_xmode(dstore.xmode) |
|
3450 | shell.magic_xmode(dstore.xmode) | |
3450 |
|
3451 | |||
3451 | # Store new mode and inform |
|
3452 | # Store new mode and inform | |
3452 | dstore.mode = bool(1-int(mode)) |
|
3453 | dstore.mode = bool(1-int(mode)) | |
3453 | print 'Doctest mode is:', |
|
3454 | print 'Doctest mode is:', | |
3454 | print ['OFF','ON'][dstore.mode] |
|
3455 | print ['OFF','ON'][dstore.mode] | |
3455 |
|
3456 | |||
3456 | # end Magic |
|
3457 | # end Magic |
@@ -1,523 +1,523 | |||||
1 | # -*- coding: utf-8 -*- |
|
1 | # -*- coding: utf-8 -*- | |
2 | """ |
|
2 | """ | |
3 | Pdb debugger class. |
|
3 | Pdb debugger class. | |
4 |
|
4 | |||
5 | Modified from the standard pdb.Pdb class to avoid including readline, so that |
|
5 | Modified from the standard pdb.Pdb class to avoid including readline, so that | |
6 | the command line completion of other programs which include this isn't |
|
6 | the command line completion of other programs which include this isn't | |
7 | damaged. |
|
7 | damaged. | |
8 |
|
8 | |||
9 | In the future, this class will be expanded with improvements over the standard |
|
9 | In the future, this class will be expanded with improvements over the standard | |
10 | pdb. |
|
10 | pdb. | |
11 |
|
11 | |||
12 | The code in this file is mainly lifted out of cmd.py in Python 2.2, with minor |
|
12 | The code in this file is mainly lifted out of cmd.py in Python 2.2, with minor | |
13 | changes. Licensing should therefore be under the standard Python terms. For |
|
13 | changes. Licensing should therefore be under the standard Python terms. For | |
14 | details on the PSF (Python Software Foundation) standard license, see: |
|
14 | details on the PSF (Python Software Foundation) standard license, see: | |
15 |
|
15 | |||
16 | http://www.python.org/2.2.3/license.html""" |
|
16 | http://www.python.org/2.2.3/license.html""" | |
17 |
|
17 | |||
18 | #***************************************************************************** |
|
18 | #***************************************************************************** | |
19 | # |
|
19 | # | |
20 | # This file is licensed under the PSF license. |
|
20 | # This file is licensed under the PSF license. | |
21 | # |
|
21 | # | |
22 | # Copyright (C) 2001 Python Software Foundation, www.python.org |
|
22 | # Copyright (C) 2001 Python Software Foundation, www.python.org | |
23 | # Copyright (C) 2005-2006 Fernando Perez. <fperez@colorado.edu> |
|
23 | # Copyright (C) 2005-2006 Fernando Perez. <fperez@colorado.edu> | |
24 | # |
|
24 | # | |
25 | # |
|
25 | # | |
26 | #***************************************************************************** |
|
26 | #***************************************************************************** | |
27 |
|
27 | |||
28 | import bdb |
|
28 | import bdb | |
29 | import cmd |
|
29 | import cmd | |
30 | import linecache |
|
30 | import linecache | |
31 | import os |
|
31 | import os | |
32 | import sys |
|
32 | import sys | |
33 |
|
33 | |||
34 | from IPython import PyColorize, ipapi |
|
34 | from IPython import PyColorize, ipapi | |
35 | from IPython.utils import coloransi |
|
35 | from IPython.utils import coloransi | |
36 | from IPython.genutils import Term |
|
36 | from IPython.genutils import Term | |
37 | from IPython.excolors import exception_colors |
|
37 | from IPython.excolors import exception_colors | |
38 |
|
38 | |||
39 | # See if we can use pydb. |
|
39 | # See if we can use pydb. | |
40 | has_pydb = False |
|
40 | has_pydb = False | |
41 | prompt = 'ipdb> ' |
|
41 | prompt = 'ipdb> ' | |
42 | #We have to check this directly from sys.argv, config struct not yet available |
|
42 | #We have to check this directly from sys.argv, config struct not yet available | |
43 | if '-pydb' in sys.argv: |
|
43 | if '-pydb' in sys.argv: | |
44 | try: |
|
44 | try: | |
45 | import pydb |
|
45 | import pydb | |
46 | if hasattr(pydb.pydb, "runl") and pydb.version>'1.17': |
|
46 | if hasattr(pydb.pydb, "runl") and pydb.version>'1.17': | |
47 | # Version 1.17 is broken, and that's what ships with Ubuntu Edgy, so we |
|
47 | # Version 1.17 is broken, and that's what ships with Ubuntu Edgy, so we | |
48 | # better protect against it. |
|
48 | # better protect against it. | |
49 | has_pydb = True |
|
49 | has_pydb = True | |
50 | except ImportError: |
|
50 | except ImportError: | |
51 | print "Pydb (http://bashdb.sourceforge.net/pydb/) does not seem to be available" |
|
51 | print "Pydb (http://bashdb.sourceforge.net/pydb/) does not seem to be available" | |
52 |
|
52 | |||
53 | if has_pydb: |
|
53 | if has_pydb: | |
54 | from pydb import Pdb as OldPdb |
|
54 | from pydb import Pdb as OldPdb | |
55 | #print "Using pydb for %run -d and post-mortem" #dbg |
|
55 | #print "Using pydb for %run -d and post-mortem" #dbg | |
56 | prompt = 'ipydb> ' |
|
56 | prompt = 'ipydb> ' | |
57 | else: |
|
57 | else: | |
58 | from pdb import Pdb as OldPdb |
|
58 | from pdb import Pdb as OldPdb | |
59 |
|
59 | |||
60 | # Allow the set_trace code to operate outside of an ipython instance, even if |
|
60 | # Allow the set_trace code to operate outside of an ipython instance, even if | |
61 | # it does so with some limitations. The rest of this support is implemented in |
|
61 | # it does so with some limitations. The rest of this support is implemented in | |
62 | # the Tracer constructor. |
|
62 | # the Tracer constructor. | |
63 | def BdbQuit_excepthook(et,ev,tb): |
|
63 | def BdbQuit_excepthook(et,ev,tb): | |
64 | if et==bdb.BdbQuit: |
|
64 | if et==bdb.BdbQuit: | |
65 | print 'Exiting Debugger.' |
|
65 | print 'Exiting Debugger.' | |
66 | else: |
|
66 | else: | |
67 | BdbQuit_excepthook.excepthook_ori(et,ev,tb) |
|
67 | BdbQuit_excepthook.excepthook_ori(et,ev,tb) | |
68 |
|
68 | |||
69 | def BdbQuit_IPython_excepthook(self,et,ev,tb): |
|
69 | def BdbQuit_IPython_excepthook(self,et,ev,tb): | |
70 | print 'Exiting Debugger.' |
|
70 | print 'Exiting Debugger.' | |
71 |
|
71 | |||
72 | class Tracer(object): |
|
72 | class Tracer(object): | |
73 | """Class for local debugging, similar to pdb.set_trace. |
|
73 | """Class for local debugging, similar to pdb.set_trace. | |
74 |
|
74 | |||
75 | Instances of this class, when called, behave like pdb.set_trace, but |
|
75 | Instances of this class, when called, behave like pdb.set_trace, but | |
76 | providing IPython's enhanced capabilities. |
|
76 | providing IPython's enhanced capabilities. | |
77 |
|
77 | |||
78 | This is implemented as a class which must be initialized in your own code |
|
78 | This is implemented as a class which must be initialized in your own code | |
79 | and not as a standalone function because we need to detect at runtime |
|
79 | and not as a standalone function because we need to detect at runtime | |
80 | whether IPython is already active or not. That detection is done in the |
|
80 | whether IPython is already active or not. That detection is done in the | |
81 | constructor, ensuring that this code plays nicely with a running IPython, |
|
81 | constructor, ensuring that this code plays nicely with a running IPython, | |
82 | while functioning acceptably (though with limitations) if outside of it. |
|
82 | while functioning acceptably (though with limitations) if outside of it. | |
83 | """ |
|
83 | """ | |
84 |
|
84 | |||
85 | def __init__(self,colors=None): |
|
85 | def __init__(self,colors=None): | |
86 | """Create a local debugger instance. |
|
86 | """Create a local debugger instance. | |
87 |
|
87 | |||
88 | :Parameters: |
|
88 | :Parameters: | |
89 |
|
89 | |||
90 | - `colors` (None): a string containing the name of the color scheme to |
|
90 | - `colors` (None): a string containing the name of the color scheme to | |
91 | use, it must be one of IPython's valid color schemes. If not given, the |
|
91 | use, it must be one of IPython's valid color schemes. If not given, the | |
92 | function will default to the current IPython scheme when running inside |
|
92 | function will default to the current IPython scheme when running inside | |
93 | IPython, and to 'NoColor' otherwise. |
|
93 | IPython, and to 'NoColor' otherwise. | |
94 |
|
94 | |||
95 | Usage example: |
|
95 | Usage example: | |
96 |
|
96 | |||
97 |
from IPython. |
|
97 | from IPython.core.debugger import Tracer; debug_here = Tracer() | |
98 |
|
98 | |||
99 | ... later in your code |
|
99 | ... later in your code | |
100 | debug_here() # -> will open up the debugger at that point. |
|
100 | debug_here() # -> will open up the debugger at that point. | |
101 |
|
101 | |||
102 | Once the debugger activates, you can use all of its regular commands to |
|
102 | Once the debugger activates, you can use all of its regular commands to | |
103 | step through code, set breakpoints, etc. See the pdb documentation |
|
103 | step through code, set breakpoints, etc. See the pdb documentation | |
104 | from the Python standard library for usage details. |
|
104 | from the Python standard library for usage details. | |
105 | """ |
|
105 | """ | |
106 |
|
106 | |||
107 | global __IPYTHON__ |
|
107 | global __IPYTHON__ | |
108 | try: |
|
108 | try: | |
109 | __IPYTHON__ |
|
109 | __IPYTHON__ | |
110 | except NameError: |
|
110 | except NameError: | |
111 | # Outside of ipython, we set our own exception hook manually |
|
111 | # Outside of ipython, we set our own exception hook manually | |
112 | __IPYTHON__ = ipapi.get(True,False) |
|
112 | __IPYTHON__ = ipapi.get(True,False) | |
113 | BdbQuit_excepthook.excepthook_ori = sys.excepthook |
|
113 | BdbQuit_excepthook.excepthook_ori = sys.excepthook | |
114 | sys.excepthook = BdbQuit_excepthook |
|
114 | sys.excepthook = BdbQuit_excepthook | |
115 | def_colors = 'NoColor' |
|
115 | def_colors = 'NoColor' | |
116 | try: |
|
116 | try: | |
117 | # Limited tab completion support |
|
117 | # Limited tab completion support | |
118 | import readline |
|
118 | import readline | |
119 | readline.parse_and_bind('tab: complete') |
|
119 | readline.parse_and_bind('tab: complete') | |
120 | except ImportError: |
|
120 | except ImportError: | |
121 | pass |
|
121 | pass | |
122 | else: |
|
122 | else: | |
123 | # In ipython, we use its custom exception handler mechanism |
|
123 | # In ipython, we use its custom exception handler mechanism | |
124 | ip = ipapi.get() |
|
124 | ip = ipapi.get() | |
125 | def_colors = ip.options.colors |
|
125 | def_colors = ip.options.colors | |
126 | ip.set_custom_exc((bdb.BdbQuit,),BdbQuit_IPython_excepthook) |
|
126 | ip.set_custom_exc((bdb.BdbQuit,),BdbQuit_IPython_excepthook) | |
127 |
|
127 | |||
128 | if colors is None: |
|
128 | if colors is None: | |
129 | colors = def_colors |
|
129 | colors = def_colors | |
130 | self.debugger = Pdb(colors) |
|
130 | self.debugger = Pdb(colors) | |
131 |
|
131 | |||
132 | def __call__(self): |
|
132 | def __call__(self): | |
133 | """Starts an interactive debugger at the point where called. |
|
133 | """Starts an interactive debugger at the point where called. | |
134 |
|
134 | |||
135 | This is similar to the pdb.set_trace() function from the std lib, but |
|
135 | This is similar to the pdb.set_trace() function from the std lib, but | |
136 | using IPython's enhanced debugger.""" |
|
136 | using IPython's enhanced debugger.""" | |
137 |
|
137 | |||
138 | self.debugger.set_trace(sys._getframe().f_back) |
|
138 | self.debugger.set_trace(sys._getframe().f_back) | |
139 |
|
139 | |||
140 | def decorate_fn_with_doc(new_fn, old_fn, additional_text=""): |
|
140 | def decorate_fn_with_doc(new_fn, old_fn, additional_text=""): | |
141 | """Make new_fn have old_fn's doc string. This is particularly useful |
|
141 | """Make new_fn have old_fn's doc string. This is particularly useful | |
142 | for the do_... commands that hook into the help system. |
|
142 | for the do_... commands that hook into the help system. | |
143 | Adapted from from a comp.lang.python posting |
|
143 | Adapted from from a comp.lang.python posting | |
144 | by Duncan Booth.""" |
|
144 | by Duncan Booth.""" | |
145 | def wrapper(*args, **kw): |
|
145 | def wrapper(*args, **kw): | |
146 | return new_fn(*args, **kw) |
|
146 | return new_fn(*args, **kw) | |
147 | if old_fn.__doc__: |
|
147 | if old_fn.__doc__: | |
148 | wrapper.__doc__ = old_fn.__doc__ + additional_text |
|
148 | wrapper.__doc__ = old_fn.__doc__ + additional_text | |
149 | return wrapper |
|
149 | return wrapper | |
150 |
|
150 | |||
151 | def _file_lines(fname): |
|
151 | def _file_lines(fname): | |
152 | """Return the contents of a named file as a list of lines. |
|
152 | """Return the contents of a named file as a list of lines. | |
153 |
|
153 | |||
154 | This function never raises an IOError exception: if the file can't be |
|
154 | This function never raises an IOError exception: if the file can't be | |
155 | read, it simply returns an empty list.""" |
|
155 | read, it simply returns an empty list.""" | |
156 |
|
156 | |||
157 | try: |
|
157 | try: | |
158 | outfile = open(fname) |
|
158 | outfile = open(fname) | |
159 | except IOError: |
|
159 | except IOError: | |
160 | return [] |
|
160 | return [] | |
161 | else: |
|
161 | else: | |
162 | out = outfile.readlines() |
|
162 | out = outfile.readlines() | |
163 | outfile.close() |
|
163 | outfile.close() | |
164 | return out |
|
164 | return out | |
165 |
|
165 | |||
166 | class Pdb(OldPdb): |
|
166 | class Pdb(OldPdb): | |
167 | """Modified Pdb class, does not load readline.""" |
|
167 | """Modified Pdb class, does not load readline.""" | |
168 |
|
168 | |||
169 | if sys.version[:3] >= '2.5' or has_pydb: |
|
169 | if sys.version[:3] >= '2.5' or has_pydb: | |
170 | def __init__(self,color_scheme='NoColor',completekey=None, |
|
170 | def __init__(self,color_scheme='NoColor',completekey=None, | |
171 | stdin=None, stdout=None): |
|
171 | stdin=None, stdout=None): | |
172 |
|
172 | |||
173 | # Parent constructor: |
|
173 | # Parent constructor: | |
174 | if has_pydb and completekey is None: |
|
174 | if has_pydb and completekey is None: | |
175 | OldPdb.__init__(self,stdin=stdin,stdout=Term.cout) |
|
175 | OldPdb.__init__(self,stdin=stdin,stdout=Term.cout) | |
176 | else: |
|
176 | else: | |
177 | OldPdb.__init__(self,completekey,stdin,stdout) |
|
177 | OldPdb.__init__(self,completekey,stdin,stdout) | |
178 |
|
178 | |||
179 | self.prompt = prompt # The default prompt is '(Pdb)' |
|
179 | self.prompt = prompt # The default prompt is '(Pdb)' | |
180 |
|
180 | |||
181 | # IPython changes... |
|
181 | # IPython changes... | |
182 | self.is_pydb = has_pydb |
|
182 | self.is_pydb = has_pydb | |
183 |
|
183 | |||
184 | if self.is_pydb: |
|
184 | if self.is_pydb: | |
185 |
|
185 | |||
186 | # iplib.py's ipalias seems to want pdb's checkline |
|
186 | # iplib.py's ipalias seems to want pdb's checkline | |
187 | # which located in pydb.fn |
|
187 | # which located in pydb.fn | |
188 | import pydb.fns |
|
188 | import pydb.fns | |
189 | self.checkline = lambda filename, lineno: \ |
|
189 | self.checkline = lambda filename, lineno: \ | |
190 | pydb.fns.checkline(self, filename, lineno) |
|
190 | pydb.fns.checkline(self, filename, lineno) | |
191 |
|
191 | |||
192 | self.curframe = None |
|
192 | self.curframe = None | |
193 | self.do_restart = self.new_do_restart |
|
193 | self.do_restart = self.new_do_restart | |
194 |
|
194 | |||
195 | self.old_all_completions = __IPYTHON__.Completer.all_completions |
|
195 | self.old_all_completions = __IPYTHON__.Completer.all_completions | |
196 | __IPYTHON__.Completer.all_completions=self.all_completions |
|
196 | __IPYTHON__.Completer.all_completions=self.all_completions | |
197 |
|
197 | |||
198 | self.do_list = decorate_fn_with_doc(self.list_command_pydb, |
|
198 | self.do_list = decorate_fn_with_doc(self.list_command_pydb, | |
199 | OldPdb.do_list) |
|
199 | OldPdb.do_list) | |
200 | self.do_l = self.do_list |
|
200 | self.do_l = self.do_list | |
201 | self.do_frame = decorate_fn_with_doc(self.new_do_frame, |
|
201 | self.do_frame = decorate_fn_with_doc(self.new_do_frame, | |
202 | OldPdb.do_frame) |
|
202 | OldPdb.do_frame) | |
203 |
|
203 | |||
204 | self.aliases = {} |
|
204 | self.aliases = {} | |
205 |
|
205 | |||
206 | # Create color table: we copy the default one from the traceback |
|
206 | # Create color table: we copy the default one from the traceback | |
207 | # module and add a few attributes needed for debugging |
|
207 | # module and add a few attributes needed for debugging | |
208 | self.color_scheme_table = exception_colors() |
|
208 | self.color_scheme_table = exception_colors() | |
209 |
|
209 | |||
210 | # shorthands |
|
210 | # shorthands | |
211 | C = coloransi.TermColors |
|
211 | C = coloransi.TermColors | |
212 | cst = self.color_scheme_table |
|
212 | cst = self.color_scheme_table | |
213 |
|
213 | |||
214 | cst['NoColor'].colors.breakpoint_enabled = C.NoColor |
|
214 | cst['NoColor'].colors.breakpoint_enabled = C.NoColor | |
215 | cst['NoColor'].colors.breakpoint_disabled = C.NoColor |
|
215 | cst['NoColor'].colors.breakpoint_disabled = C.NoColor | |
216 |
|
216 | |||
217 | cst['Linux'].colors.breakpoint_enabled = C.LightRed |
|
217 | cst['Linux'].colors.breakpoint_enabled = C.LightRed | |
218 | cst['Linux'].colors.breakpoint_disabled = C.Red |
|
218 | cst['Linux'].colors.breakpoint_disabled = C.Red | |
219 |
|
219 | |||
220 | cst['LightBG'].colors.breakpoint_enabled = C.LightRed |
|
220 | cst['LightBG'].colors.breakpoint_enabled = C.LightRed | |
221 | cst['LightBG'].colors.breakpoint_disabled = C.Red |
|
221 | cst['LightBG'].colors.breakpoint_disabled = C.Red | |
222 |
|
222 | |||
223 | self.set_colors(color_scheme) |
|
223 | self.set_colors(color_scheme) | |
224 |
|
224 | |||
225 | # Add a python parser so we can syntax highlight source while |
|
225 | # Add a python parser so we can syntax highlight source while | |
226 | # debugging. |
|
226 | # debugging. | |
227 | self.parser = PyColorize.Parser() |
|
227 | self.parser = PyColorize.Parser() | |
228 |
|
228 | |||
229 |
|
229 | |||
230 | else: |
|
230 | else: | |
231 | # Ugly hack: for Python 2.3-2.4, we can't call the parent constructor, |
|
231 | # Ugly hack: for Python 2.3-2.4, we can't call the parent constructor, | |
232 | # because it binds readline and breaks tab-completion. This means we |
|
232 | # because it binds readline and breaks tab-completion. This means we | |
233 | # have to COPY the constructor here. |
|
233 | # have to COPY the constructor here. | |
234 | def __init__(self,color_scheme='NoColor'): |
|
234 | def __init__(self,color_scheme='NoColor'): | |
235 | bdb.Bdb.__init__(self) |
|
235 | bdb.Bdb.__init__(self) | |
236 | cmd.Cmd.__init__(self,completekey=None) # don't load readline |
|
236 | cmd.Cmd.__init__(self,completekey=None) # don't load readline | |
237 | self.prompt = 'ipdb> ' # The default prompt is '(Pdb)' |
|
237 | self.prompt = 'ipdb> ' # The default prompt is '(Pdb)' | |
238 | self.aliases = {} |
|
238 | self.aliases = {} | |
239 |
|
239 | |||
240 | # These two lines are part of the py2.4 constructor, let's put them |
|
240 | # These two lines are part of the py2.4 constructor, let's put them | |
241 | # unconditionally here as they won't cause any problems in 2.3. |
|
241 | # unconditionally here as they won't cause any problems in 2.3. | |
242 | self.mainpyfile = '' |
|
242 | self.mainpyfile = '' | |
243 | self._wait_for_mainpyfile = 0 |
|
243 | self._wait_for_mainpyfile = 0 | |
244 |
|
244 | |||
245 | # Read $HOME/.pdbrc and ./.pdbrc |
|
245 | # Read $HOME/.pdbrc and ./.pdbrc | |
246 | try: |
|
246 | try: | |
247 | self.rcLines = _file_lines(os.path.join(os.environ['HOME'], |
|
247 | self.rcLines = _file_lines(os.path.join(os.environ['HOME'], | |
248 | ".pdbrc")) |
|
248 | ".pdbrc")) | |
249 | except KeyError: |
|
249 | except KeyError: | |
250 | self.rcLines = [] |
|
250 | self.rcLines = [] | |
251 | self.rcLines.extend(_file_lines(".pdbrc")) |
|
251 | self.rcLines.extend(_file_lines(".pdbrc")) | |
252 |
|
252 | |||
253 | # Create color table: we copy the default one from the traceback |
|
253 | # Create color table: we copy the default one from the traceback | |
254 | # module and add a few attributes needed for debugging |
|
254 | # module and add a few attributes needed for debugging | |
255 | self.color_scheme_table = exception_colors() |
|
255 | self.color_scheme_table = exception_colors() | |
256 |
|
256 | |||
257 | # shorthands |
|
257 | # shorthands | |
258 | C = coloransi.TermColors |
|
258 | C = coloransi.TermColors | |
259 | cst = self.color_scheme_table |
|
259 | cst = self.color_scheme_table | |
260 |
|
260 | |||
261 | cst['NoColor'].colors.breakpoint_enabled = C.NoColor |
|
261 | cst['NoColor'].colors.breakpoint_enabled = C.NoColor | |
262 | cst['NoColor'].colors.breakpoint_disabled = C.NoColor |
|
262 | cst['NoColor'].colors.breakpoint_disabled = C.NoColor | |
263 |
|
263 | |||
264 | cst['Linux'].colors.breakpoint_enabled = C.LightRed |
|
264 | cst['Linux'].colors.breakpoint_enabled = C.LightRed | |
265 | cst['Linux'].colors.breakpoint_disabled = C.Red |
|
265 | cst['Linux'].colors.breakpoint_disabled = C.Red | |
266 |
|
266 | |||
267 | cst['LightBG'].colors.breakpoint_enabled = C.LightRed |
|
267 | cst['LightBG'].colors.breakpoint_enabled = C.LightRed | |
268 | cst['LightBG'].colors.breakpoint_disabled = C.Red |
|
268 | cst['LightBG'].colors.breakpoint_disabled = C.Red | |
269 |
|
269 | |||
270 | self.set_colors(color_scheme) |
|
270 | self.set_colors(color_scheme) | |
271 |
|
271 | |||
272 | # Add a python parser so we can syntax highlight source while |
|
272 | # Add a python parser so we can syntax highlight source while | |
273 | # debugging. |
|
273 | # debugging. | |
274 | self.parser = PyColorize.Parser() |
|
274 | self.parser = PyColorize.Parser() | |
275 |
|
275 | |||
276 | def set_colors(self, scheme): |
|
276 | def set_colors(self, scheme): | |
277 | """Shorthand access to the color table scheme selector method.""" |
|
277 | """Shorthand access to the color table scheme selector method.""" | |
278 | self.color_scheme_table.set_active_scheme(scheme) |
|
278 | self.color_scheme_table.set_active_scheme(scheme) | |
279 |
|
279 | |||
280 | def interaction(self, frame, traceback): |
|
280 | def interaction(self, frame, traceback): | |
281 | __IPYTHON__.set_completer_frame(frame) |
|
281 | __IPYTHON__.set_completer_frame(frame) | |
282 | OldPdb.interaction(self, frame, traceback) |
|
282 | OldPdb.interaction(self, frame, traceback) | |
283 |
|
283 | |||
284 | def new_do_up(self, arg): |
|
284 | def new_do_up(self, arg): | |
285 | OldPdb.do_up(self, arg) |
|
285 | OldPdb.do_up(self, arg) | |
286 | __IPYTHON__.set_completer_frame(self.curframe) |
|
286 | __IPYTHON__.set_completer_frame(self.curframe) | |
287 | do_u = do_up = decorate_fn_with_doc(new_do_up, OldPdb.do_up) |
|
287 | do_u = do_up = decorate_fn_with_doc(new_do_up, OldPdb.do_up) | |
288 |
|
288 | |||
289 | def new_do_down(self, arg): |
|
289 | def new_do_down(self, arg): | |
290 | OldPdb.do_down(self, arg) |
|
290 | OldPdb.do_down(self, arg) | |
291 | __IPYTHON__.set_completer_frame(self.curframe) |
|
291 | __IPYTHON__.set_completer_frame(self.curframe) | |
292 |
|
292 | |||
293 | do_d = do_down = decorate_fn_with_doc(new_do_down, OldPdb.do_down) |
|
293 | do_d = do_down = decorate_fn_with_doc(new_do_down, OldPdb.do_down) | |
294 |
|
294 | |||
295 | def new_do_frame(self, arg): |
|
295 | def new_do_frame(self, arg): | |
296 | OldPdb.do_frame(self, arg) |
|
296 | OldPdb.do_frame(self, arg) | |
297 | __IPYTHON__.set_completer_frame(self.curframe) |
|
297 | __IPYTHON__.set_completer_frame(self.curframe) | |
298 |
|
298 | |||
299 | def new_do_quit(self, arg): |
|
299 | def new_do_quit(self, arg): | |
300 |
|
300 | |||
301 | if hasattr(self, 'old_all_completions'): |
|
301 | if hasattr(self, 'old_all_completions'): | |
302 | __IPYTHON__.Completer.all_completions=self.old_all_completions |
|
302 | __IPYTHON__.Completer.all_completions=self.old_all_completions | |
303 |
|
303 | |||
304 |
|
304 | |||
305 | return OldPdb.do_quit(self, arg) |
|
305 | return OldPdb.do_quit(self, arg) | |
306 |
|
306 | |||
307 | do_q = do_quit = decorate_fn_with_doc(new_do_quit, OldPdb.do_quit) |
|
307 | do_q = do_quit = decorate_fn_with_doc(new_do_quit, OldPdb.do_quit) | |
308 |
|
308 | |||
309 | def new_do_restart(self, arg): |
|
309 | def new_do_restart(self, arg): | |
310 | """Restart command. In the context of ipython this is exactly the same |
|
310 | """Restart command. In the context of ipython this is exactly the same | |
311 | thing as 'quit'.""" |
|
311 | thing as 'quit'.""" | |
312 | self.msg("Restart doesn't make sense here. Using 'quit' instead.") |
|
312 | self.msg("Restart doesn't make sense here. Using 'quit' instead.") | |
313 | return self.do_quit(arg) |
|
313 | return self.do_quit(arg) | |
314 |
|
314 | |||
315 | def postloop(self): |
|
315 | def postloop(self): | |
316 | __IPYTHON__.set_completer_frame(None) |
|
316 | __IPYTHON__.set_completer_frame(None) | |
317 |
|
317 | |||
318 | def print_stack_trace(self): |
|
318 | def print_stack_trace(self): | |
319 | try: |
|
319 | try: | |
320 | for frame_lineno in self.stack: |
|
320 | for frame_lineno in self.stack: | |
321 | self.print_stack_entry(frame_lineno, context = 5) |
|
321 | self.print_stack_entry(frame_lineno, context = 5) | |
322 | except KeyboardInterrupt: |
|
322 | except KeyboardInterrupt: | |
323 | pass |
|
323 | pass | |
324 |
|
324 | |||
325 | def print_stack_entry(self,frame_lineno,prompt_prefix='\n-> ', |
|
325 | def print_stack_entry(self,frame_lineno,prompt_prefix='\n-> ', | |
326 | context = 3): |
|
326 | context = 3): | |
327 | #frame, lineno = frame_lineno |
|
327 | #frame, lineno = frame_lineno | |
328 | print >>Term.cout, self.format_stack_entry(frame_lineno, '', context) |
|
328 | print >>Term.cout, self.format_stack_entry(frame_lineno, '', context) | |
329 |
|
329 | |||
330 | # vds: >> |
|
330 | # vds: >> | |
331 | frame, lineno = frame_lineno |
|
331 | frame, lineno = frame_lineno | |
332 | filename = frame.f_code.co_filename |
|
332 | filename = frame.f_code.co_filename | |
333 | __IPYTHON__.hooks.synchronize_with_editor(filename, lineno, 0) |
|
333 | __IPYTHON__.hooks.synchronize_with_editor(filename, lineno, 0) | |
334 | # vds: << |
|
334 | # vds: << | |
335 |
|
335 | |||
336 | def format_stack_entry(self, frame_lineno, lprefix=': ', context = 3): |
|
336 | def format_stack_entry(self, frame_lineno, lprefix=': ', context = 3): | |
337 | import linecache, repr |
|
337 | import linecache, repr | |
338 |
|
338 | |||
339 | ret = [] |
|
339 | ret = [] | |
340 |
|
340 | |||
341 | Colors = self.color_scheme_table.active_colors |
|
341 | Colors = self.color_scheme_table.active_colors | |
342 | ColorsNormal = Colors.Normal |
|
342 | ColorsNormal = Colors.Normal | |
343 | tpl_link = '%s%%s%s' % (Colors.filenameEm, ColorsNormal) |
|
343 | tpl_link = '%s%%s%s' % (Colors.filenameEm, ColorsNormal) | |
344 | tpl_call = '%s%%s%s%%s%s' % (Colors.vName, Colors.valEm, ColorsNormal) |
|
344 | tpl_call = '%s%%s%s%%s%s' % (Colors.vName, Colors.valEm, ColorsNormal) | |
345 | tpl_line = '%%s%s%%s %s%%s' % (Colors.lineno, ColorsNormal) |
|
345 | tpl_line = '%%s%s%%s %s%%s' % (Colors.lineno, ColorsNormal) | |
346 | tpl_line_em = '%%s%s%%s %s%%s%s' % (Colors.linenoEm, Colors.line, |
|
346 | tpl_line_em = '%%s%s%%s %s%%s%s' % (Colors.linenoEm, Colors.line, | |
347 | ColorsNormal) |
|
347 | ColorsNormal) | |
348 |
|
348 | |||
349 | frame, lineno = frame_lineno |
|
349 | frame, lineno = frame_lineno | |
350 |
|
350 | |||
351 | return_value = '' |
|
351 | return_value = '' | |
352 | if '__return__' in frame.f_locals: |
|
352 | if '__return__' in frame.f_locals: | |
353 | rv = frame.f_locals['__return__'] |
|
353 | rv = frame.f_locals['__return__'] | |
354 | #return_value += '->' |
|
354 | #return_value += '->' | |
355 | return_value += repr.repr(rv) + '\n' |
|
355 | return_value += repr.repr(rv) + '\n' | |
356 | ret.append(return_value) |
|
356 | ret.append(return_value) | |
357 |
|
357 | |||
358 | #s = filename + '(' + `lineno` + ')' |
|
358 | #s = filename + '(' + `lineno` + ')' | |
359 | filename = self.canonic(frame.f_code.co_filename) |
|
359 | filename = self.canonic(frame.f_code.co_filename) | |
360 | link = tpl_link % filename |
|
360 | link = tpl_link % filename | |
361 |
|
361 | |||
362 | if frame.f_code.co_name: |
|
362 | if frame.f_code.co_name: | |
363 | func = frame.f_code.co_name |
|
363 | func = frame.f_code.co_name | |
364 | else: |
|
364 | else: | |
365 | func = "<lambda>" |
|
365 | func = "<lambda>" | |
366 |
|
366 | |||
367 | call = '' |
|
367 | call = '' | |
368 | if func != '?': |
|
368 | if func != '?': | |
369 | if '__args__' in frame.f_locals: |
|
369 | if '__args__' in frame.f_locals: | |
370 | args = repr.repr(frame.f_locals['__args__']) |
|
370 | args = repr.repr(frame.f_locals['__args__']) | |
371 | else: |
|
371 | else: | |
372 | args = '()' |
|
372 | args = '()' | |
373 | call = tpl_call % (func, args) |
|
373 | call = tpl_call % (func, args) | |
374 |
|
374 | |||
375 | # The level info should be generated in the same format pdb uses, to |
|
375 | # The level info should be generated in the same format pdb uses, to | |
376 | # avoid breaking the pdbtrack functionality of python-mode in *emacs. |
|
376 | # avoid breaking the pdbtrack functionality of python-mode in *emacs. | |
377 | if frame is self.curframe: |
|
377 | if frame is self.curframe: | |
378 | ret.append('> ') |
|
378 | ret.append('> ') | |
379 | else: |
|
379 | else: | |
380 | ret.append(' ') |
|
380 | ret.append(' ') | |
381 | ret.append('%s(%s)%s\n' % (link,lineno,call)) |
|
381 | ret.append('%s(%s)%s\n' % (link,lineno,call)) | |
382 |
|
382 | |||
383 | start = lineno - 1 - context//2 |
|
383 | start = lineno - 1 - context//2 | |
384 | lines = linecache.getlines(filename) |
|
384 | lines = linecache.getlines(filename) | |
385 | start = max(start, 0) |
|
385 | start = max(start, 0) | |
386 | start = min(start, len(lines) - context) |
|
386 | start = min(start, len(lines) - context) | |
387 | lines = lines[start : start + context] |
|
387 | lines = lines[start : start + context] | |
388 |
|
388 | |||
389 | for i,line in enumerate(lines): |
|
389 | for i,line in enumerate(lines): | |
390 | show_arrow = (start + 1 + i == lineno) |
|
390 | show_arrow = (start + 1 + i == lineno) | |
391 | linetpl = (frame is self.curframe or show_arrow) \ |
|
391 | linetpl = (frame is self.curframe or show_arrow) \ | |
392 | and tpl_line_em \ |
|
392 | and tpl_line_em \ | |
393 | or tpl_line |
|
393 | or tpl_line | |
394 | ret.append(self.__format_line(linetpl, filename, |
|
394 | ret.append(self.__format_line(linetpl, filename, | |
395 | start + 1 + i, line, |
|
395 | start + 1 + i, line, | |
396 | arrow = show_arrow) ) |
|
396 | arrow = show_arrow) ) | |
397 |
|
397 | |||
398 | return ''.join(ret) |
|
398 | return ''.join(ret) | |
399 |
|
399 | |||
400 | def __format_line(self, tpl_line, filename, lineno, line, arrow = False): |
|
400 | def __format_line(self, tpl_line, filename, lineno, line, arrow = False): | |
401 | bp_mark = "" |
|
401 | bp_mark = "" | |
402 | bp_mark_color = "" |
|
402 | bp_mark_color = "" | |
403 |
|
403 | |||
404 | scheme = self.color_scheme_table.active_scheme_name |
|
404 | scheme = self.color_scheme_table.active_scheme_name | |
405 | new_line, err = self.parser.format2(line, 'str', scheme) |
|
405 | new_line, err = self.parser.format2(line, 'str', scheme) | |
406 | if not err: line = new_line |
|
406 | if not err: line = new_line | |
407 |
|
407 | |||
408 | bp = None |
|
408 | bp = None | |
409 | if lineno in self.get_file_breaks(filename): |
|
409 | if lineno in self.get_file_breaks(filename): | |
410 | bps = self.get_breaks(filename, lineno) |
|
410 | bps = self.get_breaks(filename, lineno) | |
411 | bp = bps[-1] |
|
411 | bp = bps[-1] | |
412 |
|
412 | |||
413 | if bp: |
|
413 | if bp: | |
414 | Colors = self.color_scheme_table.active_colors |
|
414 | Colors = self.color_scheme_table.active_colors | |
415 | bp_mark = str(bp.number) |
|
415 | bp_mark = str(bp.number) | |
416 | bp_mark_color = Colors.breakpoint_enabled |
|
416 | bp_mark_color = Colors.breakpoint_enabled | |
417 | if not bp.enabled: |
|
417 | if not bp.enabled: | |
418 | bp_mark_color = Colors.breakpoint_disabled |
|
418 | bp_mark_color = Colors.breakpoint_disabled | |
419 |
|
419 | |||
420 | numbers_width = 7 |
|
420 | numbers_width = 7 | |
421 | if arrow: |
|
421 | if arrow: | |
422 | # This is the line with the error |
|
422 | # This is the line with the error | |
423 | pad = numbers_width - len(str(lineno)) - len(bp_mark) |
|
423 | pad = numbers_width - len(str(lineno)) - len(bp_mark) | |
424 | if pad >= 3: |
|
424 | if pad >= 3: | |
425 | marker = '-'*(pad-3) + '-> ' |
|
425 | marker = '-'*(pad-3) + '-> ' | |
426 | elif pad == 2: |
|
426 | elif pad == 2: | |
427 | marker = '> ' |
|
427 | marker = '> ' | |
428 | elif pad == 1: |
|
428 | elif pad == 1: | |
429 | marker = '>' |
|
429 | marker = '>' | |
430 | else: |
|
430 | else: | |
431 | marker = '' |
|
431 | marker = '' | |
432 | num = '%s%s' % (marker, str(lineno)) |
|
432 | num = '%s%s' % (marker, str(lineno)) | |
433 | line = tpl_line % (bp_mark_color + bp_mark, num, line) |
|
433 | line = tpl_line % (bp_mark_color + bp_mark, num, line) | |
434 | else: |
|
434 | else: | |
435 | num = '%*s' % (numbers_width - len(bp_mark), str(lineno)) |
|
435 | num = '%*s' % (numbers_width - len(bp_mark), str(lineno)) | |
436 | line = tpl_line % (bp_mark_color + bp_mark, num, line) |
|
436 | line = tpl_line % (bp_mark_color + bp_mark, num, line) | |
437 |
|
437 | |||
438 | return line |
|
438 | return line | |
439 |
|
439 | |||
440 | def list_command_pydb(self, arg): |
|
440 | def list_command_pydb(self, arg): | |
441 | """List command to use if we have a newer pydb installed""" |
|
441 | """List command to use if we have a newer pydb installed""" | |
442 | filename, first, last = OldPdb.parse_list_cmd(self, arg) |
|
442 | filename, first, last = OldPdb.parse_list_cmd(self, arg) | |
443 | if filename is not None: |
|
443 | if filename is not None: | |
444 | self.print_list_lines(filename, first, last) |
|
444 | self.print_list_lines(filename, first, last) | |
445 |
|
445 | |||
446 | def print_list_lines(self, filename, first, last): |
|
446 | def print_list_lines(self, filename, first, last): | |
447 | """The printing (as opposed to the parsing part of a 'list' |
|
447 | """The printing (as opposed to the parsing part of a 'list' | |
448 | command.""" |
|
448 | command.""" | |
449 | try: |
|
449 | try: | |
450 | Colors = self.color_scheme_table.active_colors |
|
450 | Colors = self.color_scheme_table.active_colors | |
451 | ColorsNormal = Colors.Normal |
|
451 | ColorsNormal = Colors.Normal | |
452 | tpl_line = '%%s%s%%s %s%%s' % (Colors.lineno, ColorsNormal) |
|
452 | tpl_line = '%%s%s%%s %s%%s' % (Colors.lineno, ColorsNormal) | |
453 | tpl_line_em = '%%s%s%%s %s%%s%s' % (Colors.linenoEm, Colors.line, ColorsNormal) |
|
453 | tpl_line_em = '%%s%s%%s %s%%s%s' % (Colors.linenoEm, Colors.line, ColorsNormal) | |
454 | src = [] |
|
454 | src = [] | |
455 | for lineno in range(first, last+1): |
|
455 | for lineno in range(first, last+1): | |
456 | line = linecache.getline(filename, lineno) |
|
456 | line = linecache.getline(filename, lineno) | |
457 | if not line: |
|
457 | if not line: | |
458 | break |
|
458 | break | |
459 |
|
459 | |||
460 | if lineno == self.curframe.f_lineno: |
|
460 | if lineno == self.curframe.f_lineno: | |
461 | line = self.__format_line(tpl_line_em, filename, lineno, line, arrow = True) |
|
461 | line = self.__format_line(tpl_line_em, filename, lineno, line, arrow = True) | |
462 | else: |
|
462 | else: | |
463 | line = self.__format_line(tpl_line, filename, lineno, line, arrow = False) |
|
463 | line = self.__format_line(tpl_line, filename, lineno, line, arrow = False) | |
464 |
|
464 | |||
465 | src.append(line) |
|
465 | src.append(line) | |
466 | self.lineno = lineno |
|
466 | self.lineno = lineno | |
467 |
|
467 | |||
468 | print >>Term.cout, ''.join(src) |
|
468 | print >>Term.cout, ''.join(src) | |
469 |
|
469 | |||
470 | except KeyboardInterrupt: |
|
470 | except KeyboardInterrupt: | |
471 | pass |
|
471 | pass | |
472 |
|
472 | |||
473 | def do_list(self, arg): |
|
473 | def do_list(self, arg): | |
474 | self.lastcmd = 'list' |
|
474 | self.lastcmd = 'list' | |
475 | last = None |
|
475 | last = None | |
476 | if arg: |
|
476 | if arg: | |
477 | try: |
|
477 | try: | |
478 | x = eval(arg, {}, {}) |
|
478 | x = eval(arg, {}, {}) | |
479 | if type(x) == type(()): |
|
479 | if type(x) == type(()): | |
480 | first, last = x |
|
480 | first, last = x | |
481 | first = int(first) |
|
481 | first = int(first) | |
482 | last = int(last) |
|
482 | last = int(last) | |
483 | if last < first: |
|
483 | if last < first: | |
484 | # Assume it's a count |
|
484 | # Assume it's a count | |
485 | last = first + last |
|
485 | last = first + last | |
486 | else: |
|
486 | else: | |
487 | first = max(1, int(x) - 5) |
|
487 | first = max(1, int(x) - 5) | |
488 | except: |
|
488 | except: | |
489 | print '*** Error in argument:', `arg` |
|
489 | print '*** Error in argument:', `arg` | |
490 | return |
|
490 | return | |
491 | elif self.lineno is None: |
|
491 | elif self.lineno is None: | |
492 | first = max(1, self.curframe.f_lineno - 5) |
|
492 | first = max(1, self.curframe.f_lineno - 5) | |
493 | else: |
|
493 | else: | |
494 | first = self.lineno + 1 |
|
494 | first = self.lineno + 1 | |
495 | if last is None: |
|
495 | if last is None: | |
496 | last = first + 10 |
|
496 | last = first + 10 | |
497 | self.print_list_lines(self.curframe.f_code.co_filename, first, last) |
|
497 | self.print_list_lines(self.curframe.f_code.co_filename, first, last) | |
498 |
|
498 | |||
499 | # vds: >> |
|
499 | # vds: >> | |
500 | lineno = first |
|
500 | lineno = first | |
501 | filename = self.curframe.f_code.co_filename |
|
501 | filename = self.curframe.f_code.co_filename | |
502 | __IPYTHON__.hooks.synchronize_with_editor(filename, lineno, 0) |
|
502 | __IPYTHON__.hooks.synchronize_with_editor(filename, lineno, 0) | |
503 | # vds: << |
|
503 | # vds: << | |
504 |
|
504 | |||
505 | do_l = do_list |
|
505 | do_l = do_list | |
506 |
|
506 | |||
507 | def do_pdef(self, arg): |
|
507 | def do_pdef(self, arg): | |
508 | """The debugger interface to magic_pdef""" |
|
508 | """The debugger interface to magic_pdef""" | |
509 | namespaces = [('Locals', self.curframe.f_locals), |
|
509 | namespaces = [('Locals', self.curframe.f_locals), | |
510 | ('Globals', self.curframe.f_globals)] |
|
510 | ('Globals', self.curframe.f_globals)] | |
511 | __IPYTHON__.magic_pdef(arg, namespaces=namespaces) |
|
511 | __IPYTHON__.magic_pdef(arg, namespaces=namespaces) | |
512 |
|
512 | |||
513 | def do_pdoc(self, arg): |
|
513 | def do_pdoc(self, arg): | |
514 | """The debugger interface to magic_pdoc""" |
|
514 | """The debugger interface to magic_pdoc""" | |
515 | namespaces = [('Locals', self.curframe.f_locals), |
|
515 | namespaces = [('Locals', self.curframe.f_locals), | |
516 | ('Globals', self.curframe.f_globals)] |
|
516 | ('Globals', self.curframe.f_globals)] | |
517 | __IPYTHON__.magic_pdoc(arg, namespaces=namespaces) |
|
517 | __IPYTHON__.magic_pdoc(arg, namespaces=namespaces) | |
518 |
|
518 | |||
519 | def do_pinfo(self, arg): |
|
519 | def do_pinfo(self, arg): | |
520 | """The debugger equivalant of ?obj""" |
|
520 | """The debugger equivalant of ?obj""" | |
521 | namespaces = [('Locals', self.curframe.f_locals), |
|
521 | namespaces = [('Locals', self.curframe.f_locals), | |
522 | ('Globals', self.curframe.f_globals)] |
|
522 | ('Globals', self.curframe.f_globals)] | |
523 | __IPYTHON__.magic_pinfo("pinfo %s" % arg, namespaces=namespaces) |
|
523 | __IPYTHON__.magic_pinfo("pinfo %s" % arg, namespaces=namespaces) |
@@ -1,8 +1,11 | |||||
1 | #!/usr/bin/env python |
|
1 | #!/usr/bin/env python | |
2 | # encoding: utf-8 |
|
2 | # encoding: utf-8 | |
3 |
|
3 | |||
4 | def test_import_completer(): |
|
4 | def test_import_completer(): | |
5 | from IPython.core import completer |
|
5 | from IPython.core import completer | |
6 |
|
6 | |||
7 | def test_import_crashhandler(): |
|
7 | def test_import_crashhandler(): | |
8 | from IPython.core import crashhandler |
|
8 | from IPython.core import crashhandler | |
|
9 | ||||
|
10 | def test_import_debugger(): | |||
|
11 | from IPython.core import debugger No newline at end of file |
@@ -1,2862 +1,2863 | |||||
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.4 or newer. |
|
5 | Requires Python 2.4 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 |
|
9 | |||
10 | #***************************************************************************** |
|
10 | #***************************************************************************** | |
11 | # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and |
|
11 | # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and | |
12 | # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu> |
|
12 | # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu> | |
13 | # |
|
13 | # | |
14 | # Distributed under the terms of the BSD License. The full license is in |
|
14 | # Distributed under the terms of the BSD License. The full license is in | |
15 | # the file COPYING, distributed as part of this software. |
|
15 | # the file COPYING, distributed as part of this software. | |
16 | # |
|
16 | # | |
17 | # Note: this code originally subclassed code.InteractiveConsole from the |
|
17 | # Note: this code originally subclassed code.InteractiveConsole from the | |
18 | # Python standard library. Over time, all of that class has been copied |
|
18 | # Python standard library. Over time, all of that class has been copied | |
19 | # verbatim here for modifications which could not be accomplished by |
|
19 | # verbatim here for modifications which could not be accomplished by | |
20 | # subclassing. At this point, there are no dependencies at all on the code |
|
20 | # subclassing. At this point, there are no dependencies at all on the code | |
21 | # module anymore (it is not even imported). The Python License (sec. 2) |
|
21 | # module anymore (it is not even imported). The Python License (sec. 2) | |
22 | # allows for this, but it's always nice to acknowledge credit where credit is |
|
22 | # allows for this, but it's always nice to acknowledge credit where credit is | |
23 | # due. |
|
23 | # due. | |
24 | #***************************************************************************** |
|
24 | #***************************************************************************** | |
25 |
|
25 | |||
26 | #**************************************************************************** |
|
26 | #**************************************************************************** | |
27 | # Modules and globals |
|
27 | # Modules and globals | |
28 |
|
28 | |||
29 | # Python standard modules |
|
29 | # Python standard modules | |
30 | import __main__ |
|
30 | import __main__ | |
31 | import __builtin__ |
|
31 | import __builtin__ | |
32 | import StringIO |
|
32 | import StringIO | |
33 | import bdb |
|
33 | import bdb | |
34 | import codeop |
|
34 | import codeop | |
35 | import exceptions |
|
35 | import exceptions | |
36 | import glob |
|
36 | import glob | |
37 | import keyword |
|
37 | import keyword | |
38 | import new |
|
38 | import new | |
39 | import os |
|
39 | import os | |
40 | import re |
|
40 | import re | |
41 | import shutil |
|
41 | import shutil | |
42 | import string |
|
42 | import string | |
43 | import sys |
|
43 | import sys | |
44 | import tempfile |
|
44 | import tempfile | |
45 |
|
45 | |||
46 | # IPython's own modules |
|
46 | # IPython's own modules | |
47 | #import IPython |
|
47 | #import IPython | |
48 |
from IPython import |
|
48 | from IPython import OInspect,PyColorize,ultraTB | |
|
49 | from IPython.core import debugger | |||
49 | from IPython.Extensions import pickleshare |
|
50 | from IPython.Extensions import pickleshare | |
50 | from IPython.FakeModule import FakeModule, init_fakemod_dict |
|
51 | from IPython.FakeModule import FakeModule, init_fakemod_dict | |
51 | from IPython.Itpl import ItplNS |
|
52 | from IPython.Itpl import ItplNS | |
52 | from IPython.Logger import Logger |
|
53 | from IPython.Logger import Logger | |
53 | from IPython.Magic import Magic |
|
54 | from IPython.Magic import Magic | |
54 | from IPython.Prompts import CachedOutput |
|
55 | from IPython.Prompts import CachedOutput | |
55 | from IPython.ipstruct import Struct |
|
56 | from IPython.ipstruct import Struct | |
56 | from IPython.lib.backgroundjobs import BackgroundJobManager |
|
57 | from IPython.lib.backgroundjobs import BackgroundJobManager | |
57 | from IPython.genutils import * |
|
58 | from IPython.genutils import * | |
58 | from IPython.strdispatch import StrDispatch |
|
59 | from IPython.strdispatch import StrDispatch | |
59 | import IPython.ipapi |
|
60 | import IPython.ipapi | |
60 | import IPython.history |
|
61 | import IPython.history | |
61 | import IPython.prefilter as prefilter |
|
62 | import IPython.prefilter as prefilter | |
62 | import IPython.shadowns |
|
63 | import IPython.shadowns | |
63 | # Globals |
|
64 | # Globals | |
64 |
|
65 | |||
65 | # store the builtin raw_input globally, and use this always, in case user code |
|
66 | # store the builtin raw_input globally, and use this always, in case user code | |
66 | # overwrites it (like wx.py.PyShell does) |
|
67 | # overwrites it (like wx.py.PyShell does) | |
67 | raw_input_original = raw_input |
|
68 | raw_input_original = raw_input | |
68 |
|
69 | |||
69 | # compiled regexps for autoindent management |
|
70 | # compiled regexps for autoindent management | |
70 | dedent_re = re.compile(r'^\s+raise|^\s+return|^\s+pass') |
|
71 | dedent_re = re.compile(r'^\s+raise|^\s+return|^\s+pass') | |
71 |
|
72 | |||
72 |
|
73 | |||
73 | #**************************************************************************** |
|
74 | #**************************************************************************** | |
74 | # Some utility function definitions |
|
75 | # Some utility function definitions | |
75 |
|
76 | |||
76 | ini_spaces_re = re.compile(r'^(\s+)') |
|
77 | ini_spaces_re = re.compile(r'^(\s+)') | |
77 |
|
78 | |||
78 | def num_ini_spaces(strng): |
|
79 | def num_ini_spaces(strng): | |
79 | """Return the number of initial spaces in a string""" |
|
80 | """Return the number of initial spaces in a string""" | |
80 |
|
81 | |||
81 | ini_spaces = ini_spaces_re.match(strng) |
|
82 | ini_spaces = ini_spaces_re.match(strng) | |
82 | if ini_spaces: |
|
83 | if ini_spaces: | |
83 | return ini_spaces.end() |
|
84 | return ini_spaces.end() | |
84 | else: |
|
85 | else: | |
85 | return 0 |
|
86 | return 0 | |
86 |
|
87 | |||
87 | def softspace(file, newvalue): |
|
88 | def softspace(file, newvalue): | |
88 | """Copied from code.py, to remove the dependency""" |
|
89 | """Copied from code.py, to remove the dependency""" | |
89 |
|
90 | |||
90 | oldvalue = 0 |
|
91 | oldvalue = 0 | |
91 | try: |
|
92 | try: | |
92 | oldvalue = file.softspace |
|
93 | oldvalue = file.softspace | |
93 | except AttributeError: |
|
94 | except AttributeError: | |
94 | pass |
|
95 | pass | |
95 | try: |
|
96 | try: | |
96 | file.softspace = newvalue |
|
97 | file.softspace = newvalue | |
97 | except (AttributeError, TypeError): |
|
98 | except (AttributeError, TypeError): | |
98 | # "attribute-less object" or "read-only attributes" |
|
99 | # "attribute-less object" or "read-only attributes" | |
99 | pass |
|
100 | pass | |
100 | return oldvalue |
|
101 | return oldvalue | |
101 |
|
102 | |||
102 |
|
103 | |||
103 | def user_setup(ipythondir,rc_suffix,mode='install',interactive=True): |
|
104 | def user_setup(ipythondir,rc_suffix,mode='install',interactive=True): | |
104 | """Install or upgrade the user configuration directory. |
|
105 | """Install or upgrade the user configuration directory. | |
105 |
|
106 | |||
106 | Can be called when running for the first time or to upgrade the user's |
|
107 | Can be called when running for the first time or to upgrade the user's | |
107 | .ipython/ directory. |
|
108 | .ipython/ directory. | |
108 |
|
109 | |||
109 | Parameters |
|
110 | Parameters | |
110 | ---------- |
|
111 | ---------- | |
111 | ipythondir : path |
|
112 | ipythondir : path | |
112 | The directory to be used for installation/upgrade. In 'install' mode, |
|
113 | The directory to be used for installation/upgrade. In 'install' mode, | |
113 | if this path already exists, the function exits immediately. |
|
114 | if this path already exists, the function exits immediately. | |
114 |
|
115 | |||
115 | rc_suffix : str |
|
116 | rc_suffix : str | |
116 | Extension for the config files. On *nix platforms it is typically the |
|
117 | Extension for the config files. On *nix platforms it is typically the | |
117 | empty string, while Windows normally uses '.ini'. |
|
118 | empty string, while Windows normally uses '.ini'. | |
118 |
|
119 | |||
119 | mode : str, optional |
|
120 | mode : str, optional | |
120 | Valid modes are 'install' and 'upgrade'. |
|
121 | Valid modes are 'install' and 'upgrade'. | |
121 |
|
122 | |||
122 | interactive : bool, optional |
|
123 | interactive : bool, optional | |
123 | If False, do not wait for user input on any errors. Normally after |
|
124 | If False, do not wait for user input on any errors. Normally after | |
124 | printing its status information, this function waits for the user to |
|
125 | printing its status information, this function waits for the user to | |
125 | hit Return before proceeding. This is because the default use case is |
|
126 | hit Return before proceeding. This is because the default use case is | |
126 | when first installing the IPython configuration, so we want the user to |
|
127 | when first installing the IPython configuration, so we want the user to | |
127 | acknowledge the initial message, which contains some useful |
|
128 | acknowledge the initial message, which contains some useful | |
128 | information. |
|
129 | information. | |
129 | """ |
|
130 | """ | |
130 |
|
131 | |||
131 | # For automatic use, deactivate all i/o |
|
132 | # For automatic use, deactivate all i/o | |
132 | if interactive: |
|
133 | if interactive: | |
133 | def wait(): |
|
134 | def wait(): | |
134 | try: |
|
135 | try: | |
135 | raw_input("Please press <RETURN> to start IPython.") |
|
136 | raw_input("Please press <RETURN> to start IPython.") | |
136 | except EOFError: |
|
137 | except EOFError: | |
137 | print >> Term.cout |
|
138 | print >> Term.cout | |
138 | print '*'*70 |
|
139 | print '*'*70 | |
139 |
|
140 | |||
140 | def printf(s): |
|
141 | def printf(s): | |
141 | print s |
|
142 | print s | |
142 | else: |
|
143 | else: | |
143 | wait = lambda : None |
|
144 | wait = lambda : None | |
144 | printf = lambda s : None |
|
145 | printf = lambda s : None | |
145 |
|
146 | |||
146 | # Install mode should be re-entrant: if the install dir already exists, |
|
147 | # Install mode should be re-entrant: if the install dir already exists, | |
147 | # bail out cleanly. |
|
148 | # bail out cleanly. | |
148 | # XXX. This is too hasty to return. We need to check to make sure that |
|
149 | # XXX. This is too hasty to return. We need to check to make sure that | |
149 | # all the expected config files and directories are actually there. We |
|
150 | # all the expected config files and directories are actually there. We | |
150 | # currently have a failure mode if someone deletes a needed config file |
|
151 | # currently have a failure mode if someone deletes a needed config file | |
151 | # but still has the ipythondir. |
|
152 | # but still has the ipythondir. | |
152 | if mode == 'install' and os.path.isdir(ipythondir): |
|
153 | if mode == 'install' and os.path.isdir(ipythondir): | |
153 | return |
|
154 | return | |
154 |
|
155 | |||
155 | cwd = os.getcwd() # remember where we started |
|
156 | cwd = os.getcwd() # remember where we started | |
156 | glb = glob.glob |
|
157 | glb = glob.glob | |
157 |
|
158 | |||
158 | printf('*'*70) |
|
159 | printf('*'*70) | |
159 | if mode == 'install': |
|
160 | if mode == 'install': | |
160 | printf( |
|
161 | printf( | |
161 | """Welcome to IPython. I will try to create a personal configuration directory |
|
162 | """Welcome to IPython. I will try to create a personal configuration directory | |
162 | where you can customize many aspects of IPython's functionality in:\n""") |
|
163 | where you can customize many aspects of IPython's functionality in:\n""") | |
163 | else: |
|
164 | else: | |
164 | printf('I am going to upgrade your configuration in:') |
|
165 | printf('I am going to upgrade your configuration in:') | |
165 |
|
166 | |||
166 | printf(ipythondir) |
|
167 | printf(ipythondir) | |
167 |
|
168 | |||
168 | rcdirend = os.path.join('IPython','UserConfig') |
|
169 | rcdirend = os.path.join('IPython','UserConfig') | |
169 | cfg = lambda d: os.path.join(d,rcdirend) |
|
170 | cfg = lambda d: os.path.join(d,rcdirend) | |
170 | try: |
|
171 | try: | |
171 | rcdir = filter(os.path.isdir,map(cfg,sys.path))[0] |
|
172 | rcdir = filter(os.path.isdir,map(cfg,sys.path))[0] | |
172 | printf("Initializing from configuration: %s" % rcdir) |
|
173 | printf("Initializing from configuration: %s" % rcdir) | |
173 | except IndexError: |
|
174 | except IndexError: | |
174 | warning = """ |
|
175 | warning = """ | |
175 | Installation error. IPython's directory was not found. |
|
176 | Installation error. IPython's directory was not found. | |
176 |
|
177 | |||
177 | Check the following: |
|
178 | Check the following: | |
178 |
|
179 | |||
179 | The ipython/IPython directory should be in a directory belonging to your |
|
180 | The ipython/IPython directory should be in a directory belonging to your | |
180 | PYTHONPATH environment variable (that is, it should be in a directory |
|
181 | PYTHONPATH environment variable (that is, it should be in a directory | |
181 | belonging to sys.path). You can copy it explicitly there or just link to it. |
|
182 | belonging to sys.path). You can copy it explicitly there or just link to it. | |
182 |
|
183 | |||
183 | IPython will create a minimal default configuration for you. |
|
184 | IPython will create a minimal default configuration for you. | |
184 |
|
185 | |||
185 | """ |
|
186 | """ | |
186 | warn(warning) |
|
187 | warn(warning) | |
187 | wait() |
|
188 | wait() | |
188 |
|
189 | |||
189 | if sys.platform =='win32': |
|
190 | if sys.platform =='win32': | |
190 | inif = 'ipythonrc.ini' |
|
191 | inif = 'ipythonrc.ini' | |
191 | else: |
|
192 | else: | |
192 | inif = 'ipythonrc' |
|
193 | inif = 'ipythonrc' | |
193 | minimal_setup = {'ipy_user_conf.py' : 'import ipy_defaults', |
|
194 | minimal_setup = {'ipy_user_conf.py' : 'import ipy_defaults', | |
194 | inif : '# intentionally left blank' } |
|
195 | inif : '# intentionally left blank' } | |
195 | os.makedirs(ipythondir, mode = 0777) |
|
196 | os.makedirs(ipythondir, mode = 0777) | |
196 | for f, cont in minimal_setup.items(): |
|
197 | for f, cont in minimal_setup.items(): | |
197 | # In 2.5, this can be more cleanly done using 'with' |
|
198 | # In 2.5, this can be more cleanly done using 'with' | |
198 | fobj = file(ipythondir + '/' + f,'w') |
|
199 | fobj = file(ipythondir + '/' + f,'w') | |
199 | fobj.write(cont) |
|
200 | fobj.write(cont) | |
200 | fobj.close() |
|
201 | fobj.close() | |
201 |
|
202 | |||
202 | return |
|
203 | return | |
203 |
|
204 | |||
204 | if mode == 'install': |
|
205 | if mode == 'install': | |
205 | try: |
|
206 | try: | |
206 | shutil.copytree(rcdir,ipythondir) |
|
207 | shutil.copytree(rcdir,ipythondir) | |
207 | os.chdir(ipythondir) |
|
208 | os.chdir(ipythondir) | |
208 | rc_files = glb("ipythonrc*") |
|
209 | rc_files = glb("ipythonrc*") | |
209 | for rc_file in rc_files: |
|
210 | for rc_file in rc_files: | |
210 | os.rename(rc_file,rc_file+rc_suffix) |
|
211 | os.rename(rc_file,rc_file+rc_suffix) | |
211 | except: |
|
212 | except: | |
212 | warning = """ |
|
213 | warning = """ | |
213 |
|
214 | |||
214 | There was a problem with the installation: |
|
215 | There was a problem with the installation: | |
215 | %s |
|
216 | %s | |
216 | Try to correct it or contact the developers if you think it's a bug. |
|
217 | Try to correct it or contact the developers if you think it's a bug. | |
217 | IPython will proceed with builtin defaults.""" % sys.exc_info()[1] |
|
218 | IPython will proceed with builtin defaults.""" % sys.exc_info()[1] | |
218 | warn(warning) |
|
219 | warn(warning) | |
219 | wait() |
|
220 | wait() | |
220 | return |
|
221 | return | |
221 |
|
222 | |||
222 | elif mode == 'upgrade': |
|
223 | elif mode == 'upgrade': | |
223 | try: |
|
224 | try: | |
224 | os.chdir(ipythondir) |
|
225 | os.chdir(ipythondir) | |
225 | except: |
|
226 | except: | |
226 | printf(""" |
|
227 | printf(""" | |
227 | Can not upgrade: changing to directory %s failed. Details: |
|
228 | Can not upgrade: changing to directory %s failed. Details: | |
228 | %s |
|
229 | %s | |
229 | """ % (ipythondir,sys.exc_info()[1]) ) |
|
230 | """ % (ipythondir,sys.exc_info()[1]) ) | |
230 | wait() |
|
231 | wait() | |
231 | return |
|
232 | return | |
232 | else: |
|
233 | else: | |
233 | sources = glb(os.path.join(rcdir,'[A-Za-z]*')) |
|
234 | sources = glb(os.path.join(rcdir,'[A-Za-z]*')) | |
234 | for new_full_path in sources: |
|
235 | for new_full_path in sources: | |
235 | new_filename = os.path.basename(new_full_path) |
|
236 | new_filename = os.path.basename(new_full_path) | |
236 | if new_filename.startswith('ipythonrc'): |
|
237 | if new_filename.startswith('ipythonrc'): | |
237 | new_filename = new_filename + rc_suffix |
|
238 | new_filename = new_filename + rc_suffix | |
238 | # The config directory should only contain files, skip any |
|
239 | # The config directory should only contain files, skip any | |
239 | # directories which may be there (like CVS) |
|
240 | # directories which may be there (like CVS) | |
240 | if os.path.isdir(new_full_path): |
|
241 | if os.path.isdir(new_full_path): | |
241 | continue |
|
242 | continue | |
242 | if os.path.exists(new_filename): |
|
243 | if os.path.exists(new_filename): | |
243 | old_file = new_filename+'.old' |
|
244 | old_file = new_filename+'.old' | |
244 | if os.path.exists(old_file): |
|
245 | if os.path.exists(old_file): | |
245 | os.remove(old_file) |
|
246 | os.remove(old_file) | |
246 | os.rename(new_filename,old_file) |
|
247 | os.rename(new_filename,old_file) | |
247 | shutil.copy(new_full_path,new_filename) |
|
248 | shutil.copy(new_full_path,new_filename) | |
248 | else: |
|
249 | else: | |
249 | raise ValueError('unrecognized mode for install: %r' % mode) |
|
250 | raise ValueError('unrecognized mode for install: %r' % mode) | |
250 |
|
251 | |||
251 | # Fix line-endings to those native to each platform in the config |
|
252 | # Fix line-endings to those native to each platform in the config | |
252 | # directory. |
|
253 | # directory. | |
253 | try: |
|
254 | try: | |
254 | os.chdir(ipythondir) |
|
255 | os.chdir(ipythondir) | |
255 | except: |
|
256 | except: | |
256 | printf(""" |
|
257 | printf(""" | |
257 | Problem: changing to directory %s failed. |
|
258 | Problem: changing to directory %s failed. | |
258 | Details: |
|
259 | Details: | |
259 | %s |
|
260 | %s | |
260 |
|
261 | |||
261 | Some configuration files may have incorrect line endings. This should not |
|
262 | Some configuration files may have incorrect line endings. This should not | |
262 | cause any problems during execution. """ % (ipythondir,sys.exc_info()[1]) ) |
|
263 | cause any problems during execution. """ % (ipythondir,sys.exc_info()[1]) ) | |
263 | wait() |
|
264 | wait() | |
264 | else: |
|
265 | else: | |
265 | for fname in glb('ipythonrc*'): |
|
266 | for fname in glb('ipythonrc*'): | |
266 | try: |
|
267 | try: | |
267 | native_line_ends(fname,backup=0) |
|
268 | native_line_ends(fname,backup=0) | |
268 | except IOError: |
|
269 | except IOError: | |
269 | pass |
|
270 | pass | |
270 |
|
271 | |||
271 | if mode == 'install': |
|
272 | if mode == 'install': | |
272 | printf(""" |
|
273 | printf(""" | |
273 | Successful installation! |
|
274 | Successful installation! | |
274 |
|
275 | |||
275 | Please read the sections 'Initial Configuration' and 'Quick Tips' in the |
|
276 | Please read the sections 'Initial Configuration' and 'Quick Tips' in the | |
276 | IPython manual (there are both HTML and PDF versions supplied with the |
|
277 | IPython manual (there are both HTML and PDF versions supplied with the | |
277 | distribution) to make sure that your system environment is properly configured |
|
278 | distribution) to make sure that your system environment is properly configured | |
278 | to take advantage of IPython's features. |
|
279 | to take advantage of IPython's features. | |
279 |
|
280 | |||
280 | Important note: the configuration system has changed! The old system is |
|
281 | Important note: the configuration system has changed! The old system is | |
281 | still in place, but its setting may be partly overridden by the settings in |
|
282 | still in place, but its setting may be partly overridden by the settings in | |
282 | "~/.ipython/ipy_user_conf.py" config file. Please take a look at the file |
|
283 | "~/.ipython/ipy_user_conf.py" config file. Please take a look at the file | |
283 | if some of the new settings bother you. |
|
284 | if some of the new settings bother you. | |
284 |
|
285 | |||
285 | """) |
|
286 | """) | |
286 | else: |
|
287 | else: | |
287 | printf(""" |
|
288 | printf(""" | |
288 | Successful upgrade! |
|
289 | Successful upgrade! | |
289 |
|
290 | |||
290 | All files in your directory: |
|
291 | All files in your directory: | |
291 | %(ipythondir)s |
|
292 | %(ipythondir)s | |
292 | which would have been overwritten by the upgrade were backed up with a .old |
|
293 | which would have been overwritten by the upgrade were backed up with a .old | |
293 | extension. If you had made particular customizations in those files you may |
|
294 | extension. If you had made particular customizations in those files you may | |
294 | want to merge them back into the new files.""" % locals() ) |
|
295 | want to merge them back into the new files.""" % locals() ) | |
295 | wait() |
|
296 | wait() | |
296 | os.chdir(cwd) |
|
297 | os.chdir(cwd) | |
297 |
|
298 | |||
298 | #**************************************************************************** |
|
299 | #**************************************************************************** | |
299 | # Local use exceptions |
|
300 | # Local use exceptions | |
300 | class SpaceInInput(exceptions.Exception): pass |
|
301 | class SpaceInInput(exceptions.Exception): pass | |
301 |
|
302 | |||
302 |
|
303 | |||
303 | #**************************************************************************** |
|
304 | #**************************************************************************** | |
304 | # Local use classes |
|
305 | # Local use classes | |
305 | class Bunch: pass |
|
306 | class Bunch: pass | |
306 |
|
307 | |||
307 | class Undefined: pass |
|
308 | class Undefined: pass | |
308 |
|
309 | |||
309 | class Quitter(object): |
|
310 | class Quitter(object): | |
310 | """Simple class to handle exit, similar to Python 2.5's. |
|
311 | """Simple class to handle exit, similar to Python 2.5's. | |
311 |
|
312 | |||
312 | It handles exiting in an ipython-safe manner, which the one in Python 2.5 |
|
313 | It handles exiting in an ipython-safe manner, which the one in Python 2.5 | |
313 | doesn't do (obviously, since it doesn't know about ipython).""" |
|
314 | doesn't do (obviously, since it doesn't know about ipython).""" | |
314 |
|
315 | |||
315 | def __init__(self,shell,name): |
|
316 | def __init__(self,shell,name): | |
316 | self.shell = shell |
|
317 | self.shell = shell | |
317 | self.name = name |
|
318 | self.name = name | |
318 |
|
319 | |||
319 | def __repr__(self): |
|
320 | def __repr__(self): | |
320 | return 'Type %s() to exit.' % self.name |
|
321 | return 'Type %s() to exit.' % self.name | |
321 | __str__ = __repr__ |
|
322 | __str__ = __repr__ | |
322 |
|
323 | |||
323 | def __call__(self): |
|
324 | def __call__(self): | |
324 | self.shell.exit() |
|
325 | self.shell.exit() | |
325 |
|
326 | |||
326 | class InputList(list): |
|
327 | class InputList(list): | |
327 | """Class to store user input. |
|
328 | """Class to store user input. | |
328 |
|
329 | |||
329 | It's basically a list, but slices return a string instead of a list, thus |
|
330 | It's basically a list, but slices return a string instead of a list, thus | |
330 | allowing things like (assuming 'In' is an instance): |
|
331 | allowing things like (assuming 'In' is an instance): | |
331 |
|
332 | |||
332 | exec In[4:7] |
|
333 | exec In[4:7] | |
333 |
|
334 | |||
334 | or |
|
335 | or | |
335 |
|
336 | |||
336 | exec In[5:9] + In[14] + In[21:25]""" |
|
337 | exec In[5:9] + In[14] + In[21:25]""" | |
337 |
|
338 | |||
338 | def __getslice__(self,i,j): |
|
339 | def __getslice__(self,i,j): | |
339 | return ''.join(list.__getslice__(self,i,j)) |
|
340 | return ''.join(list.__getslice__(self,i,j)) | |
340 |
|
341 | |||
341 | class SyntaxTB(ultraTB.ListTB): |
|
342 | class SyntaxTB(ultraTB.ListTB): | |
342 | """Extension which holds some state: the last exception value""" |
|
343 | """Extension which holds some state: the last exception value""" | |
343 |
|
344 | |||
344 | def __init__(self,color_scheme = 'NoColor'): |
|
345 | def __init__(self,color_scheme = 'NoColor'): | |
345 | ultraTB.ListTB.__init__(self,color_scheme) |
|
346 | ultraTB.ListTB.__init__(self,color_scheme) | |
346 | self.last_syntax_error = None |
|
347 | self.last_syntax_error = None | |
347 |
|
348 | |||
348 | def __call__(self, etype, value, elist): |
|
349 | def __call__(self, etype, value, elist): | |
349 | self.last_syntax_error = value |
|
350 | self.last_syntax_error = value | |
350 | ultraTB.ListTB.__call__(self,etype,value,elist) |
|
351 | ultraTB.ListTB.__call__(self,etype,value,elist) | |
351 |
|
352 | |||
352 | def clear_err_state(self): |
|
353 | def clear_err_state(self): | |
353 | """Return the current error state and clear it""" |
|
354 | """Return the current error state and clear it""" | |
354 | e = self.last_syntax_error |
|
355 | e = self.last_syntax_error | |
355 | self.last_syntax_error = None |
|
356 | self.last_syntax_error = None | |
356 | return e |
|
357 | return e | |
357 |
|
358 | |||
358 | #**************************************************************************** |
|
359 | #**************************************************************************** | |
359 | # Main IPython class |
|
360 | # Main IPython class | |
360 |
|
361 | |||
361 | # FIXME: the Magic class is a mixin for now, and will unfortunately remain so |
|
362 | # FIXME: the Magic class is a mixin for now, and will unfortunately remain so | |
362 | # until a full rewrite is made. I've cleaned all cross-class uses of |
|
363 | # until a full rewrite is made. I've cleaned all cross-class uses of | |
363 | # attributes and methods, but too much user code out there relies on the |
|
364 | # attributes and methods, but too much user code out there relies on the | |
364 | # equlity %foo == __IP.magic_foo, so I can't actually remove the mixin usage. |
|
365 | # equlity %foo == __IP.magic_foo, so I can't actually remove the mixin usage. | |
365 | # |
|
366 | # | |
366 | # But at least now, all the pieces have been separated and we could, in |
|
367 | # But at least now, all the pieces have been separated and we could, in | |
367 | # principle, stop using the mixin. This will ease the transition to the |
|
368 | # principle, stop using the mixin. This will ease the transition to the | |
368 | # chainsaw branch. |
|
369 | # chainsaw branch. | |
369 |
|
370 | |||
370 | # For reference, the following is the list of 'self.foo' uses in the Magic |
|
371 | # For reference, the following is the list of 'self.foo' uses in the Magic | |
371 | # class as of 2005-12-28. These are names we CAN'T use in the main ipython |
|
372 | # class as of 2005-12-28. These are names we CAN'T use in the main ipython | |
372 | # class, to prevent clashes. |
|
373 | # class, to prevent clashes. | |
373 |
|
374 | |||
374 | # ['self.__class__', 'self.__dict__', 'self._inspect', 'self._ofind', |
|
375 | # ['self.__class__', 'self.__dict__', 'self._inspect', 'self._ofind', | |
375 | # 'self.arg_err', 'self.extract_input', 'self.format_', 'self.lsmagic', |
|
376 | # 'self.arg_err', 'self.extract_input', 'self.format_', 'self.lsmagic', | |
376 | # 'self.magic_', 'self.options_table', 'self.parse', 'self.shell', |
|
377 | # 'self.magic_', 'self.options_table', 'self.parse', 'self.shell', | |
377 | # 'self.value'] |
|
378 | # 'self.value'] | |
378 |
|
379 | |||
379 | class InteractiveShell(object,Magic): |
|
380 | class InteractiveShell(object,Magic): | |
380 | """An enhanced console for Python.""" |
|
381 | """An enhanced console for Python.""" | |
381 |
|
382 | |||
382 | # class attribute to indicate whether the class supports threads or not. |
|
383 | # class attribute to indicate whether the class supports threads or not. | |
383 | # Subclasses with thread support should override this as needed. |
|
384 | # Subclasses with thread support should override this as needed. | |
384 | isthreaded = False |
|
385 | isthreaded = False | |
385 |
|
386 | |||
386 | def __init__(self,name,usage=None,rc=Struct(opts=None,args=None), |
|
387 | def __init__(self,name,usage=None,rc=Struct(opts=None,args=None), | |
387 | user_ns=None,user_global_ns=None,banner2='', |
|
388 | user_ns=None,user_global_ns=None,banner2='', | |
388 | custom_exceptions=((),None),embedded=False): |
|
389 | custom_exceptions=((),None),embedded=False): | |
389 |
|
390 | |||
390 | # log system |
|
391 | # log system | |
391 | self.logger = Logger(self,logfname='ipython_log.py',logmode='rotate') |
|
392 | self.logger = Logger(self,logfname='ipython_log.py',logmode='rotate') | |
392 |
|
393 | |||
393 | # Job manager (for jobs run as background threads) |
|
394 | # Job manager (for jobs run as background threads) | |
394 | self.jobs = BackgroundJobManager() |
|
395 | self.jobs = BackgroundJobManager() | |
395 |
|
396 | |||
396 | # Store the actual shell's name |
|
397 | # Store the actual shell's name | |
397 | self.name = name |
|
398 | self.name = name | |
398 | self.more = False |
|
399 | self.more = False | |
399 |
|
400 | |||
400 | # We need to know whether the instance is meant for embedding, since |
|
401 | # We need to know whether the instance is meant for embedding, since | |
401 | # global/local namespaces need to be handled differently in that case |
|
402 | # global/local namespaces need to be handled differently in that case | |
402 | self.embedded = embedded |
|
403 | self.embedded = embedded | |
403 | if embedded: |
|
404 | if embedded: | |
404 | # Control variable so users can, from within the embedded instance, |
|
405 | # Control variable so users can, from within the embedded instance, | |
405 | # permanently deactivate it. |
|
406 | # permanently deactivate it. | |
406 | self.embedded_active = True |
|
407 | self.embedded_active = True | |
407 |
|
408 | |||
408 | # command compiler |
|
409 | # command compiler | |
409 | self.compile = codeop.CommandCompiler() |
|
410 | self.compile = codeop.CommandCompiler() | |
410 |
|
411 | |||
411 | # User input buffer |
|
412 | # User input buffer | |
412 | self.buffer = [] |
|
413 | self.buffer = [] | |
413 |
|
414 | |||
414 | # Default name given in compilation of code |
|
415 | # Default name given in compilation of code | |
415 | self.filename = '<ipython console>' |
|
416 | self.filename = '<ipython console>' | |
416 |
|
417 | |||
417 | # Install our own quitter instead of the builtins. For python2.3-2.4, |
|
418 | # Install our own quitter instead of the builtins. For python2.3-2.4, | |
418 | # this brings in behavior like 2.5, and for 2.5 it's identical. |
|
419 | # this brings in behavior like 2.5, and for 2.5 it's identical. | |
419 | __builtin__.exit = Quitter(self,'exit') |
|
420 | __builtin__.exit = Quitter(self,'exit') | |
420 | __builtin__.quit = Quitter(self,'quit') |
|
421 | __builtin__.quit = Quitter(self,'quit') | |
421 |
|
422 | |||
422 | # Make an empty namespace, which extension writers can rely on both |
|
423 | # Make an empty namespace, which extension writers can rely on both | |
423 | # existing and NEVER being used by ipython itself. This gives them a |
|
424 | # existing and NEVER being used by ipython itself. This gives them a | |
424 | # convenient location for storing additional information and state |
|
425 | # convenient location for storing additional information and state | |
425 | # their extensions may require, without fear of collisions with other |
|
426 | # their extensions may require, without fear of collisions with other | |
426 | # ipython names that may develop later. |
|
427 | # ipython names that may develop later. | |
427 | self.meta = Struct() |
|
428 | self.meta = Struct() | |
428 |
|
429 | |||
429 | # Create the namespace where the user will operate. user_ns is |
|
430 | # Create the namespace where the user will operate. user_ns is | |
430 | # normally the only one used, and it is passed to the exec calls as |
|
431 | # normally the only one used, and it is passed to the exec calls as | |
431 | # the locals argument. But we do carry a user_global_ns namespace |
|
432 | # the locals argument. But we do carry a user_global_ns namespace | |
432 | # given as the exec 'globals' argument, This is useful in embedding |
|
433 | # given as the exec 'globals' argument, This is useful in embedding | |
433 | # situations where the ipython shell opens in a context where the |
|
434 | # situations where the ipython shell opens in a context where the | |
434 | # distinction between locals and globals is meaningful. For |
|
435 | # distinction between locals and globals is meaningful. For | |
435 | # non-embedded contexts, it is just the same object as the user_ns dict. |
|
436 | # non-embedded contexts, it is just the same object as the user_ns dict. | |
436 |
|
437 | |||
437 | # FIXME. For some strange reason, __builtins__ is showing up at user |
|
438 | # FIXME. For some strange reason, __builtins__ is showing up at user | |
438 | # level as a dict instead of a module. This is a manual fix, but I |
|
439 | # level as a dict instead of a module. This is a manual fix, but I | |
439 | # should really track down where the problem is coming from. Alex |
|
440 | # should really track down where the problem is coming from. Alex | |
440 | # Schmolck reported this problem first. |
|
441 | # Schmolck reported this problem first. | |
441 |
|
442 | |||
442 | # A useful post by Alex Martelli on this topic: |
|
443 | # A useful post by Alex Martelli on this topic: | |
443 | # Re: inconsistent value from __builtins__ |
|
444 | # Re: inconsistent value from __builtins__ | |
444 | # Von: Alex Martelli <aleaxit@yahoo.com> |
|
445 | # Von: Alex Martelli <aleaxit@yahoo.com> | |
445 | # Datum: Freitag 01 Oktober 2004 04:45:34 nachmittags/abends |
|
446 | # Datum: Freitag 01 Oktober 2004 04:45:34 nachmittags/abends | |
446 | # Gruppen: comp.lang.python |
|
447 | # Gruppen: comp.lang.python | |
447 |
|
448 | |||
448 | # Michael Hohn <hohn@hooknose.lbl.gov> wrote: |
|
449 | # Michael Hohn <hohn@hooknose.lbl.gov> wrote: | |
449 | # > >>> print type(builtin_check.get_global_binding('__builtins__')) |
|
450 | # > >>> print type(builtin_check.get_global_binding('__builtins__')) | |
450 | # > <type 'dict'> |
|
451 | # > <type 'dict'> | |
451 | # > >>> print type(__builtins__) |
|
452 | # > >>> print type(__builtins__) | |
452 | # > <type 'module'> |
|
453 | # > <type 'module'> | |
453 | # > Is this difference in return value intentional? |
|
454 | # > Is this difference in return value intentional? | |
454 |
|
455 | |||
455 | # Well, it's documented that '__builtins__' can be either a dictionary |
|
456 | # Well, it's documented that '__builtins__' can be either a dictionary | |
456 | # or a module, and it's been that way for a long time. Whether it's |
|
457 | # or a module, and it's been that way for a long time. Whether it's | |
457 | # intentional (or sensible), I don't know. In any case, the idea is |
|
458 | # intentional (or sensible), I don't know. In any case, the idea is | |
458 | # that if you need to access the built-in namespace directly, you |
|
459 | # that if you need to access the built-in namespace directly, you | |
459 | # should start with "import __builtin__" (note, no 's') which will |
|
460 | # should start with "import __builtin__" (note, no 's') which will | |
460 | # definitely give you a module. Yeah, it's somewhat confusing:-(. |
|
461 | # definitely give you a module. Yeah, it's somewhat confusing:-(. | |
461 |
|
462 | |||
462 | # These routines return properly built dicts as needed by the rest of |
|
463 | # These routines return properly built dicts as needed by the rest of | |
463 | # the code, and can also be used by extension writers to generate |
|
464 | # the code, and can also be used by extension writers to generate | |
464 | # properly initialized namespaces. |
|
465 | # properly initialized namespaces. | |
465 | user_ns, user_global_ns = IPython.ipapi.make_user_namespaces(user_ns, |
|
466 | user_ns, user_global_ns = IPython.ipapi.make_user_namespaces(user_ns, | |
466 | user_global_ns) |
|
467 | user_global_ns) | |
467 |
|
468 | |||
468 | # Assign namespaces |
|
469 | # Assign namespaces | |
469 | # This is the namespace where all normal user variables live |
|
470 | # This is the namespace where all normal user variables live | |
470 | self.user_ns = user_ns |
|
471 | self.user_ns = user_ns | |
471 | self.user_global_ns = user_global_ns |
|
472 | self.user_global_ns = user_global_ns | |
472 |
|
473 | |||
473 | # An auxiliary namespace that checks what parts of the user_ns were |
|
474 | # An auxiliary namespace that checks what parts of the user_ns were | |
474 | # loaded at startup, so we can list later only variables defined in |
|
475 | # loaded at startup, so we can list later only variables defined in | |
475 | # actual interactive use. Since it is always a subset of user_ns, it |
|
476 | # actual interactive use. Since it is always a subset of user_ns, it | |
476 | # doesn't need to be seaparately tracked in the ns_table |
|
477 | # doesn't need to be seaparately tracked in the ns_table | |
477 | self.user_config_ns = {} |
|
478 | self.user_config_ns = {} | |
478 |
|
479 | |||
479 | # A namespace to keep track of internal data structures to prevent |
|
480 | # A namespace to keep track of internal data structures to prevent | |
480 | # them from cluttering user-visible stuff. Will be updated later |
|
481 | # them from cluttering user-visible stuff. Will be updated later | |
481 | self.internal_ns = {} |
|
482 | self.internal_ns = {} | |
482 |
|
483 | |||
483 | # Namespace of system aliases. Each entry in the alias |
|
484 | # Namespace of system aliases. Each entry in the alias | |
484 | # table must be a 2-tuple of the form (N,name), where N is the number |
|
485 | # table must be a 2-tuple of the form (N,name), where N is the number | |
485 | # of positional arguments of the alias. |
|
486 | # of positional arguments of the alias. | |
486 | self.alias_table = {} |
|
487 | self.alias_table = {} | |
487 |
|
488 | |||
488 | # Now that FakeModule produces a real module, we've run into a nasty |
|
489 | # Now that FakeModule produces a real module, we've run into a nasty | |
489 | # problem: after script execution (via %run), the module where the user |
|
490 | # problem: after script execution (via %run), the module where the user | |
490 | # code ran is deleted. Now that this object is a true module (needed |
|
491 | # code ran is deleted. Now that this object is a true module (needed | |
491 | # so docetst and other tools work correctly), the Python module |
|
492 | # so docetst and other tools work correctly), the Python module | |
492 | # teardown mechanism runs over it, and sets to None every variable |
|
493 | # teardown mechanism runs over it, and sets to None every variable | |
493 | # present in that module. Top-level references to objects from the |
|
494 | # present in that module. Top-level references to objects from the | |
494 | # script survive, because the user_ns is updated with them. However, |
|
495 | # script survive, because the user_ns is updated with them. However, | |
495 | # calling functions defined in the script that use other things from |
|
496 | # calling functions defined in the script that use other things from | |
496 | # the script will fail, because the function's closure had references |
|
497 | # the script will fail, because the function's closure had references | |
497 | # to the original objects, which are now all None. So we must protect |
|
498 | # to the original objects, which are now all None. So we must protect | |
498 | # these modules from deletion by keeping a cache. |
|
499 | # these modules from deletion by keeping a cache. | |
499 | # |
|
500 | # | |
500 | # To avoid keeping stale modules around (we only need the one from the |
|
501 | # To avoid keeping stale modules around (we only need the one from the | |
501 | # last run), we use a dict keyed with the full path to the script, so |
|
502 | # last run), we use a dict keyed with the full path to the script, so | |
502 | # only the last version of the module is held in the cache. Note, |
|
503 | # only the last version of the module is held in the cache. Note, | |
503 | # however, that we must cache the module *namespace contents* (their |
|
504 | # however, that we must cache the module *namespace contents* (their | |
504 | # __dict__). Because if we try to cache the actual modules, old ones |
|
505 | # __dict__). Because if we try to cache the actual modules, old ones | |
505 | # (uncached) could be destroyed while still holding references (such as |
|
506 | # (uncached) could be destroyed while still holding references (such as | |
506 | # those held by GUI objects that tend to be long-lived)> |
|
507 | # those held by GUI objects that tend to be long-lived)> | |
507 | # |
|
508 | # | |
508 | # The %reset command will flush this cache. See the cache_main_mod() |
|
509 | # The %reset command will flush this cache. See the cache_main_mod() | |
509 | # and clear_main_mod_cache() methods for details on use. |
|
510 | # and clear_main_mod_cache() methods for details on use. | |
510 |
|
511 | |||
511 | # This is the cache used for 'main' namespaces |
|
512 | # This is the cache used for 'main' namespaces | |
512 | self._main_ns_cache = {} |
|
513 | self._main_ns_cache = {} | |
513 | # And this is the single instance of FakeModule whose __dict__ we keep |
|
514 | # And this is the single instance of FakeModule whose __dict__ we keep | |
514 | # copying and clearing for reuse on each %run |
|
515 | # copying and clearing for reuse on each %run | |
515 | self._user_main_module = FakeModule() |
|
516 | self._user_main_module = FakeModule() | |
516 |
|
517 | |||
517 | # A table holding all the namespaces IPython deals with, so that |
|
518 | # A table holding all the namespaces IPython deals with, so that | |
518 | # introspection facilities can search easily. |
|
519 | # introspection facilities can search easily. | |
519 | self.ns_table = {'user':user_ns, |
|
520 | self.ns_table = {'user':user_ns, | |
520 | 'user_global':user_global_ns, |
|
521 | 'user_global':user_global_ns, | |
521 | 'alias':self.alias_table, |
|
522 | 'alias':self.alias_table, | |
522 | 'internal':self.internal_ns, |
|
523 | 'internal':self.internal_ns, | |
523 | 'builtin':__builtin__.__dict__ |
|
524 | 'builtin':__builtin__.__dict__ | |
524 | } |
|
525 | } | |
525 |
|
526 | |||
526 | # Similarly, track all namespaces where references can be held and that |
|
527 | # Similarly, track all namespaces where references can be held and that | |
527 | # we can safely clear (so it can NOT include builtin). This one can be |
|
528 | # we can safely clear (so it can NOT include builtin). This one can be | |
528 | # a simple list. |
|
529 | # a simple list. | |
529 | self.ns_refs_table = [ user_ns, user_global_ns, self.user_config_ns, |
|
530 | self.ns_refs_table = [ user_ns, user_global_ns, self.user_config_ns, | |
530 | self.alias_table, self.internal_ns, |
|
531 | self.alias_table, self.internal_ns, | |
531 | self._main_ns_cache ] |
|
532 | self._main_ns_cache ] | |
532 |
|
533 | |||
533 | # We need to insert into sys.modules something that looks like a |
|
534 | # We need to insert into sys.modules something that looks like a | |
534 | # module but which accesses the IPython namespace, for shelve and |
|
535 | # module but which accesses the IPython namespace, for shelve and | |
535 | # pickle to work interactively. Normally they rely on getting |
|
536 | # pickle to work interactively. Normally they rely on getting | |
536 | # everything out of __main__, but for embedding purposes each IPython |
|
537 | # everything out of __main__, but for embedding purposes each IPython | |
537 | # instance has its own private namespace, so we can't go shoving |
|
538 | # instance has its own private namespace, so we can't go shoving | |
538 | # everything into __main__. |
|
539 | # everything into __main__. | |
539 |
|
540 | |||
540 | # note, however, that we should only do this for non-embedded |
|
541 | # note, however, that we should only do this for non-embedded | |
541 | # ipythons, which really mimic the __main__.__dict__ with their own |
|
542 | # ipythons, which really mimic the __main__.__dict__ with their own | |
542 | # namespace. Embedded instances, on the other hand, should not do |
|
543 | # namespace. Embedded instances, on the other hand, should not do | |
543 | # this because they need to manage the user local/global namespaces |
|
544 | # this because they need to manage the user local/global namespaces | |
544 | # only, but they live within a 'normal' __main__ (meaning, they |
|
545 | # only, but they live within a 'normal' __main__ (meaning, they | |
545 | # shouldn't overtake the execution environment of the script they're |
|
546 | # shouldn't overtake the execution environment of the script they're | |
546 | # embedded in). |
|
547 | # embedded in). | |
547 |
|
548 | |||
548 | if not embedded: |
|
549 | if not embedded: | |
549 | try: |
|
550 | try: | |
550 | main_name = self.user_ns['__name__'] |
|
551 | main_name = self.user_ns['__name__'] | |
551 | except KeyError: |
|
552 | except KeyError: | |
552 | raise KeyError,'user_ns dictionary MUST have a "__name__" key' |
|
553 | raise KeyError,'user_ns dictionary MUST have a "__name__" key' | |
553 | else: |
|
554 | else: | |
554 | #print "pickle hack in place" # dbg |
|
555 | #print "pickle hack in place" # dbg | |
555 | #print 'main_name:',main_name # dbg |
|
556 | #print 'main_name:',main_name # dbg | |
556 | sys.modules[main_name] = FakeModule(self.user_ns) |
|
557 | sys.modules[main_name] = FakeModule(self.user_ns) | |
557 |
|
558 | |||
558 | # List of input with multi-line handling. |
|
559 | # List of input with multi-line handling. | |
559 | self.input_hist = InputList() |
|
560 | self.input_hist = InputList() | |
560 | # This one will hold the 'raw' input history, without any |
|
561 | # This one will hold the 'raw' input history, without any | |
561 | # pre-processing. This will allow users to retrieve the input just as |
|
562 | # pre-processing. This will allow users to retrieve the input just as | |
562 | # it was exactly typed in by the user, with %hist -r. |
|
563 | # it was exactly typed in by the user, with %hist -r. | |
563 | self.input_hist_raw = InputList() |
|
564 | self.input_hist_raw = InputList() | |
564 |
|
565 | |||
565 | # list of visited directories |
|
566 | # list of visited directories | |
566 | try: |
|
567 | try: | |
567 | self.dir_hist = [os.getcwd()] |
|
568 | self.dir_hist = [os.getcwd()] | |
568 | except OSError: |
|
569 | except OSError: | |
569 | self.dir_hist = [] |
|
570 | self.dir_hist = [] | |
570 |
|
571 | |||
571 | # dict of output history |
|
572 | # dict of output history | |
572 | self.output_hist = {} |
|
573 | self.output_hist = {} | |
573 |
|
574 | |||
574 | # Get system encoding at startup time. Certain terminals (like Emacs |
|
575 | # Get system encoding at startup time. Certain terminals (like Emacs | |
575 | # under Win32 have it set to None, and we need to have a known valid |
|
576 | # under Win32 have it set to None, and we need to have a known valid | |
576 | # encoding to use in the raw_input() method |
|
577 | # encoding to use in the raw_input() method | |
577 | try: |
|
578 | try: | |
578 | self.stdin_encoding = sys.stdin.encoding or 'ascii' |
|
579 | self.stdin_encoding = sys.stdin.encoding or 'ascii' | |
579 | except AttributeError: |
|
580 | except AttributeError: | |
580 | self.stdin_encoding = 'ascii' |
|
581 | self.stdin_encoding = 'ascii' | |
581 |
|
582 | |||
582 | # dict of things NOT to alias (keywords, builtins and some magics) |
|
583 | # dict of things NOT to alias (keywords, builtins and some magics) | |
583 | no_alias = {} |
|
584 | no_alias = {} | |
584 | no_alias_magics = ['cd','popd','pushd','dhist','alias','unalias'] |
|
585 | no_alias_magics = ['cd','popd','pushd','dhist','alias','unalias'] | |
585 | for key in keyword.kwlist + no_alias_magics: |
|
586 | for key in keyword.kwlist + no_alias_magics: | |
586 | no_alias[key] = 1 |
|
587 | no_alias[key] = 1 | |
587 | no_alias.update(__builtin__.__dict__) |
|
588 | no_alias.update(__builtin__.__dict__) | |
588 | self.no_alias = no_alias |
|
589 | self.no_alias = no_alias | |
589 |
|
590 | |||
590 | # Object variable to store code object waiting execution. This is |
|
591 | # Object variable to store code object waiting execution. This is | |
591 | # used mainly by the multithreaded shells, but it can come in handy in |
|
592 | # used mainly by the multithreaded shells, but it can come in handy in | |
592 | # other situations. No need to use a Queue here, since it's a single |
|
593 | # other situations. No need to use a Queue here, since it's a single | |
593 | # item which gets cleared once run. |
|
594 | # item which gets cleared once run. | |
594 | self.code_to_run = None |
|
595 | self.code_to_run = None | |
595 |
|
596 | |||
596 | # escapes for automatic behavior on the command line |
|
597 | # escapes for automatic behavior on the command line | |
597 | self.ESC_SHELL = '!' |
|
598 | self.ESC_SHELL = '!' | |
598 | self.ESC_SH_CAP = '!!' |
|
599 | self.ESC_SH_CAP = '!!' | |
599 | self.ESC_HELP = '?' |
|
600 | self.ESC_HELP = '?' | |
600 | self.ESC_MAGIC = '%' |
|
601 | self.ESC_MAGIC = '%' | |
601 | self.ESC_QUOTE = ',' |
|
602 | self.ESC_QUOTE = ',' | |
602 | self.ESC_QUOTE2 = ';' |
|
603 | self.ESC_QUOTE2 = ';' | |
603 | self.ESC_PAREN = '/' |
|
604 | self.ESC_PAREN = '/' | |
604 |
|
605 | |||
605 | # And their associated handlers |
|
606 | # And their associated handlers | |
606 | self.esc_handlers = {self.ESC_PAREN : self.handle_auto, |
|
607 | self.esc_handlers = {self.ESC_PAREN : self.handle_auto, | |
607 | self.ESC_QUOTE : self.handle_auto, |
|
608 | self.ESC_QUOTE : self.handle_auto, | |
608 | self.ESC_QUOTE2 : self.handle_auto, |
|
609 | self.ESC_QUOTE2 : self.handle_auto, | |
609 | self.ESC_MAGIC : self.handle_magic, |
|
610 | self.ESC_MAGIC : self.handle_magic, | |
610 | self.ESC_HELP : self.handle_help, |
|
611 | self.ESC_HELP : self.handle_help, | |
611 | self.ESC_SHELL : self.handle_shell_escape, |
|
612 | self.ESC_SHELL : self.handle_shell_escape, | |
612 | self.ESC_SH_CAP : self.handle_shell_escape, |
|
613 | self.ESC_SH_CAP : self.handle_shell_escape, | |
613 | } |
|
614 | } | |
614 |
|
615 | |||
615 | # class initializations |
|
616 | # class initializations | |
616 | Magic.__init__(self,self) |
|
617 | Magic.__init__(self,self) | |
617 |
|
618 | |||
618 | # Python source parser/formatter for syntax highlighting |
|
619 | # Python source parser/formatter for syntax highlighting | |
619 | pyformat = PyColorize.Parser().format |
|
620 | pyformat = PyColorize.Parser().format | |
620 | self.pycolorize = lambda src: pyformat(src,'str',self.rc['colors']) |
|
621 | self.pycolorize = lambda src: pyformat(src,'str',self.rc['colors']) | |
621 |
|
622 | |||
622 | # hooks holds pointers used for user-side customizations |
|
623 | # hooks holds pointers used for user-side customizations | |
623 | self.hooks = Struct() |
|
624 | self.hooks = Struct() | |
624 |
|
625 | |||
625 | self.strdispatchers = {} |
|
626 | self.strdispatchers = {} | |
626 |
|
627 | |||
627 | # Set all default hooks, defined in the IPython.hooks module. |
|
628 | # Set all default hooks, defined in the IPython.hooks module. | |
628 | hooks = IPython.hooks |
|
629 | hooks = IPython.hooks | |
629 | for hook_name in hooks.__all__: |
|
630 | for hook_name in hooks.__all__: | |
630 | # default hooks have priority 100, i.e. low; user hooks should have |
|
631 | # default hooks have priority 100, i.e. low; user hooks should have | |
631 | # 0-100 priority |
|
632 | # 0-100 priority | |
632 | self.set_hook(hook_name,getattr(hooks,hook_name), 100) |
|
633 | self.set_hook(hook_name,getattr(hooks,hook_name), 100) | |
633 | #print "bound hook",hook_name |
|
634 | #print "bound hook",hook_name | |
634 |
|
635 | |||
635 | # Flag to mark unconditional exit |
|
636 | # Flag to mark unconditional exit | |
636 | self.exit_now = False |
|
637 | self.exit_now = False | |
637 |
|
638 | |||
638 | self.usage_min = """\ |
|
639 | self.usage_min = """\ | |
639 | An enhanced console for Python. |
|
640 | An enhanced console for Python. | |
640 | Some of its features are: |
|
641 | Some of its features are: | |
641 | - Readline support if the readline library is present. |
|
642 | - Readline support if the readline library is present. | |
642 | - Tab completion in the local namespace. |
|
643 | - Tab completion in the local namespace. | |
643 | - Logging of input, see command-line options. |
|
644 | - Logging of input, see command-line options. | |
644 | - System shell escape via ! , eg !ls. |
|
645 | - System shell escape via ! , eg !ls. | |
645 | - Magic commands, starting with a % (like %ls, %pwd, %cd, etc.) |
|
646 | - Magic commands, starting with a % (like %ls, %pwd, %cd, etc.) | |
646 | - Keeps track of locally defined variables via %who, %whos. |
|
647 | - Keeps track of locally defined variables via %who, %whos. | |
647 | - Show object information with a ? eg ?x or x? (use ?? for more info). |
|
648 | - Show object information with a ? eg ?x or x? (use ?? for more info). | |
648 | """ |
|
649 | """ | |
649 | if usage: self.usage = usage |
|
650 | if usage: self.usage = usage | |
650 | else: self.usage = self.usage_min |
|
651 | else: self.usage = self.usage_min | |
651 |
|
652 | |||
652 | # Storage |
|
653 | # Storage | |
653 | self.rc = rc # This will hold all configuration information |
|
654 | self.rc = rc # This will hold all configuration information | |
654 | self.pager = 'less' |
|
655 | self.pager = 'less' | |
655 | # temporary files used for various purposes. Deleted at exit. |
|
656 | # temporary files used for various purposes. Deleted at exit. | |
656 | self.tempfiles = [] |
|
657 | self.tempfiles = [] | |
657 |
|
658 | |||
658 | # Keep track of readline usage (later set by init_readline) |
|
659 | # Keep track of readline usage (later set by init_readline) | |
659 | self.has_readline = False |
|
660 | self.has_readline = False | |
660 |
|
661 | |||
661 | # template for logfile headers. It gets resolved at runtime by the |
|
662 | # template for logfile headers. It gets resolved at runtime by the | |
662 | # logstart method. |
|
663 | # logstart method. | |
663 | self.loghead_tpl = \ |
|
664 | self.loghead_tpl = \ | |
664 | """#log# Automatic Logger file. *** THIS MUST BE THE FIRST LINE *** |
|
665 | """#log# Automatic Logger file. *** THIS MUST BE THE FIRST LINE *** | |
665 | #log# DO NOT CHANGE THIS LINE OR THE TWO BELOW |
|
666 | #log# DO NOT CHANGE THIS LINE OR THE TWO BELOW | |
666 | #log# opts = %s |
|
667 | #log# opts = %s | |
667 | #log# args = %s |
|
668 | #log# args = %s | |
668 | #log# It is safe to make manual edits below here. |
|
669 | #log# It is safe to make manual edits below here. | |
669 | #log#----------------------------------------------------------------------- |
|
670 | #log#----------------------------------------------------------------------- | |
670 | """ |
|
671 | """ | |
671 | # for pushd/popd management |
|
672 | # for pushd/popd management | |
672 | try: |
|
673 | try: | |
673 | self.home_dir = get_home_dir() |
|
674 | self.home_dir = get_home_dir() | |
674 | except HomeDirError,msg: |
|
675 | except HomeDirError,msg: | |
675 | fatal(msg) |
|
676 | fatal(msg) | |
676 |
|
677 | |||
677 | self.dir_stack = [] |
|
678 | self.dir_stack = [] | |
678 |
|
679 | |||
679 | # Functions to call the underlying shell. |
|
680 | # Functions to call the underlying shell. | |
680 |
|
681 | |||
681 | # The first is similar to os.system, but it doesn't return a value, |
|
682 | # The first is similar to os.system, but it doesn't return a value, | |
682 | # and it allows interpolation of variables in the user's namespace. |
|
683 | # and it allows interpolation of variables in the user's namespace. | |
683 | self.system = lambda cmd: \ |
|
684 | self.system = lambda cmd: \ | |
684 | self.hooks.shell_hook(self.var_expand(cmd,depth=2)) |
|
685 | self.hooks.shell_hook(self.var_expand(cmd,depth=2)) | |
685 |
|
686 | |||
686 | # These are for getoutput and getoutputerror: |
|
687 | # These are for getoutput and getoutputerror: | |
687 | self.getoutput = lambda cmd: \ |
|
688 | self.getoutput = lambda cmd: \ | |
688 | getoutput(self.var_expand(cmd,depth=2), |
|
689 | getoutput(self.var_expand(cmd,depth=2), | |
689 | header=self.rc.system_header, |
|
690 | header=self.rc.system_header, | |
690 | verbose=self.rc.system_verbose) |
|
691 | verbose=self.rc.system_verbose) | |
691 |
|
692 | |||
692 | self.getoutputerror = lambda cmd: \ |
|
693 | self.getoutputerror = lambda cmd: \ | |
693 | getoutputerror(self.var_expand(cmd,depth=2), |
|
694 | getoutputerror(self.var_expand(cmd,depth=2), | |
694 | header=self.rc.system_header, |
|
695 | header=self.rc.system_header, | |
695 | verbose=self.rc.system_verbose) |
|
696 | verbose=self.rc.system_verbose) | |
696 |
|
697 | |||
697 |
|
698 | |||
698 | # keep track of where we started running (mainly for crash post-mortem) |
|
699 | # keep track of where we started running (mainly for crash post-mortem) | |
699 | self.starting_dir = os.getcwd() |
|
700 | self.starting_dir = os.getcwd() | |
700 |
|
701 | |||
701 | # Various switches which can be set |
|
702 | # Various switches which can be set | |
702 | self.CACHELENGTH = 5000 # this is cheap, it's just text |
|
703 | self.CACHELENGTH = 5000 # this is cheap, it's just text | |
703 | self.BANNER = "Python %(version)s on %(platform)s\n" % sys.__dict__ |
|
704 | self.BANNER = "Python %(version)s on %(platform)s\n" % sys.__dict__ | |
704 | self.banner2 = banner2 |
|
705 | self.banner2 = banner2 | |
705 |
|
706 | |||
706 | # TraceBack handlers: |
|
707 | # TraceBack handlers: | |
707 |
|
708 | |||
708 | # Syntax error handler. |
|
709 | # Syntax error handler. | |
709 | self.SyntaxTB = SyntaxTB(color_scheme='NoColor') |
|
710 | self.SyntaxTB = SyntaxTB(color_scheme='NoColor') | |
710 |
|
711 | |||
711 | # The interactive one is initialized with an offset, meaning we always |
|
712 | # The interactive one is initialized with an offset, meaning we always | |
712 | # want to remove the topmost item in the traceback, which is our own |
|
713 | # want to remove the topmost item in the traceback, which is our own | |
713 | # internal code. Valid modes: ['Plain','Context','Verbose'] |
|
714 | # internal code. Valid modes: ['Plain','Context','Verbose'] | |
714 | self.InteractiveTB = ultraTB.AutoFormattedTB(mode = 'Plain', |
|
715 | self.InteractiveTB = ultraTB.AutoFormattedTB(mode = 'Plain', | |
715 | color_scheme='NoColor', |
|
716 | color_scheme='NoColor', | |
716 | tb_offset = 1) |
|
717 | tb_offset = 1) | |
717 |
|
718 | |||
718 | # IPython itself shouldn't crash. This will produce a detailed |
|
719 | # IPython itself shouldn't crash. This will produce a detailed | |
719 | # post-mortem if it does. But we only install the crash handler for |
|
720 | # post-mortem if it does. But we only install the crash handler for | |
720 | # non-threaded shells, the threaded ones use a normal verbose reporter |
|
721 | # non-threaded shells, the threaded ones use a normal verbose reporter | |
721 | # and lose the crash handler. This is because exceptions in the main |
|
722 | # and lose the crash handler. This is because exceptions in the main | |
722 | # thread (such as in GUI code) propagate directly to sys.excepthook, |
|
723 | # thread (such as in GUI code) propagate directly to sys.excepthook, | |
723 | # and there's no point in printing crash dumps for every user exception. |
|
724 | # and there's no point in printing crash dumps for every user exception. | |
724 | if self.isthreaded: |
|
725 | if self.isthreaded: | |
725 | ipCrashHandler = ultraTB.FormattedTB() |
|
726 | ipCrashHandler = ultraTB.FormattedTB() | |
726 | else: |
|
727 | else: | |
727 | from IPython.core import crashhandler |
|
728 | from IPython.core import crashhandler | |
728 | ipCrashHandler = crashhandler.IPythonCrashHandler(self) |
|
729 | ipCrashHandler = crashhandler.IPythonCrashHandler(self) | |
729 | self.set_crash_handler(ipCrashHandler) |
|
730 | self.set_crash_handler(ipCrashHandler) | |
730 |
|
731 | |||
731 | # and add any custom exception handlers the user may have specified |
|
732 | # and add any custom exception handlers the user may have specified | |
732 | self.set_custom_exc(*custom_exceptions) |
|
733 | self.set_custom_exc(*custom_exceptions) | |
733 |
|
734 | |||
734 | # indentation management |
|
735 | # indentation management | |
735 | self.autoindent = False |
|
736 | self.autoindent = False | |
736 | self.indent_current_nsp = 0 |
|
737 | self.indent_current_nsp = 0 | |
737 |
|
738 | |||
738 | # Make some aliases automatically |
|
739 | # Make some aliases automatically | |
739 | # Prepare list of shell aliases to auto-define |
|
740 | # Prepare list of shell aliases to auto-define | |
740 | if os.name == 'posix': |
|
741 | if os.name == 'posix': | |
741 | auto_alias = ('mkdir mkdir', 'rmdir rmdir', |
|
742 | auto_alias = ('mkdir mkdir', 'rmdir rmdir', | |
742 | 'mv mv -i','rm rm -i','cp cp -i', |
|
743 | 'mv mv -i','rm rm -i','cp cp -i', | |
743 | 'cat cat','less less','clear clear', |
|
744 | 'cat cat','less less','clear clear', | |
744 | # a better ls |
|
745 | # a better ls | |
745 | 'ls ls -F', |
|
746 | 'ls ls -F', | |
746 | # long ls |
|
747 | # long ls | |
747 | 'll ls -lF') |
|
748 | 'll ls -lF') | |
748 | # Extra ls aliases with color, which need special treatment on BSD |
|
749 | # Extra ls aliases with color, which need special treatment on BSD | |
749 | # variants |
|
750 | # variants | |
750 | ls_extra = ( # color ls |
|
751 | ls_extra = ( # color ls | |
751 | 'lc ls -F -o --color', |
|
752 | 'lc ls -F -o --color', | |
752 | # ls normal files only |
|
753 | # ls normal files only | |
753 | 'lf ls -F -o --color %l | grep ^-', |
|
754 | 'lf ls -F -o --color %l | grep ^-', | |
754 | # ls symbolic links |
|
755 | # ls symbolic links | |
755 | 'lk ls -F -o --color %l | grep ^l', |
|
756 | 'lk ls -F -o --color %l | grep ^l', | |
756 | # directories or links to directories, |
|
757 | # directories or links to directories, | |
757 | 'ldir ls -F -o --color %l | grep /$', |
|
758 | 'ldir ls -F -o --color %l | grep /$', | |
758 | # things which are executable |
|
759 | # things which are executable | |
759 | 'lx ls -F -o --color %l | grep ^-..x', |
|
760 | 'lx ls -F -o --color %l | grep ^-..x', | |
760 | ) |
|
761 | ) | |
761 | # The BSDs don't ship GNU ls, so they don't understand the |
|
762 | # The BSDs don't ship GNU ls, so they don't understand the | |
762 | # --color switch out of the box |
|
763 | # --color switch out of the box | |
763 | if 'bsd' in sys.platform: |
|
764 | if 'bsd' in sys.platform: | |
764 | ls_extra = ( # ls normal files only |
|
765 | ls_extra = ( # ls normal files only | |
765 | 'lf ls -lF | grep ^-', |
|
766 | 'lf ls -lF | grep ^-', | |
766 | # ls symbolic links |
|
767 | # ls symbolic links | |
767 | 'lk ls -lF | grep ^l', |
|
768 | 'lk ls -lF | grep ^l', | |
768 | # directories or links to directories, |
|
769 | # directories or links to directories, | |
769 | 'ldir ls -lF | grep /$', |
|
770 | 'ldir ls -lF | grep /$', | |
770 | # things which are executable |
|
771 | # things which are executable | |
771 | 'lx ls -lF | grep ^-..x', |
|
772 | 'lx ls -lF | grep ^-..x', | |
772 | ) |
|
773 | ) | |
773 | auto_alias = auto_alias + ls_extra |
|
774 | auto_alias = auto_alias + ls_extra | |
774 | elif os.name in ['nt','dos']: |
|
775 | elif os.name in ['nt','dos']: | |
775 | auto_alias = ('ls dir /on', |
|
776 | auto_alias = ('ls dir /on', | |
776 | 'ddir dir /ad /on', 'ldir dir /ad /on', |
|
777 | 'ddir dir /ad /on', 'ldir dir /ad /on', | |
777 | 'mkdir mkdir','rmdir rmdir','echo echo', |
|
778 | 'mkdir mkdir','rmdir rmdir','echo echo', | |
778 | 'ren ren','cls cls','copy copy') |
|
779 | 'ren ren','cls cls','copy copy') | |
779 | else: |
|
780 | else: | |
780 | auto_alias = () |
|
781 | auto_alias = () | |
781 | self.auto_alias = [s.split(None,1) for s in auto_alias] |
|
782 | self.auto_alias = [s.split(None,1) for s in auto_alias] | |
782 |
|
783 | |||
783 | # Produce a public API instance |
|
784 | # Produce a public API instance | |
784 | self.api = IPython.ipapi.IPApi(self) |
|
785 | self.api = IPython.ipapi.IPApi(self) | |
785 |
|
786 | |||
786 | # Initialize all user-visible namespaces |
|
787 | # Initialize all user-visible namespaces | |
787 | self.init_namespaces() |
|
788 | self.init_namespaces() | |
788 |
|
789 | |||
789 | # Call the actual (public) initializer |
|
790 | # Call the actual (public) initializer | |
790 | self.init_auto_alias() |
|
791 | self.init_auto_alias() | |
791 |
|
792 | |||
792 | # track which builtins we add, so we can clean up later |
|
793 | # track which builtins we add, so we can clean up later | |
793 | self.builtins_added = {} |
|
794 | self.builtins_added = {} | |
794 | # This method will add the necessary builtins for operation, but |
|
795 | # This method will add the necessary builtins for operation, but | |
795 | # tracking what it did via the builtins_added dict. |
|
796 | # tracking what it did via the builtins_added dict. | |
796 |
|
797 | |||
797 | #TODO: remove this, redundant |
|
798 | #TODO: remove this, redundant | |
798 | self.add_builtins() |
|
799 | self.add_builtins() | |
799 | # end __init__ |
|
800 | # end __init__ | |
800 |
|
801 | |||
801 | def var_expand(self,cmd,depth=0): |
|
802 | def var_expand(self,cmd,depth=0): | |
802 | """Expand python variables in a string. |
|
803 | """Expand python variables in a string. | |
803 |
|
804 | |||
804 | The depth argument indicates how many frames above the caller should |
|
805 | The depth argument indicates how many frames above the caller should | |
805 | be walked to look for the local namespace where to expand variables. |
|
806 | be walked to look for the local namespace where to expand variables. | |
806 |
|
807 | |||
807 | The global namespace for expansion is always the user's interactive |
|
808 | The global namespace for expansion is always the user's interactive | |
808 | namespace. |
|
809 | namespace. | |
809 | """ |
|
810 | """ | |
810 |
|
811 | |||
811 | return str(ItplNS(cmd, |
|
812 | return str(ItplNS(cmd, | |
812 | self.user_ns, # globals |
|
813 | self.user_ns, # globals | |
813 | # Skip our own frame in searching for locals: |
|
814 | # Skip our own frame in searching for locals: | |
814 | sys._getframe(depth+1).f_locals # locals |
|
815 | sys._getframe(depth+1).f_locals # locals | |
815 | )) |
|
816 | )) | |
816 |
|
817 | |||
817 | def pre_config_initialization(self): |
|
818 | def pre_config_initialization(self): | |
818 | """Pre-configuration init method |
|
819 | """Pre-configuration init method | |
819 |
|
820 | |||
820 | This is called before the configuration files are processed to |
|
821 | This is called before the configuration files are processed to | |
821 | prepare the services the config files might need. |
|
822 | prepare the services the config files might need. | |
822 |
|
823 | |||
823 | self.rc already has reasonable default values at this point. |
|
824 | self.rc already has reasonable default values at this point. | |
824 | """ |
|
825 | """ | |
825 | rc = self.rc |
|
826 | rc = self.rc | |
826 | try: |
|
827 | try: | |
827 | self.db = pickleshare.PickleShareDB(rc.ipythondir + "/db") |
|
828 | self.db = pickleshare.PickleShareDB(rc.ipythondir + "/db") | |
828 | except exceptions.UnicodeDecodeError: |
|
829 | except exceptions.UnicodeDecodeError: | |
829 | print "Your ipythondir can't be decoded to unicode!" |
|
830 | print "Your ipythondir can't be decoded to unicode!" | |
830 | print "Please set HOME environment variable to something that" |
|
831 | print "Please set HOME environment variable to something that" | |
831 | print r"only has ASCII characters, e.g. c:\home" |
|
832 | print r"only has ASCII characters, e.g. c:\home" | |
832 | print "Now it is",rc.ipythondir |
|
833 | print "Now it is",rc.ipythondir | |
833 | sys.exit() |
|
834 | sys.exit() | |
834 | self.shadowhist = IPython.history.ShadowHist(self.db) |
|
835 | self.shadowhist = IPython.history.ShadowHist(self.db) | |
835 |
|
836 | |||
836 | def post_config_initialization(self): |
|
837 | def post_config_initialization(self): | |
837 | """Post configuration init method |
|
838 | """Post configuration init method | |
838 |
|
839 | |||
839 | This is called after the configuration files have been processed to |
|
840 | This is called after the configuration files have been processed to | |
840 | 'finalize' the initialization.""" |
|
841 | 'finalize' the initialization.""" | |
841 |
|
842 | |||
842 | rc = self.rc |
|
843 | rc = self.rc | |
843 |
|
844 | |||
844 | # Object inspector |
|
845 | # Object inspector | |
845 | self.inspector = OInspect.Inspector(OInspect.InspectColors, |
|
846 | self.inspector = OInspect.Inspector(OInspect.InspectColors, | |
846 | PyColorize.ANSICodeColors, |
|
847 | PyColorize.ANSICodeColors, | |
847 | 'NoColor', |
|
848 | 'NoColor', | |
848 | rc.object_info_string_level) |
|
849 | rc.object_info_string_level) | |
849 |
|
850 | |||
850 | self.rl_next_input = None |
|
851 | self.rl_next_input = None | |
851 | self.rl_do_indent = False |
|
852 | self.rl_do_indent = False | |
852 | # Load readline proper |
|
853 | # Load readline proper | |
853 | if rc.readline: |
|
854 | if rc.readline: | |
854 | self.init_readline() |
|
855 | self.init_readline() | |
855 |
|
856 | |||
856 | # local shortcut, this is used a LOT |
|
857 | # local shortcut, this is used a LOT | |
857 | self.log = self.logger.log |
|
858 | self.log = self.logger.log | |
858 |
|
859 | |||
859 | # Initialize cache, set in/out prompts and printing system |
|
860 | # Initialize cache, set in/out prompts and printing system | |
860 | self.outputcache = CachedOutput(self, |
|
861 | self.outputcache = CachedOutput(self, | |
861 | rc.cache_size, |
|
862 | rc.cache_size, | |
862 | rc.pprint, |
|
863 | rc.pprint, | |
863 | input_sep = rc.separate_in, |
|
864 | input_sep = rc.separate_in, | |
864 | output_sep = rc.separate_out, |
|
865 | output_sep = rc.separate_out, | |
865 | output_sep2 = rc.separate_out2, |
|
866 | output_sep2 = rc.separate_out2, | |
866 | ps1 = rc.prompt_in1, |
|
867 | ps1 = rc.prompt_in1, | |
867 | ps2 = rc.prompt_in2, |
|
868 | ps2 = rc.prompt_in2, | |
868 | ps_out = rc.prompt_out, |
|
869 | ps_out = rc.prompt_out, | |
869 | pad_left = rc.prompts_pad_left) |
|
870 | pad_left = rc.prompts_pad_left) | |
870 |
|
871 | |||
871 | # user may have over-ridden the default print hook: |
|
872 | # user may have over-ridden the default print hook: | |
872 | try: |
|
873 | try: | |
873 | self.outputcache.__class__.display = self.hooks.display |
|
874 | self.outputcache.__class__.display = self.hooks.display | |
874 | except AttributeError: |
|
875 | except AttributeError: | |
875 | pass |
|
876 | pass | |
876 |
|
877 | |||
877 | # I don't like assigning globally to sys, because it means when |
|
878 | # I don't like assigning globally to sys, because it means when | |
878 | # embedding instances, each embedded instance overrides the previous |
|
879 | # embedding instances, each embedded instance overrides the previous | |
879 | # choice. But sys.displayhook seems to be called internally by exec, |
|
880 | # choice. But sys.displayhook seems to be called internally by exec, | |
880 | # so I don't see a way around it. We first save the original and then |
|
881 | # so I don't see a way around it. We first save the original and then | |
881 | # overwrite it. |
|
882 | # overwrite it. | |
882 | self.sys_displayhook = sys.displayhook |
|
883 | self.sys_displayhook = sys.displayhook | |
883 | sys.displayhook = self.outputcache |
|
884 | sys.displayhook = self.outputcache | |
884 |
|
885 | |||
885 | # Do a proper resetting of doctest, including the necessary displayhook |
|
886 | # Do a proper resetting of doctest, including the necessary displayhook | |
886 | # monkeypatching |
|
887 | # monkeypatching | |
887 | try: |
|
888 | try: | |
888 | doctest_reload() |
|
889 | doctest_reload() | |
889 | except ImportError: |
|
890 | except ImportError: | |
890 | warn("doctest module does not exist.") |
|
891 | warn("doctest module does not exist.") | |
891 |
|
892 | |||
892 | # Set user colors (don't do it in the constructor above so that it |
|
893 | # Set user colors (don't do it in the constructor above so that it | |
893 | # doesn't crash if colors option is invalid) |
|
894 | # doesn't crash if colors option is invalid) | |
894 | self.magic_colors(rc.colors) |
|
895 | self.magic_colors(rc.colors) | |
895 |
|
896 | |||
896 | # Set calling of pdb on exceptions |
|
897 | # Set calling of pdb on exceptions | |
897 | self.call_pdb = rc.pdb |
|
898 | self.call_pdb = rc.pdb | |
898 |
|
899 | |||
899 | # Load user aliases |
|
900 | # Load user aliases | |
900 | for alias in rc.alias: |
|
901 | for alias in rc.alias: | |
901 | self.magic_alias(alias) |
|
902 | self.magic_alias(alias) | |
902 |
|
903 | |||
903 | self.hooks.late_startup_hook() |
|
904 | self.hooks.late_startup_hook() | |
904 |
|
905 | |||
905 | for cmd in self.rc.autoexec: |
|
906 | for cmd in self.rc.autoexec: | |
906 | #print "autoexec>",cmd #dbg |
|
907 | #print "autoexec>",cmd #dbg | |
907 | self.api.runlines(cmd) |
|
908 | self.api.runlines(cmd) | |
908 |
|
909 | |||
909 | batchrun = False |
|
910 | batchrun = False | |
910 | for batchfile in [path(arg) for arg in self.rc.args |
|
911 | for batchfile in [path(arg) for arg in self.rc.args | |
911 | if arg.lower().endswith('.ipy')]: |
|
912 | if arg.lower().endswith('.ipy')]: | |
912 | if not batchfile.isfile(): |
|
913 | if not batchfile.isfile(): | |
913 | print "No such batch file:", batchfile |
|
914 | print "No such batch file:", batchfile | |
914 | continue |
|
915 | continue | |
915 | self.api.runlines(batchfile.text()) |
|
916 | self.api.runlines(batchfile.text()) | |
916 | batchrun = True |
|
917 | batchrun = True | |
917 | # without -i option, exit after running the batch file |
|
918 | # without -i option, exit after running the batch file | |
918 | if batchrun and not self.rc.interact: |
|
919 | if batchrun and not self.rc.interact: | |
919 | self.ask_exit() |
|
920 | self.ask_exit() | |
920 |
|
921 | |||
921 | def init_namespaces(self): |
|
922 | def init_namespaces(self): | |
922 | """Initialize all user-visible namespaces to their minimum defaults. |
|
923 | """Initialize all user-visible namespaces to their minimum defaults. | |
923 |
|
924 | |||
924 | Certain history lists are also initialized here, as they effectively |
|
925 | Certain history lists are also initialized here, as they effectively | |
925 | act as user namespaces. |
|
926 | act as user namespaces. | |
926 |
|
927 | |||
927 | Note |
|
928 | Note | |
928 | ---- |
|
929 | ---- | |
929 | All data structures here are only filled in, they are NOT reset by this |
|
930 | All data structures here are only filled in, they are NOT reset by this | |
930 | method. If they were not empty before, data will simply be added to |
|
931 | method. If they were not empty before, data will simply be added to | |
931 | therm. |
|
932 | therm. | |
932 | """ |
|
933 | """ | |
933 | # The user namespace MUST have a pointer to the shell itself. |
|
934 | # The user namespace MUST have a pointer to the shell itself. | |
934 | self.user_ns[self.name] = self |
|
935 | self.user_ns[self.name] = self | |
935 |
|
936 | |||
936 | # Store the public api instance |
|
937 | # Store the public api instance | |
937 | self.user_ns['_ip'] = self.api |
|
938 | self.user_ns['_ip'] = self.api | |
938 |
|
939 | |||
939 | # make global variables for user access to the histories |
|
940 | # make global variables for user access to the histories | |
940 | self.user_ns['_ih'] = self.input_hist |
|
941 | self.user_ns['_ih'] = self.input_hist | |
941 | self.user_ns['_oh'] = self.output_hist |
|
942 | self.user_ns['_oh'] = self.output_hist | |
942 | self.user_ns['_dh'] = self.dir_hist |
|
943 | self.user_ns['_dh'] = self.dir_hist | |
943 |
|
944 | |||
944 | # user aliases to input and output histories |
|
945 | # user aliases to input and output histories | |
945 | self.user_ns['In'] = self.input_hist |
|
946 | self.user_ns['In'] = self.input_hist | |
946 | self.user_ns['Out'] = self.output_hist |
|
947 | self.user_ns['Out'] = self.output_hist | |
947 |
|
948 | |||
948 | self.user_ns['_sh'] = IPython.shadowns |
|
949 | self.user_ns['_sh'] = IPython.shadowns | |
949 |
|
950 | |||
950 | # Fill the history zero entry, user counter starts at 1 |
|
951 | # Fill the history zero entry, user counter starts at 1 | |
951 | self.input_hist.append('\n') |
|
952 | self.input_hist.append('\n') | |
952 | self.input_hist_raw.append('\n') |
|
953 | self.input_hist_raw.append('\n') | |
953 |
|
954 | |||
954 | def add_builtins(self): |
|
955 | def add_builtins(self): | |
955 | """Store ipython references into the builtin namespace. |
|
956 | """Store ipython references into the builtin namespace. | |
956 |
|
957 | |||
957 | Some parts of ipython operate via builtins injected here, which hold a |
|
958 | Some parts of ipython operate via builtins injected here, which hold a | |
958 | reference to IPython itself.""" |
|
959 | reference to IPython itself.""" | |
959 |
|
960 | |||
960 | # TODO: deprecate all of these, they are unsafe |
|
961 | # TODO: deprecate all of these, they are unsafe | |
961 | builtins_new = dict(__IPYTHON__ = self, |
|
962 | builtins_new = dict(__IPYTHON__ = self, | |
962 | ip_set_hook = self.set_hook, |
|
963 | ip_set_hook = self.set_hook, | |
963 | jobs = self.jobs, |
|
964 | jobs = self.jobs, | |
964 | ipmagic = wrap_deprecated(self.ipmagic,'_ip.magic()'), |
|
965 | ipmagic = wrap_deprecated(self.ipmagic,'_ip.magic()'), | |
965 | ipalias = wrap_deprecated(self.ipalias), |
|
966 | ipalias = wrap_deprecated(self.ipalias), | |
966 | ipsystem = wrap_deprecated(self.ipsystem,'_ip.system()'), |
|
967 | ipsystem = wrap_deprecated(self.ipsystem,'_ip.system()'), | |
967 | #_ip = self.api |
|
968 | #_ip = self.api | |
968 | ) |
|
969 | ) | |
969 | for biname,bival in builtins_new.items(): |
|
970 | for biname,bival in builtins_new.items(): | |
970 | try: |
|
971 | try: | |
971 | # store the orignal value so we can restore it |
|
972 | # store the orignal value so we can restore it | |
972 | self.builtins_added[biname] = __builtin__.__dict__[biname] |
|
973 | self.builtins_added[biname] = __builtin__.__dict__[biname] | |
973 | except KeyError: |
|
974 | except KeyError: | |
974 | # or mark that it wasn't defined, and we'll just delete it at |
|
975 | # or mark that it wasn't defined, and we'll just delete it at | |
975 | # cleanup |
|
976 | # cleanup | |
976 | self.builtins_added[biname] = Undefined |
|
977 | self.builtins_added[biname] = Undefined | |
977 | __builtin__.__dict__[biname] = bival |
|
978 | __builtin__.__dict__[biname] = bival | |
978 |
|
979 | |||
979 | # Keep in the builtins a flag for when IPython is active. We set it |
|
980 | # Keep in the builtins a flag for when IPython is active. We set it | |
980 | # with setdefault so that multiple nested IPythons don't clobber one |
|
981 | # with setdefault so that multiple nested IPythons don't clobber one | |
981 | # another. Each will increase its value by one upon being activated, |
|
982 | # another. Each will increase its value by one upon being activated, | |
982 | # which also gives us a way to determine the nesting level. |
|
983 | # which also gives us a way to determine the nesting level. | |
983 | __builtin__.__dict__.setdefault('__IPYTHON__active',0) |
|
984 | __builtin__.__dict__.setdefault('__IPYTHON__active',0) | |
984 |
|
985 | |||
985 | def clean_builtins(self): |
|
986 | def clean_builtins(self): | |
986 | """Remove any builtins which might have been added by add_builtins, or |
|
987 | """Remove any builtins which might have been added by add_builtins, or | |
987 | restore overwritten ones to their previous values.""" |
|
988 | restore overwritten ones to their previous values.""" | |
988 | for biname,bival in self.builtins_added.items(): |
|
989 | for biname,bival in self.builtins_added.items(): | |
989 | if bival is Undefined: |
|
990 | if bival is Undefined: | |
990 | del __builtin__.__dict__[biname] |
|
991 | del __builtin__.__dict__[biname] | |
991 | else: |
|
992 | else: | |
992 | __builtin__.__dict__[biname] = bival |
|
993 | __builtin__.__dict__[biname] = bival | |
993 | self.builtins_added.clear() |
|
994 | self.builtins_added.clear() | |
994 |
|
995 | |||
995 | def set_hook(self,name,hook, priority = 50, str_key = None, re_key = None): |
|
996 | def set_hook(self,name,hook, priority = 50, str_key = None, re_key = None): | |
996 | """set_hook(name,hook) -> sets an internal IPython hook. |
|
997 | """set_hook(name,hook) -> sets an internal IPython hook. | |
997 |
|
998 | |||
998 | IPython exposes some of its internal API as user-modifiable hooks. By |
|
999 | IPython exposes some of its internal API as user-modifiable hooks. By | |
999 | adding your function to one of these hooks, you can modify IPython's |
|
1000 | adding your function to one of these hooks, you can modify IPython's | |
1000 | behavior to call at runtime your own routines.""" |
|
1001 | behavior to call at runtime your own routines.""" | |
1001 |
|
1002 | |||
1002 | # At some point in the future, this should validate the hook before it |
|
1003 | # At some point in the future, this should validate the hook before it | |
1003 | # accepts it. Probably at least check that the hook takes the number |
|
1004 | # accepts it. Probably at least check that the hook takes the number | |
1004 | # of args it's supposed to. |
|
1005 | # of args it's supposed to. | |
1005 |
|
1006 | |||
1006 | f = new.instancemethod(hook,self,self.__class__) |
|
1007 | f = new.instancemethod(hook,self,self.__class__) | |
1007 |
|
1008 | |||
1008 | # check if the hook is for strdispatcher first |
|
1009 | # check if the hook is for strdispatcher first | |
1009 | if str_key is not None: |
|
1010 | if str_key is not None: | |
1010 | sdp = self.strdispatchers.get(name, StrDispatch()) |
|
1011 | sdp = self.strdispatchers.get(name, StrDispatch()) | |
1011 | sdp.add_s(str_key, f, priority ) |
|
1012 | sdp.add_s(str_key, f, priority ) | |
1012 | self.strdispatchers[name] = sdp |
|
1013 | self.strdispatchers[name] = sdp | |
1013 | return |
|
1014 | return | |
1014 | if re_key is not None: |
|
1015 | if re_key is not None: | |
1015 | sdp = self.strdispatchers.get(name, StrDispatch()) |
|
1016 | sdp = self.strdispatchers.get(name, StrDispatch()) | |
1016 | sdp.add_re(re.compile(re_key), f, priority ) |
|
1017 | sdp.add_re(re.compile(re_key), f, priority ) | |
1017 | self.strdispatchers[name] = sdp |
|
1018 | self.strdispatchers[name] = sdp | |
1018 | return |
|
1019 | return | |
1019 |
|
1020 | |||
1020 | dp = getattr(self.hooks, name, None) |
|
1021 | dp = getattr(self.hooks, name, None) | |
1021 | if name not in IPython.hooks.__all__: |
|
1022 | if name not in IPython.hooks.__all__: | |
1022 | print "Warning! Hook '%s' is not one of %s" % (name, IPython.hooks.__all__ ) |
|
1023 | print "Warning! Hook '%s' is not one of %s" % (name, IPython.hooks.__all__ ) | |
1023 | if not dp: |
|
1024 | if not dp: | |
1024 | dp = IPython.hooks.CommandChainDispatcher() |
|
1025 | dp = IPython.hooks.CommandChainDispatcher() | |
1025 |
|
1026 | |||
1026 | try: |
|
1027 | try: | |
1027 | dp.add(f,priority) |
|
1028 | dp.add(f,priority) | |
1028 | except AttributeError: |
|
1029 | except AttributeError: | |
1029 | # it was not commandchain, plain old func - replace |
|
1030 | # it was not commandchain, plain old func - replace | |
1030 | dp = f |
|
1031 | dp = f | |
1031 |
|
1032 | |||
1032 | setattr(self.hooks,name, dp) |
|
1033 | setattr(self.hooks,name, dp) | |
1033 |
|
1034 | |||
1034 |
|
1035 | |||
1035 | #setattr(self.hooks,name,new.instancemethod(hook,self,self.__class__)) |
|
1036 | #setattr(self.hooks,name,new.instancemethod(hook,self,self.__class__)) | |
1036 |
|
1037 | |||
1037 | def set_crash_handler(self,crashHandler): |
|
1038 | def set_crash_handler(self,crashHandler): | |
1038 | """Set the IPython crash handler. |
|
1039 | """Set the IPython crash handler. | |
1039 |
|
1040 | |||
1040 | This must be a callable with a signature suitable for use as |
|
1041 | This must be a callable with a signature suitable for use as | |
1041 | sys.excepthook.""" |
|
1042 | sys.excepthook.""" | |
1042 |
|
1043 | |||
1043 | # Install the given crash handler as the Python exception hook |
|
1044 | # Install the given crash handler as the Python exception hook | |
1044 | sys.excepthook = crashHandler |
|
1045 | sys.excepthook = crashHandler | |
1045 |
|
1046 | |||
1046 | # The instance will store a pointer to this, so that runtime code |
|
1047 | # The instance will store a pointer to this, so that runtime code | |
1047 | # (such as magics) can access it. This is because during the |
|
1048 | # (such as magics) can access it. This is because during the | |
1048 | # read-eval loop, it gets temporarily overwritten (to deal with GUI |
|
1049 | # read-eval loop, it gets temporarily overwritten (to deal with GUI | |
1049 | # frameworks). |
|
1050 | # frameworks). | |
1050 | self.sys_excepthook = sys.excepthook |
|
1051 | self.sys_excepthook = sys.excepthook | |
1051 |
|
1052 | |||
1052 |
|
1053 | |||
1053 | def set_custom_exc(self,exc_tuple,handler): |
|
1054 | def set_custom_exc(self,exc_tuple,handler): | |
1054 | """set_custom_exc(exc_tuple,handler) |
|
1055 | """set_custom_exc(exc_tuple,handler) | |
1055 |
|
1056 | |||
1056 | Set a custom exception handler, which will be called if any of the |
|
1057 | Set a custom exception handler, which will be called if any of the | |
1057 | exceptions in exc_tuple occur in the mainloop (specifically, in the |
|
1058 | exceptions in exc_tuple occur in the mainloop (specifically, in the | |
1058 | runcode() method. |
|
1059 | runcode() method. | |
1059 |
|
1060 | |||
1060 | Inputs: |
|
1061 | Inputs: | |
1061 |
|
1062 | |||
1062 | - exc_tuple: a *tuple* of valid exceptions to call the defined |
|
1063 | - exc_tuple: a *tuple* of valid exceptions to call the defined | |
1063 | handler for. It is very important that you use a tuple, and NOT A |
|
1064 | handler for. It is very important that you use a tuple, and NOT A | |
1064 | LIST here, because of the way Python's except statement works. If |
|
1065 | LIST here, because of the way Python's except statement works. If | |
1065 | you only want to trap a single exception, use a singleton tuple: |
|
1066 | you only want to trap a single exception, use a singleton tuple: | |
1066 |
|
1067 | |||
1067 | exc_tuple == (MyCustomException,) |
|
1068 | exc_tuple == (MyCustomException,) | |
1068 |
|
1069 | |||
1069 | - handler: this must be defined as a function with the following |
|
1070 | - handler: this must be defined as a function with the following | |
1070 | basic interface: def my_handler(self,etype,value,tb). |
|
1071 | basic interface: def my_handler(self,etype,value,tb). | |
1071 |
|
1072 | |||
1072 | This will be made into an instance method (via new.instancemethod) |
|
1073 | This will be made into an instance method (via new.instancemethod) | |
1073 | of IPython itself, and it will be called if any of the exceptions |
|
1074 | of IPython itself, and it will be called if any of the exceptions | |
1074 | listed in the exc_tuple are caught. If the handler is None, an |
|
1075 | listed in the exc_tuple are caught. If the handler is None, an | |
1075 | internal basic one is used, which just prints basic info. |
|
1076 | internal basic one is used, which just prints basic info. | |
1076 |
|
1077 | |||
1077 | WARNING: by putting in your own exception handler into IPython's main |
|
1078 | WARNING: by putting in your own exception handler into IPython's main | |
1078 | execution loop, you run a very good chance of nasty crashes. This |
|
1079 | execution loop, you run a very good chance of nasty crashes. This | |
1079 | facility should only be used if you really know what you are doing.""" |
|
1080 | facility should only be used if you really know what you are doing.""" | |
1080 |
|
1081 | |||
1081 | assert type(exc_tuple)==type(()) , \ |
|
1082 | assert type(exc_tuple)==type(()) , \ | |
1082 | "The custom exceptions must be given AS A TUPLE." |
|
1083 | "The custom exceptions must be given AS A TUPLE." | |
1083 |
|
1084 | |||
1084 | def dummy_handler(self,etype,value,tb): |
|
1085 | def dummy_handler(self,etype,value,tb): | |
1085 | print '*** Simple custom exception handler ***' |
|
1086 | print '*** Simple custom exception handler ***' | |
1086 | print 'Exception type :',etype |
|
1087 | print 'Exception type :',etype | |
1087 | print 'Exception value:',value |
|
1088 | print 'Exception value:',value | |
1088 | print 'Traceback :',tb |
|
1089 | print 'Traceback :',tb | |
1089 | print 'Source code :','\n'.join(self.buffer) |
|
1090 | print 'Source code :','\n'.join(self.buffer) | |
1090 |
|
1091 | |||
1091 | if handler is None: handler = dummy_handler |
|
1092 | if handler is None: handler = dummy_handler | |
1092 |
|
1093 | |||
1093 | self.CustomTB = new.instancemethod(handler,self,self.__class__) |
|
1094 | self.CustomTB = new.instancemethod(handler,self,self.__class__) | |
1094 | self.custom_exceptions = exc_tuple |
|
1095 | self.custom_exceptions = exc_tuple | |
1095 |
|
1096 | |||
1096 | def set_custom_completer(self,completer,pos=0): |
|
1097 | def set_custom_completer(self,completer,pos=0): | |
1097 | """set_custom_completer(completer,pos=0) |
|
1098 | """set_custom_completer(completer,pos=0) | |
1098 |
|
1099 | |||
1099 | Adds a new custom completer function. |
|
1100 | Adds a new custom completer function. | |
1100 |
|
1101 | |||
1101 | The position argument (defaults to 0) is the index in the completers |
|
1102 | The position argument (defaults to 0) is the index in the completers | |
1102 | list where you want the completer to be inserted.""" |
|
1103 | list where you want the completer to be inserted.""" | |
1103 |
|
1104 | |||
1104 | newcomp = new.instancemethod(completer,self.Completer, |
|
1105 | newcomp = new.instancemethod(completer,self.Completer, | |
1105 | self.Completer.__class__) |
|
1106 | self.Completer.__class__) | |
1106 | self.Completer.matchers.insert(pos,newcomp) |
|
1107 | self.Completer.matchers.insert(pos,newcomp) | |
1107 |
|
1108 | |||
1108 | def set_completer(self): |
|
1109 | def set_completer(self): | |
1109 | """reset readline's completer to be our own.""" |
|
1110 | """reset readline's completer to be our own.""" | |
1110 | self.readline.set_completer(self.Completer.complete) |
|
1111 | self.readline.set_completer(self.Completer.complete) | |
1111 |
|
1112 | |||
1112 | def _get_call_pdb(self): |
|
1113 | def _get_call_pdb(self): | |
1113 | return self._call_pdb |
|
1114 | return self._call_pdb | |
1114 |
|
1115 | |||
1115 | def _set_call_pdb(self,val): |
|
1116 | def _set_call_pdb(self,val): | |
1116 |
|
1117 | |||
1117 | if val not in (0,1,False,True): |
|
1118 | if val not in (0,1,False,True): | |
1118 | raise ValueError,'new call_pdb value must be boolean' |
|
1119 | raise ValueError,'new call_pdb value must be boolean' | |
1119 |
|
1120 | |||
1120 | # store value in instance |
|
1121 | # store value in instance | |
1121 | self._call_pdb = val |
|
1122 | self._call_pdb = val | |
1122 |
|
1123 | |||
1123 | # notify the actual exception handlers |
|
1124 | # notify the actual exception handlers | |
1124 | self.InteractiveTB.call_pdb = val |
|
1125 | self.InteractiveTB.call_pdb = val | |
1125 | if self.isthreaded: |
|
1126 | if self.isthreaded: | |
1126 | try: |
|
1127 | try: | |
1127 | self.sys_excepthook.call_pdb = val |
|
1128 | self.sys_excepthook.call_pdb = val | |
1128 | except: |
|
1129 | except: | |
1129 | warn('Failed to activate pdb for threaded exception handler') |
|
1130 | warn('Failed to activate pdb for threaded exception handler') | |
1130 |
|
1131 | |||
1131 | call_pdb = property(_get_call_pdb,_set_call_pdb,None, |
|
1132 | call_pdb = property(_get_call_pdb,_set_call_pdb,None, | |
1132 | 'Control auto-activation of pdb at exceptions') |
|
1133 | 'Control auto-activation of pdb at exceptions') | |
1133 |
|
1134 | |||
1134 | # These special functions get installed in the builtin namespace, to |
|
1135 | # These special functions get installed in the builtin namespace, to | |
1135 | # provide programmatic (pure python) access to magics, aliases and system |
|
1136 | # provide programmatic (pure python) access to magics, aliases and system | |
1136 | # calls. This is important for logging, user scripting, and more. |
|
1137 | # calls. This is important for logging, user scripting, and more. | |
1137 |
|
1138 | |||
1138 | # We are basically exposing, via normal python functions, the three |
|
1139 | # We are basically exposing, via normal python functions, the three | |
1139 | # mechanisms in which ipython offers special call modes (magics for |
|
1140 | # mechanisms in which ipython offers special call modes (magics for | |
1140 | # internal control, aliases for direct system access via pre-selected |
|
1141 | # internal control, aliases for direct system access via pre-selected | |
1141 | # names, and !cmd for calling arbitrary system commands). |
|
1142 | # names, and !cmd for calling arbitrary system commands). | |
1142 |
|
1143 | |||
1143 | def ipmagic(self,arg_s): |
|
1144 | def ipmagic(self,arg_s): | |
1144 | """Call a magic function by name. |
|
1145 | """Call a magic function by name. | |
1145 |
|
1146 | |||
1146 | Input: a string containing the name of the magic function to call and any |
|
1147 | Input: a string containing the name of the magic function to call and any | |
1147 | additional arguments to be passed to the magic. |
|
1148 | additional arguments to be passed to the magic. | |
1148 |
|
1149 | |||
1149 | ipmagic('name -opt foo bar') is equivalent to typing at the ipython |
|
1150 | ipmagic('name -opt foo bar') is equivalent to typing at the ipython | |
1150 | prompt: |
|
1151 | prompt: | |
1151 |
|
1152 | |||
1152 | In[1]: %name -opt foo bar |
|
1153 | In[1]: %name -opt foo bar | |
1153 |
|
1154 | |||
1154 | To call a magic without arguments, simply use ipmagic('name'). |
|
1155 | To call a magic without arguments, simply use ipmagic('name'). | |
1155 |
|
1156 | |||
1156 | This provides a proper Python function to call IPython's magics in any |
|
1157 | This provides a proper Python function to call IPython's magics in any | |
1157 | valid Python code you can type at the interpreter, including loops and |
|
1158 | valid Python code you can type at the interpreter, including loops and | |
1158 | compound statements. It is added by IPython to the Python builtin |
|
1159 | compound statements. It is added by IPython to the Python builtin | |
1159 | namespace upon initialization.""" |
|
1160 | namespace upon initialization.""" | |
1160 |
|
1161 | |||
1161 | args = arg_s.split(' ',1) |
|
1162 | args = arg_s.split(' ',1) | |
1162 | magic_name = args[0] |
|
1163 | magic_name = args[0] | |
1163 | magic_name = magic_name.lstrip(self.ESC_MAGIC) |
|
1164 | magic_name = magic_name.lstrip(self.ESC_MAGIC) | |
1164 |
|
1165 | |||
1165 | try: |
|
1166 | try: | |
1166 | magic_args = args[1] |
|
1167 | magic_args = args[1] | |
1167 | except IndexError: |
|
1168 | except IndexError: | |
1168 | magic_args = '' |
|
1169 | magic_args = '' | |
1169 | fn = getattr(self,'magic_'+magic_name,None) |
|
1170 | fn = getattr(self,'magic_'+magic_name,None) | |
1170 | if fn is None: |
|
1171 | if fn is None: | |
1171 | error("Magic function `%s` not found." % magic_name) |
|
1172 | error("Magic function `%s` not found." % magic_name) | |
1172 | else: |
|
1173 | else: | |
1173 | magic_args = self.var_expand(magic_args,1) |
|
1174 | magic_args = self.var_expand(magic_args,1) | |
1174 | return fn(magic_args) |
|
1175 | return fn(magic_args) | |
1175 |
|
1176 | |||
1176 | def ipalias(self,arg_s): |
|
1177 | def ipalias(self,arg_s): | |
1177 | """Call an alias by name. |
|
1178 | """Call an alias by name. | |
1178 |
|
1179 | |||
1179 | Input: a string containing the name of the alias to call and any |
|
1180 | Input: a string containing the name of the alias to call and any | |
1180 | additional arguments to be passed to the magic. |
|
1181 | additional arguments to be passed to the magic. | |
1181 |
|
1182 | |||
1182 | ipalias('name -opt foo bar') is equivalent to typing at the ipython |
|
1183 | ipalias('name -opt foo bar') is equivalent to typing at the ipython | |
1183 | prompt: |
|
1184 | prompt: | |
1184 |
|
1185 | |||
1185 | In[1]: name -opt foo bar |
|
1186 | In[1]: name -opt foo bar | |
1186 |
|
1187 | |||
1187 | To call an alias without arguments, simply use ipalias('name'). |
|
1188 | To call an alias without arguments, simply use ipalias('name'). | |
1188 |
|
1189 | |||
1189 | This provides a proper Python function to call IPython's aliases in any |
|
1190 | This provides a proper Python function to call IPython's aliases in any | |
1190 | valid Python code you can type at the interpreter, including loops and |
|
1191 | valid Python code you can type at the interpreter, including loops and | |
1191 | compound statements. It is added by IPython to the Python builtin |
|
1192 | compound statements. It is added by IPython to the Python builtin | |
1192 | namespace upon initialization.""" |
|
1193 | namespace upon initialization.""" | |
1193 |
|
1194 | |||
1194 | args = arg_s.split(' ',1) |
|
1195 | args = arg_s.split(' ',1) | |
1195 | alias_name = args[0] |
|
1196 | alias_name = args[0] | |
1196 | try: |
|
1197 | try: | |
1197 | alias_args = args[1] |
|
1198 | alias_args = args[1] | |
1198 | except IndexError: |
|
1199 | except IndexError: | |
1199 | alias_args = '' |
|
1200 | alias_args = '' | |
1200 | if alias_name in self.alias_table: |
|
1201 | if alias_name in self.alias_table: | |
1201 | self.call_alias(alias_name,alias_args) |
|
1202 | self.call_alias(alias_name,alias_args) | |
1202 | else: |
|
1203 | else: | |
1203 | error("Alias `%s` not found." % alias_name) |
|
1204 | error("Alias `%s` not found." % alias_name) | |
1204 |
|
1205 | |||
1205 | def ipsystem(self,arg_s): |
|
1206 | def ipsystem(self,arg_s): | |
1206 | """Make a system call, using IPython.""" |
|
1207 | """Make a system call, using IPython.""" | |
1207 |
|
1208 | |||
1208 | self.system(arg_s) |
|
1209 | self.system(arg_s) | |
1209 |
|
1210 | |||
1210 | def complete(self,text): |
|
1211 | def complete(self,text): | |
1211 | """Return a sorted list of all possible completions on text. |
|
1212 | """Return a sorted list of all possible completions on text. | |
1212 |
|
1213 | |||
1213 | Inputs: |
|
1214 | Inputs: | |
1214 |
|
1215 | |||
1215 | - text: a string of text to be completed on. |
|
1216 | - text: a string of text to be completed on. | |
1216 |
|
1217 | |||
1217 | This is a wrapper around the completion mechanism, similar to what |
|
1218 | This is a wrapper around the completion mechanism, similar to what | |
1218 | readline does at the command line when the TAB key is hit. By |
|
1219 | readline does at the command line when the TAB key is hit. By | |
1219 | exposing it as a method, it can be used by other non-readline |
|
1220 | exposing it as a method, it can be used by other non-readline | |
1220 | environments (such as GUIs) for text completion. |
|
1221 | environments (such as GUIs) for text completion. | |
1221 |
|
1222 | |||
1222 | Simple usage example: |
|
1223 | Simple usage example: | |
1223 |
|
1224 | |||
1224 | In [7]: x = 'hello' |
|
1225 | In [7]: x = 'hello' | |
1225 |
|
1226 | |||
1226 | In [8]: x |
|
1227 | In [8]: x | |
1227 | Out[8]: 'hello' |
|
1228 | Out[8]: 'hello' | |
1228 |
|
1229 | |||
1229 | In [9]: print x |
|
1230 | In [9]: print x | |
1230 | hello |
|
1231 | hello | |
1231 |
|
1232 | |||
1232 | In [10]: _ip.IP.complete('x.l') |
|
1233 | In [10]: _ip.IP.complete('x.l') | |
1233 | Out[10]: ['x.ljust', 'x.lower', 'x.lstrip'] |
|
1234 | Out[10]: ['x.ljust', 'x.lower', 'x.lstrip'] | |
1234 | """ |
|
1235 | """ | |
1235 |
|
1236 | |||
1236 | complete = self.Completer.complete |
|
1237 | complete = self.Completer.complete | |
1237 | state = 0 |
|
1238 | state = 0 | |
1238 | # use a dict so we get unique keys, since ipyhton's multiple |
|
1239 | # use a dict so we get unique keys, since ipyhton's multiple | |
1239 | # completers can return duplicates. When we make 2.4 a requirement, |
|
1240 | # completers can return duplicates. When we make 2.4 a requirement, | |
1240 | # start using sets instead, which are faster. |
|
1241 | # start using sets instead, which are faster. | |
1241 | comps = {} |
|
1242 | comps = {} | |
1242 | while True: |
|
1243 | while True: | |
1243 | newcomp = complete(text,state,line_buffer=text) |
|
1244 | newcomp = complete(text,state,line_buffer=text) | |
1244 | if newcomp is None: |
|
1245 | if newcomp is None: | |
1245 | break |
|
1246 | break | |
1246 | comps[newcomp] = 1 |
|
1247 | comps[newcomp] = 1 | |
1247 | state += 1 |
|
1248 | state += 1 | |
1248 | outcomps = comps.keys() |
|
1249 | outcomps = comps.keys() | |
1249 | outcomps.sort() |
|
1250 | outcomps.sort() | |
1250 | #print "T:",text,"OC:",outcomps # dbg |
|
1251 | #print "T:",text,"OC:",outcomps # dbg | |
1251 | #print "vars:",self.user_ns.keys() |
|
1252 | #print "vars:",self.user_ns.keys() | |
1252 | return outcomps |
|
1253 | return outcomps | |
1253 |
|
1254 | |||
1254 | def set_completer_frame(self, frame=None): |
|
1255 | def set_completer_frame(self, frame=None): | |
1255 | if frame: |
|
1256 | if frame: | |
1256 | self.Completer.namespace = frame.f_locals |
|
1257 | self.Completer.namespace = frame.f_locals | |
1257 | self.Completer.global_namespace = frame.f_globals |
|
1258 | self.Completer.global_namespace = frame.f_globals | |
1258 | else: |
|
1259 | else: | |
1259 | self.Completer.namespace = self.user_ns |
|
1260 | self.Completer.namespace = self.user_ns | |
1260 | self.Completer.global_namespace = self.user_global_ns |
|
1261 | self.Completer.global_namespace = self.user_global_ns | |
1261 |
|
1262 | |||
1262 | def init_auto_alias(self): |
|
1263 | def init_auto_alias(self): | |
1263 | """Define some aliases automatically. |
|
1264 | """Define some aliases automatically. | |
1264 |
|
1265 | |||
1265 | These are ALL parameter-less aliases""" |
|
1266 | These are ALL parameter-less aliases""" | |
1266 |
|
1267 | |||
1267 | for alias,cmd in self.auto_alias: |
|
1268 | for alias,cmd in self.auto_alias: | |
1268 | self.getapi().defalias(alias,cmd) |
|
1269 | self.getapi().defalias(alias,cmd) | |
1269 |
|
1270 | |||
1270 |
|
1271 | |||
1271 | def alias_table_validate(self,verbose=0): |
|
1272 | def alias_table_validate(self,verbose=0): | |
1272 | """Update information about the alias table. |
|
1273 | """Update information about the alias table. | |
1273 |
|
1274 | |||
1274 | In particular, make sure no Python keywords/builtins are in it.""" |
|
1275 | In particular, make sure no Python keywords/builtins are in it.""" | |
1275 |
|
1276 | |||
1276 | no_alias = self.no_alias |
|
1277 | no_alias = self.no_alias | |
1277 | for k in self.alias_table.keys(): |
|
1278 | for k in self.alias_table.keys(): | |
1278 | if k in no_alias: |
|
1279 | if k in no_alias: | |
1279 | del self.alias_table[k] |
|
1280 | del self.alias_table[k] | |
1280 | if verbose: |
|
1281 | if verbose: | |
1281 | print ("Deleting alias <%s>, it's a Python " |
|
1282 | print ("Deleting alias <%s>, it's a Python " | |
1282 | "keyword or builtin." % k) |
|
1283 | "keyword or builtin." % k) | |
1283 |
|
1284 | |||
1284 | def set_autoindent(self,value=None): |
|
1285 | def set_autoindent(self,value=None): | |
1285 | """Set the autoindent flag, checking for readline support. |
|
1286 | """Set the autoindent flag, checking for readline support. | |
1286 |
|
1287 | |||
1287 | If called with no arguments, it acts as a toggle.""" |
|
1288 | If called with no arguments, it acts as a toggle.""" | |
1288 |
|
1289 | |||
1289 | if not self.has_readline: |
|
1290 | if not self.has_readline: | |
1290 | if os.name == 'posix': |
|
1291 | if os.name == 'posix': | |
1291 | warn("The auto-indent feature requires the readline library") |
|
1292 | warn("The auto-indent feature requires the readline library") | |
1292 | self.autoindent = 0 |
|
1293 | self.autoindent = 0 | |
1293 | return |
|
1294 | return | |
1294 | if value is None: |
|
1295 | if value is None: | |
1295 | self.autoindent = not self.autoindent |
|
1296 | self.autoindent = not self.autoindent | |
1296 | else: |
|
1297 | else: | |
1297 | self.autoindent = value |
|
1298 | self.autoindent = value | |
1298 |
|
1299 | |||
1299 | def rc_set_toggle(self,rc_field,value=None): |
|
1300 | def rc_set_toggle(self,rc_field,value=None): | |
1300 | """Set or toggle a field in IPython's rc config. structure. |
|
1301 | """Set or toggle a field in IPython's rc config. structure. | |
1301 |
|
1302 | |||
1302 | If called with no arguments, it acts as a toggle. |
|
1303 | If called with no arguments, it acts as a toggle. | |
1303 |
|
1304 | |||
1304 | If called with a non-existent field, the resulting AttributeError |
|
1305 | If called with a non-existent field, the resulting AttributeError | |
1305 | exception will propagate out.""" |
|
1306 | exception will propagate out.""" | |
1306 |
|
1307 | |||
1307 | rc_val = getattr(self.rc,rc_field) |
|
1308 | rc_val = getattr(self.rc,rc_field) | |
1308 | if value is None: |
|
1309 | if value is None: | |
1309 | value = not rc_val |
|
1310 | value = not rc_val | |
1310 | setattr(self.rc,rc_field,value) |
|
1311 | setattr(self.rc,rc_field,value) | |
1311 |
|
1312 | |||
1312 | def user_setup(self,ipythondir,rc_suffix,mode='install'): |
|
1313 | def user_setup(self,ipythondir,rc_suffix,mode='install'): | |
1313 | """Install the user configuration directory. |
|
1314 | """Install the user configuration directory. | |
1314 |
|
1315 | |||
1315 | Note |
|
1316 | Note | |
1316 | ---- |
|
1317 | ---- | |
1317 | DEPRECATED: use the top-level user_setup() function instead. |
|
1318 | DEPRECATED: use the top-level user_setup() function instead. | |
1318 | """ |
|
1319 | """ | |
1319 | return user_setup(ipythondir,rc_suffix,mode) |
|
1320 | return user_setup(ipythondir,rc_suffix,mode) | |
1320 |
|
1321 | |||
1321 | def atexit_operations(self): |
|
1322 | def atexit_operations(self): | |
1322 | """This will be executed at the time of exit. |
|
1323 | """This will be executed at the time of exit. | |
1323 |
|
1324 | |||
1324 | Saving of persistent data should be performed here. """ |
|
1325 | Saving of persistent data should be performed here. """ | |
1325 |
|
1326 | |||
1326 | #print '*** IPython exit cleanup ***' # dbg |
|
1327 | #print '*** IPython exit cleanup ***' # dbg | |
1327 | # input history |
|
1328 | # input history | |
1328 | self.savehist() |
|
1329 | self.savehist() | |
1329 |
|
1330 | |||
1330 | # Cleanup all tempfiles left around |
|
1331 | # Cleanup all tempfiles left around | |
1331 | for tfile in self.tempfiles: |
|
1332 | for tfile in self.tempfiles: | |
1332 | try: |
|
1333 | try: | |
1333 | os.unlink(tfile) |
|
1334 | os.unlink(tfile) | |
1334 | except OSError: |
|
1335 | except OSError: | |
1335 | pass |
|
1336 | pass | |
1336 |
|
1337 | |||
1337 | # Clear all user namespaces to release all references cleanly. |
|
1338 | # Clear all user namespaces to release all references cleanly. | |
1338 | self.reset() |
|
1339 | self.reset() | |
1339 |
|
1340 | |||
1340 | # Run user hooks |
|
1341 | # Run user hooks | |
1341 | self.hooks.shutdown_hook() |
|
1342 | self.hooks.shutdown_hook() | |
1342 |
|
1343 | |||
1343 | def reset(self): |
|
1344 | def reset(self): | |
1344 | """Clear all internal namespaces. |
|
1345 | """Clear all internal namespaces. | |
1345 |
|
1346 | |||
1346 | Note that this is much more aggressive than %reset, since it clears |
|
1347 | Note that this is much more aggressive than %reset, since it clears | |
1347 | fully all namespaces, as well as all input/output lists. |
|
1348 | fully all namespaces, as well as all input/output lists. | |
1348 | """ |
|
1349 | """ | |
1349 | for ns in self.ns_refs_table: |
|
1350 | for ns in self.ns_refs_table: | |
1350 | ns.clear() |
|
1351 | ns.clear() | |
1351 |
|
1352 | |||
1352 | # Clear input and output histories |
|
1353 | # Clear input and output histories | |
1353 | self.input_hist[:] = [] |
|
1354 | self.input_hist[:] = [] | |
1354 | self.input_hist_raw[:] = [] |
|
1355 | self.input_hist_raw[:] = [] | |
1355 | self.output_hist.clear() |
|
1356 | self.output_hist.clear() | |
1356 | # Restore the user namespaces to minimal usability |
|
1357 | # Restore the user namespaces to minimal usability | |
1357 | self.init_namespaces() |
|
1358 | self.init_namespaces() | |
1358 |
|
1359 | |||
1359 | def savehist(self): |
|
1360 | def savehist(self): | |
1360 | """Save input history to a file (via readline library).""" |
|
1361 | """Save input history to a file (via readline library).""" | |
1361 |
|
1362 | |||
1362 | if not self.has_readline: |
|
1363 | if not self.has_readline: | |
1363 | return |
|
1364 | return | |
1364 |
|
1365 | |||
1365 | try: |
|
1366 | try: | |
1366 | self.readline.write_history_file(self.histfile) |
|
1367 | self.readline.write_history_file(self.histfile) | |
1367 | except: |
|
1368 | except: | |
1368 | print 'Unable to save IPython command history to file: ' + \ |
|
1369 | print 'Unable to save IPython command history to file: ' + \ | |
1369 | `self.histfile` |
|
1370 | `self.histfile` | |
1370 |
|
1371 | |||
1371 | def reloadhist(self): |
|
1372 | def reloadhist(self): | |
1372 | """Reload the input history from disk file.""" |
|
1373 | """Reload the input history from disk file.""" | |
1373 |
|
1374 | |||
1374 | if self.has_readline: |
|
1375 | if self.has_readline: | |
1375 | try: |
|
1376 | try: | |
1376 | self.readline.clear_history() |
|
1377 | self.readline.clear_history() | |
1377 | self.readline.read_history_file(self.shell.histfile) |
|
1378 | self.readline.read_history_file(self.shell.histfile) | |
1378 | except AttributeError: |
|
1379 | except AttributeError: | |
1379 | pass |
|
1380 | pass | |
1380 |
|
1381 | |||
1381 |
|
1382 | |||
1382 | def history_saving_wrapper(self, func): |
|
1383 | def history_saving_wrapper(self, func): | |
1383 | """ Wrap func for readline history saving |
|
1384 | """ Wrap func for readline history saving | |
1384 |
|
1385 | |||
1385 | Convert func into callable that saves & restores |
|
1386 | Convert func into callable that saves & restores | |
1386 | history around the call """ |
|
1387 | history around the call """ | |
1387 |
|
1388 | |||
1388 | if not self.has_readline: |
|
1389 | if not self.has_readline: | |
1389 | return func |
|
1390 | return func | |
1390 |
|
1391 | |||
1391 | def wrapper(): |
|
1392 | def wrapper(): | |
1392 | self.savehist() |
|
1393 | self.savehist() | |
1393 | try: |
|
1394 | try: | |
1394 | func() |
|
1395 | func() | |
1395 | finally: |
|
1396 | finally: | |
1396 | readline.read_history_file(self.histfile) |
|
1397 | readline.read_history_file(self.histfile) | |
1397 | return wrapper |
|
1398 | return wrapper | |
1398 |
|
1399 | |||
1399 | def pre_readline(self): |
|
1400 | def pre_readline(self): | |
1400 | """readline hook to be used at the start of each line. |
|
1401 | """readline hook to be used at the start of each line. | |
1401 |
|
1402 | |||
1402 | Currently it handles auto-indent only.""" |
|
1403 | Currently it handles auto-indent only.""" | |
1403 |
|
1404 | |||
1404 | #debugx('self.indent_current_nsp','pre_readline:') |
|
1405 | #debugx('self.indent_current_nsp','pre_readline:') | |
1405 |
|
1406 | |||
1406 | if self.rl_do_indent: |
|
1407 | if self.rl_do_indent: | |
1407 | self.readline.insert_text(self.indent_current_str()) |
|
1408 | self.readline.insert_text(self.indent_current_str()) | |
1408 | if self.rl_next_input is not None: |
|
1409 | if self.rl_next_input is not None: | |
1409 | self.readline.insert_text(self.rl_next_input) |
|
1410 | self.readline.insert_text(self.rl_next_input) | |
1410 | self.rl_next_input = None |
|
1411 | self.rl_next_input = None | |
1411 |
|
1412 | |||
1412 | def init_readline(self): |
|
1413 | def init_readline(self): | |
1413 | """Command history completion/saving/reloading.""" |
|
1414 | """Command history completion/saving/reloading.""" | |
1414 |
|
1415 | |||
1415 |
|
1416 | |||
1416 | import IPython.rlineimpl as readline |
|
1417 | import IPython.rlineimpl as readline | |
1417 |
|
1418 | |||
1418 | if not readline.have_readline: |
|
1419 | if not readline.have_readline: | |
1419 | self.has_readline = 0 |
|
1420 | self.has_readline = 0 | |
1420 | self.readline = None |
|
1421 | self.readline = None | |
1421 | # no point in bugging windows users with this every time: |
|
1422 | # no point in bugging windows users with this every time: | |
1422 | warn('Readline services not available on this platform.') |
|
1423 | warn('Readline services not available on this platform.') | |
1423 | else: |
|
1424 | else: | |
1424 | sys.modules['readline'] = readline |
|
1425 | sys.modules['readline'] = readline | |
1425 | import atexit |
|
1426 | import atexit | |
1426 | from IPython.core.completer import IPCompleter |
|
1427 | from IPython.core.completer import IPCompleter | |
1427 | self.Completer = IPCompleter(self, |
|
1428 | self.Completer = IPCompleter(self, | |
1428 | self.user_ns, |
|
1429 | self.user_ns, | |
1429 | self.user_global_ns, |
|
1430 | self.user_global_ns, | |
1430 | self.rc.readline_omit__names, |
|
1431 | self.rc.readline_omit__names, | |
1431 | self.alias_table) |
|
1432 | self.alias_table) | |
1432 | sdisp = self.strdispatchers.get('complete_command', StrDispatch()) |
|
1433 | sdisp = self.strdispatchers.get('complete_command', StrDispatch()) | |
1433 | self.strdispatchers['complete_command'] = sdisp |
|
1434 | self.strdispatchers['complete_command'] = sdisp | |
1434 | self.Completer.custom_completers = sdisp |
|
1435 | self.Completer.custom_completers = sdisp | |
1435 | # Platform-specific configuration |
|
1436 | # Platform-specific configuration | |
1436 | if os.name == 'nt': |
|
1437 | if os.name == 'nt': | |
1437 | self.readline_startup_hook = readline.set_pre_input_hook |
|
1438 | self.readline_startup_hook = readline.set_pre_input_hook | |
1438 | else: |
|
1439 | else: | |
1439 | self.readline_startup_hook = readline.set_startup_hook |
|
1440 | self.readline_startup_hook = readline.set_startup_hook | |
1440 |
|
1441 | |||
1441 | # Load user's initrc file (readline config) |
|
1442 | # Load user's initrc file (readline config) | |
1442 | # Or if libedit is used, load editrc. |
|
1443 | # Or if libedit is used, load editrc. | |
1443 | inputrc_name = os.environ.get('INPUTRC') |
|
1444 | inputrc_name = os.environ.get('INPUTRC') | |
1444 | if inputrc_name is None: |
|
1445 | if inputrc_name is None: | |
1445 | home_dir = get_home_dir() |
|
1446 | home_dir = get_home_dir() | |
1446 | if home_dir is not None: |
|
1447 | if home_dir is not None: | |
1447 | inputrc_name = '.inputrc' |
|
1448 | inputrc_name = '.inputrc' | |
1448 | if readline.uses_libedit: |
|
1449 | if readline.uses_libedit: | |
1449 | inputrc_name = '.editrc' |
|
1450 | inputrc_name = '.editrc' | |
1450 | inputrc_name = os.path.join(home_dir, inputrc_name) |
|
1451 | inputrc_name = os.path.join(home_dir, inputrc_name) | |
1451 | if os.path.isfile(inputrc_name): |
|
1452 | if os.path.isfile(inputrc_name): | |
1452 | try: |
|
1453 | try: | |
1453 | readline.read_init_file(inputrc_name) |
|
1454 | readline.read_init_file(inputrc_name) | |
1454 | except: |
|
1455 | except: | |
1455 | warn('Problems reading readline initialization file <%s>' |
|
1456 | warn('Problems reading readline initialization file <%s>' | |
1456 | % inputrc_name) |
|
1457 | % inputrc_name) | |
1457 |
|
1458 | |||
1458 | self.has_readline = 1 |
|
1459 | self.has_readline = 1 | |
1459 | self.readline = readline |
|
1460 | self.readline = readline | |
1460 | # save this in sys so embedded copies can restore it properly |
|
1461 | # save this in sys so embedded copies can restore it properly | |
1461 | sys.ipcompleter = self.Completer.complete |
|
1462 | sys.ipcompleter = self.Completer.complete | |
1462 | self.set_completer() |
|
1463 | self.set_completer() | |
1463 |
|
1464 | |||
1464 | # Configure readline according to user's prefs |
|
1465 | # Configure readline according to user's prefs | |
1465 | # This is only done if GNU readline is being used. If libedit |
|
1466 | # This is only done if GNU readline is being used. If libedit | |
1466 | # is being used (as on Leopard) the readline config is |
|
1467 | # is being used (as on Leopard) the readline config is | |
1467 | # not run as the syntax for libedit is different. |
|
1468 | # not run as the syntax for libedit is different. | |
1468 | if not readline.uses_libedit: |
|
1469 | if not readline.uses_libedit: | |
1469 | for rlcommand in self.rc.readline_parse_and_bind: |
|
1470 | for rlcommand in self.rc.readline_parse_and_bind: | |
1470 | #print "loading rl:",rlcommand # dbg |
|
1471 | #print "loading rl:",rlcommand # dbg | |
1471 | readline.parse_and_bind(rlcommand) |
|
1472 | readline.parse_and_bind(rlcommand) | |
1472 |
|
1473 | |||
1473 | # Remove some chars from the delimiters list. If we encounter |
|
1474 | # Remove some chars from the delimiters list. If we encounter | |
1474 | # unicode chars, discard them. |
|
1475 | # unicode chars, discard them. | |
1475 | delims = readline.get_completer_delims().encode("ascii", "ignore") |
|
1476 | delims = readline.get_completer_delims().encode("ascii", "ignore") | |
1476 | delims = delims.translate(string._idmap, |
|
1477 | delims = delims.translate(string._idmap, | |
1477 | self.rc.readline_remove_delims) |
|
1478 | self.rc.readline_remove_delims) | |
1478 | readline.set_completer_delims(delims) |
|
1479 | readline.set_completer_delims(delims) | |
1479 | # otherwise we end up with a monster history after a while: |
|
1480 | # otherwise we end up with a monster history after a while: | |
1480 | readline.set_history_length(1000) |
|
1481 | readline.set_history_length(1000) | |
1481 | try: |
|
1482 | try: | |
1482 | #print '*** Reading readline history' # dbg |
|
1483 | #print '*** Reading readline history' # dbg | |
1483 | readline.read_history_file(self.histfile) |
|
1484 | readline.read_history_file(self.histfile) | |
1484 | except IOError: |
|
1485 | except IOError: | |
1485 | pass # It doesn't exist yet. |
|
1486 | pass # It doesn't exist yet. | |
1486 |
|
1487 | |||
1487 | atexit.register(self.atexit_operations) |
|
1488 | atexit.register(self.atexit_operations) | |
1488 | del atexit |
|
1489 | del atexit | |
1489 |
|
1490 | |||
1490 | # Configure auto-indent for all platforms |
|
1491 | # Configure auto-indent for all platforms | |
1491 | self.set_autoindent(self.rc.autoindent) |
|
1492 | self.set_autoindent(self.rc.autoindent) | |
1492 |
|
1493 | |||
1493 | def ask_yes_no(self,prompt,default=True): |
|
1494 | def ask_yes_no(self,prompt,default=True): | |
1494 | if self.rc.quiet: |
|
1495 | if self.rc.quiet: | |
1495 | return True |
|
1496 | return True | |
1496 | return ask_yes_no(prompt,default) |
|
1497 | return ask_yes_no(prompt,default) | |
1497 |
|
1498 | |||
1498 | def new_main_mod(self,ns=None): |
|
1499 | def new_main_mod(self,ns=None): | |
1499 | """Return a new 'main' module object for user code execution. |
|
1500 | """Return a new 'main' module object for user code execution. | |
1500 | """ |
|
1501 | """ | |
1501 | main_mod = self._user_main_module |
|
1502 | main_mod = self._user_main_module | |
1502 | init_fakemod_dict(main_mod,ns) |
|
1503 | init_fakemod_dict(main_mod,ns) | |
1503 | return main_mod |
|
1504 | return main_mod | |
1504 |
|
1505 | |||
1505 | def cache_main_mod(self,ns,fname): |
|
1506 | def cache_main_mod(self,ns,fname): | |
1506 | """Cache a main module's namespace. |
|
1507 | """Cache a main module's namespace. | |
1507 |
|
1508 | |||
1508 | When scripts are executed via %run, we must keep a reference to the |
|
1509 | When scripts are executed via %run, we must keep a reference to the | |
1509 | namespace of their __main__ module (a FakeModule instance) around so |
|
1510 | namespace of their __main__ module (a FakeModule instance) around so | |
1510 | that Python doesn't clear it, rendering objects defined therein |
|
1511 | that Python doesn't clear it, rendering objects defined therein | |
1511 | useless. |
|
1512 | useless. | |
1512 |
|
1513 | |||
1513 | This method keeps said reference in a private dict, keyed by the |
|
1514 | This method keeps said reference in a private dict, keyed by the | |
1514 | absolute path of the module object (which corresponds to the script |
|
1515 | absolute path of the module object (which corresponds to the script | |
1515 | path). This way, for multiple executions of the same script we only |
|
1516 | path). This way, for multiple executions of the same script we only | |
1516 | keep one copy of the namespace (the last one), thus preventing memory |
|
1517 | keep one copy of the namespace (the last one), thus preventing memory | |
1517 | leaks from old references while allowing the objects from the last |
|
1518 | leaks from old references while allowing the objects from the last | |
1518 | execution to be accessible. |
|
1519 | execution to be accessible. | |
1519 |
|
1520 | |||
1520 | Note: we can not allow the actual FakeModule instances to be deleted, |
|
1521 | Note: we can not allow the actual FakeModule instances to be deleted, | |
1521 | because of how Python tears down modules (it hard-sets all their |
|
1522 | because of how Python tears down modules (it hard-sets all their | |
1522 | references to None without regard for reference counts). This method |
|
1523 | references to None without regard for reference counts). This method | |
1523 | must therefore make a *copy* of the given namespace, to allow the |
|
1524 | must therefore make a *copy* of the given namespace, to allow the | |
1524 | original module's __dict__ to be cleared and reused. |
|
1525 | original module's __dict__ to be cleared and reused. | |
1525 |
|
1526 | |||
1526 |
|
1527 | |||
1527 | Parameters |
|
1528 | Parameters | |
1528 | ---------- |
|
1529 | ---------- | |
1529 | ns : a namespace (a dict, typically) |
|
1530 | ns : a namespace (a dict, typically) | |
1530 |
|
1531 | |||
1531 | fname : str |
|
1532 | fname : str | |
1532 | Filename associated with the namespace. |
|
1533 | Filename associated with the namespace. | |
1533 |
|
1534 | |||
1534 | Examples |
|
1535 | Examples | |
1535 | -------- |
|
1536 | -------- | |
1536 |
|
1537 | |||
1537 | In [10]: import IPython |
|
1538 | In [10]: import IPython | |
1538 |
|
1539 | |||
1539 | In [11]: _ip.IP.cache_main_mod(IPython.__dict__,IPython.__file__) |
|
1540 | In [11]: _ip.IP.cache_main_mod(IPython.__dict__,IPython.__file__) | |
1540 |
|
1541 | |||
1541 | In [12]: IPython.__file__ in _ip.IP._main_ns_cache |
|
1542 | In [12]: IPython.__file__ in _ip.IP._main_ns_cache | |
1542 | Out[12]: True |
|
1543 | Out[12]: True | |
1543 | """ |
|
1544 | """ | |
1544 | self._main_ns_cache[os.path.abspath(fname)] = ns.copy() |
|
1545 | self._main_ns_cache[os.path.abspath(fname)] = ns.copy() | |
1545 |
|
1546 | |||
1546 | def clear_main_mod_cache(self): |
|
1547 | def clear_main_mod_cache(self): | |
1547 | """Clear the cache of main modules. |
|
1548 | """Clear the cache of main modules. | |
1548 |
|
1549 | |||
1549 | Mainly for use by utilities like %reset. |
|
1550 | Mainly for use by utilities like %reset. | |
1550 |
|
1551 | |||
1551 | Examples |
|
1552 | Examples | |
1552 | -------- |
|
1553 | -------- | |
1553 |
|
1554 | |||
1554 | In [15]: import IPython |
|
1555 | In [15]: import IPython | |
1555 |
|
1556 | |||
1556 | In [16]: _ip.IP.cache_main_mod(IPython.__dict__,IPython.__file__) |
|
1557 | In [16]: _ip.IP.cache_main_mod(IPython.__dict__,IPython.__file__) | |
1557 |
|
1558 | |||
1558 | In [17]: len(_ip.IP._main_ns_cache) > 0 |
|
1559 | In [17]: len(_ip.IP._main_ns_cache) > 0 | |
1559 | Out[17]: True |
|
1560 | Out[17]: True | |
1560 |
|
1561 | |||
1561 | In [18]: _ip.IP.clear_main_mod_cache() |
|
1562 | In [18]: _ip.IP.clear_main_mod_cache() | |
1562 |
|
1563 | |||
1563 | In [19]: len(_ip.IP._main_ns_cache) == 0 |
|
1564 | In [19]: len(_ip.IP._main_ns_cache) == 0 | |
1564 | Out[19]: True |
|
1565 | Out[19]: True | |
1565 | """ |
|
1566 | """ | |
1566 | self._main_ns_cache.clear() |
|
1567 | self._main_ns_cache.clear() | |
1567 |
|
1568 | |||
1568 | def _should_recompile(self,e): |
|
1569 | def _should_recompile(self,e): | |
1569 | """Utility routine for edit_syntax_error""" |
|
1570 | """Utility routine for edit_syntax_error""" | |
1570 |
|
1571 | |||
1571 | if e.filename in ('<ipython console>','<input>','<string>', |
|
1572 | if e.filename in ('<ipython console>','<input>','<string>', | |
1572 | '<console>','<BackgroundJob compilation>', |
|
1573 | '<console>','<BackgroundJob compilation>', | |
1573 | None): |
|
1574 | None): | |
1574 |
|
1575 | |||
1575 | return False |
|
1576 | return False | |
1576 | try: |
|
1577 | try: | |
1577 | if (self.rc.autoedit_syntax and |
|
1578 | if (self.rc.autoedit_syntax and | |
1578 | not self.ask_yes_no('Return to editor to correct syntax error? ' |
|
1579 | not self.ask_yes_no('Return to editor to correct syntax error? ' | |
1579 | '[Y/n] ','y')): |
|
1580 | '[Y/n] ','y')): | |
1580 | return False |
|
1581 | return False | |
1581 | except EOFError: |
|
1582 | except EOFError: | |
1582 | return False |
|
1583 | return False | |
1583 |
|
1584 | |||
1584 | def int0(x): |
|
1585 | def int0(x): | |
1585 | try: |
|
1586 | try: | |
1586 | return int(x) |
|
1587 | return int(x) | |
1587 | except TypeError: |
|
1588 | except TypeError: | |
1588 | return 0 |
|
1589 | return 0 | |
1589 | # always pass integer line and offset values to editor hook |
|
1590 | # always pass integer line and offset values to editor hook | |
1590 | try: |
|
1591 | try: | |
1591 | self.hooks.fix_error_editor(e.filename, |
|
1592 | self.hooks.fix_error_editor(e.filename, | |
1592 | int0(e.lineno),int0(e.offset),e.msg) |
|
1593 | int0(e.lineno),int0(e.offset),e.msg) | |
1593 | except IPython.ipapi.TryNext: |
|
1594 | except IPython.ipapi.TryNext: | |
1594 | warn('Could not open editor') |
|
1595 | warn('Could not open editor') | |
1595 | return False |
|
1596 | return False | |
1596 | return True |
|
1597 | return True | |
1597 |
|
1598 | |||
1598 | def edit_syntax_error(self): |
|
1599 | def edit_syntax_error(self): | |
1599 | """The bottom half of the syntax error handler called in the main loop. |
|
1600 | """The bottom half of the syntax error handler called in the main loop. | |
1600 |
|
1601 | |||
1601 | Loop until syntax error is fixed or user cancels. |
|
1602 | Loop until syntax error is fixed or user cancels. | |
1602 | """ |
|
1603 | """ | |
1603 |
|
1604 | |||
1604 | while self.SyntaxTB.last_syntax_error: |
|
1605 | while self.SyntaxTB.last_syntax_error: | |
1605 | # copy and clear last_syntax_error |
|
1606 | # copy and clear last_syntax_error | |
1606 | err = self.SyntaxTB.clear_err_state() |
|
1607 | err = self.SyntaxTB.clear_err_state() | |
1607 | if not self._should_recompile(err): |
|
1608 | if not self._should_recompile(err): | |
1608 | return |
|
1609 | return | |
1609 | try: |
|
1610 | try: | |
1610 | # may set last_syntax_error again if a SyntaxError is raised |
|
1611 | # may set last_syntax_error again if a SyntaxError is raised | |
1611 | self.safe_execfile(err.filename,self.user_ns) |
|
1612 | self.safe_execfile(err.filename,self.user_ns) | |
1612 | except: |
|
1613 | except: | |
1613 | self.showtraceback() |
|
1614 | self.showtraceback() | |
1614 | else: |
|
1615 | else: | |
1615 | try: |
|
1616 | try: | |
1616 | f = file(err.filename) |
|
1617 | f = file(err.filename) | |
1617 | try: |
|
1618 | try: | |
1618 | sys.displayhook(f.read()) |
|
1619 | sys.displayhook(f.read()) | |
1619 | finally: |
|
1620 | finally: | |
1620 | f.close() |
|
1621 | f.close() | |
1621 | except: |
|
1622 | except: | |
1622 | self.showtraceback() |
|
1623 | self.showtraceback() | |
1623 |
|
1624 | |||
1624 | def showsyntaxerror(self, filename=None): |
|
1625 | def showsyntaxerror(self, filename=None): | |
1625 | """Display the syntax error that just occurred. |
|
1626 | """Display the syntax error that just occurred. | |
1626 |
|
1627 | |||
1627 | This doesn't display a stack trace because there isn't one. |
|
1628 | This doesn't display a stack trace because there isn't one. | |
1628 |
|
1629 | |||
1629 | If a filename is given, it is stuffed in the exception instead |
|
1630 | If a filename is given, it is stuffed in the exception instead | |
1630 | of what was there before (because Python's parser always uses |
|
1631 | of what was there before (because Python's parser always uses | |
1631 | "<string>" when reading from a string). |
|
1632 | "<string>" when reading from a string). | |
1632 | """ |
|
1633 | """ | |
1633 | etype, value, last_traceback = sys.exc_info() |
|
1634 | etype, value, last_traceback = sys.exc_info() | |
1634 |
|
1635 | |||
1635 | # See note about these variables in showtraceback() below |
|
1636 | # See note about these variables in showtraceback() below | |
1636 | sys.last_type = etype |
|
1637 | sys.last_type = etype | |
1637 | sys.last_value = value |
|
1638 | sys.last_value = value | |
1638 | sys.last_traceback = last_traceback |
|
1639 | sys.last_traceback = last_traceback | |
1639 |
|
1640 | |||
1640 | if filename and etype is SyntaxError: |
|
1641 | if filename and etype is SyntaxError: | |
1641 | # Work hard to stuff the correct filename in the exception |
|
1642 | # Work hard to stuff the correct filename in the exception | |
1642 | try: |
|
1643 | try: | |
1643 | msg, (dummy_filename, lineno, offset, line) = value |
|
1644 | msg, (dummy_filename, lineno, offset, line) = value | |
1644 | except: |
|
1645 | except: | |
1645 | # Not the format we expect; leave it alone |
|
1646 | # Not the format we expect; leave it alone | |
1646 | pass |
|
1647 | pass | |
1647 | else: |
|
1648 | else: | |
1648 | # Stuff in the right filename |
|
1649 | # Stuff in the right filename | |
1649 | try: |
|
1650 | try: | |
1650 | # Assume SyntaxError is a class exception |
|
1651 | # Assume SyntaxError is a class exception | |
1651 | value = SyntaxError(msg, (filename, lineno, offset, line)) |
|
1652 | value = SyntaxError(msg, (filename, lineno, offset, line)) | |
1652 | except: |
|
1653 | except: | |
1653 | # If that failed, assume SyntaxError is a string |
|
1654 | # If that failed, assume SyntaxError is a string | |
1654 | value = msg, (filename, lineno, offset, line) |
|
1655 | value = msg, (filename, lineno, offset, line) | |
1655 | self.SyntaxTB(etype,value,[]) |
|
1656 | self.SyntaxTB(etype,value,[]) | |
1656 |
|
1657 | |||
1657 | def debugger(self,force=False): |
|
1658 | def debugger(self,force=False): | |
1658 | """Call the pydb/pdb debugger. |
|
1659 | """Call the pydb/pdb debugger. | |
1659 |
|
1660 | |||
1660 | Keywords: |
|
1661 | Keywords: | |
1661 |
|
1662 | |||
1662 | - force(False): by default, this routine checks the instance call_pdb |
|
1663 | - force(False): by default, this routine checks the instance call_pdb | |
1663 | flag and does not actually invoke the debugger if the flag is false. |
|
1664 | flag and does not actually invoke the debugger if the flag is false. | |
1664 | The 'force' option forces the debugger to activate even if the flag |
|
1665 | The 'force' option forces the debugger to activate even if the flag | |
1665 | is false. |
|
1666 | is false. | |
1666 | """ |
|
1667 | """ | |
1667 |
|
1668 | |||
1668 | if not (force or self.call_pdb): |
|
1669 | if not (force or self.call_pdb): | |
1669 | return |
|
1670 | return | |
1670 |
|
1671 | |||
1671 | if not hasattr(sys,'last_traceback'): |
|
1672 | if not hasattr(sys,'last_traceback'): | |
1672 | error('No traceback has been produced, nothing to debug.') |
|
1673 | error('No traceback has been produced, nothing to debug.') | |
1673 | return |
|
1674 | return | |
1674 |
|
1675 | |||
1675 | # use pydb if available |
|
1676 | # use pydb if available | |
1676 |
if |
|
1677 | if debugger.has_pydb: | |
1677 | from pydb import pm |
|
1678 | from pydb import pm | |
1678 | else: |
|
1679 | else: | |
1679 | # fallback to our internal debugger |
|
1680 | # fallback to our internal debugger | |
1680 | pm = lambda : self.InteractiveTB.debugger(force=True) |
|
1681 | pm = lambda : self.InteractiveTB.debugger(force=True) | |
1681 | self.history_saving_wrapper(pm)() |
|
1682 | self.history_saving_wrapper(pm)() | |
1682 |
|
1683 | |||
1683 | def showtraceback(self,exc_tuple = None,filename=None,tb_offset=None): |
|
1684 | def showtraceback(self,exc_tuple = None,filename=None,tb_offset=None): | |
1684 | """Display the exception that just occurred. |
|
1685 | """Display the exception that just occurred. | |
1685 |
|
1686 | |||
1686 | If nothing is known about the exception, this is the method which |
|
1687 | If nothing is known about the exception, this is the method which | |
1687 | should be used throughout the code for presenting user tracebacks, |
|
1688 | should be used throughout the code for presenting user tracebacks, | |
1688 | rather than directly invoking the InteractiveTB object. |
|
1689 | rather than directly invoking the InteractiveTB object. | |
1689 |
|
1690 | |||
1690 | A specific showsyntaxerror() also exists, but this method can take |
|
1691 | A specific showsyntaxerror() also exists, but this method can take | |
1691 | care of calling it if needed, so unless you are explicitly catching a |
|
1692 | care of calling it if needed, so unless you are explicitly catching a | |
1692 | SyntaxError exception, don't try to analyze the stack manually and |
|
1693 | SyntaxError exception, don't try to analyze the stack manually and | |
1693 | simply call this method.""" |
|
1694 | simply call this method.""" | |
1694 |
|
1695 | |||
1695 |
|
1696 | |||
1696 | # Though this won't be called by syntax errors in the input line, |
|
1697 | # Though this won't be called by syntax errors in the input line, | |
1697 | # there may be SyntaxError cases whith imported code. |
|
1698 | # there may be SyntaxError cases whith imported code. | |
1698 |
|
1699 | |||
1699 | try: |
|
1700 | try: | |
1700 | if exc_tuple is None: |
|
1701 | if exc_tuple is None: | |
1701 | etype, value, tb = sys.exc_info() |
|
1702 | etype, value, tb = sys.exc_info() | |
1702 | else: |
|
1703 | else: | |
1703 | etype, value, tb = exc_tuple |
|
1704 | etype, value, tb = exc_tuple | |
1704 |
|
1705 | |||
1705 | if etype is SyntaxError: |
|
1706 | if etype is SyntaxError: | |
1706 | self.showsyntaxerror(filename) |
|
1707 | self.showsyntaxerror(filename) | |
1707 | elif etype is IPython.ipapi.UsageError: |
|
1708 | elif etype is IPython.ipapi.UsageError: | |
1708 | print "UsageError:", value |
|
1709 | print "UsageError:", value | |
1709 | else: |
|
1710 | else: | |
1710 | # WARNING: these variables are somewhat deprecated and not |
|
1711 | # WARNING: these variables are somewhat deprecated and not | |
1711 | # necessarily safe to use in a threaded environment, but tools |
|
1712 | # necessarily safe to use in a threaded environment, but tools | |
1712 | # like pdb depend on their existence, so let's set them. If we |
|
1713 | # like pdb depend on their existence, so let's set them. If we | |
1713 | # find problems in the field, we'll need to revisit their use. |
|
1714 | # find problems in the field, we'll need to revisit their use. | |
1714 | sys.last_type = etype |
|
1715 | sys.last_type = etype | |
1715 | sys.last_value = value |
|
1716 | sys.last_value = value | |
1716 | sys.last_traceback = tb |
|
1717 | sys.last_traceback = tb | |
1717 |
|
1718 | |||
1718 | if etype in self.custom_exceptions: |
|
1719 | if etype in self.custom_exceptions: | |
1719 | self.CustomTB(etype,value,tb) |
|
1720 | self.CustomTB(etype,value,tb) | |
1720 | else: |
|
1721 | else: | |
1721 | self.InteractiveTB(etype,value,tb,tb_offset=tb_offset) |
|
1722 | self.InteractiveTB(etype,value,tb,tb_offset=tb_offset) | |
1722 | if self.InteractiveTB.call_pdb and self.has_readline: |
|
1723 | if self.InteractiveTB.call_pdb and self.has_readline: | |
1723 | # pdb mucks up readline, fix it back |
|
1724 | # pdb mucks up readline, fix it back | |
1724 | self.set_completer() |
|
1725 | self.set_completer() | |
1725 | except KeyboardInterrupt: |
|
1726 | except KeyboardInterrupt: | |
1726 | self.write("\nKeyboardInterrupt\n") |
|
1727 | self.write("\nKeyboardInterrupt\n") | |
1727 |
|
1728 | |||
1728 | def mainloop(self,banner=None): |
|
1729 | def mainloop(self,banner=None): | |
1729 | """Creates the local namespace and starts the mainloop. |
|
1730 | """Creates the local namespace and starts the mainloop. | |
1730 |
|
1731 | |||
1731 | If an optional banner argument is given, it will override the |
|
1732 | If an optional banner argument is given, it will override the | |
1732 | internally created default banner.""" |
|
1733 | internally created default banner.""" | |
1733 |
|
1734 | |||
1734 | if self.rc.c: # Emulate Python's -c option |
|
1735 | if self.rc.c: # Emulate Python's -c option | |
1735 | self.exec_init_cmd() |
|
1736 | self.exec_init_cmd() | |
1736 | if banner is None: |
|
1737 | if banner is None: | |
1737 | if not self.rc.banner: |
|
1738 | if not self.rc.banner: | |
1738 | banner = '' |
|
1739 | banner = '' | |
1739 | # banner is string? Use it directly! |
|
1740 | # banner is string? Use it directly! | |
1740 | elif isinstance(self.rc.banner,basestring): |
|
1741 | elif isinstance(self.rc.banner,basestring): | |
1741 | banner = self.rc.banner |
|
1742 | banner = self.rc.banner | |
1742 | else: |
|
1743 | else: | |
1743 | banner = self.BANNER+self.banner2 |
|
1744 | banner = self.BANNER+self.banner2 | |
1744 |
|
1745 | |||
1745 | # if you run stuff with -c <cmd>, raw hist is not updated |
|
1746 | # if you run stuff with -c <cmd>, raw hist is not updated | |
1746 | # ensure that it's in sync |
|
1747 | # ensure that it's in sync | |
1747 | if len(self.input_hist) != len (self.input_hist_raw): |
|
1748 | if len(self.input_hist) != len (self.input_hist_raw): | |
1748 | self.input_hist_raw = InputList(self.input_hist) |
|
1749 | self.input_hist_raw = InputList(self.input_hist) | |
1749 |
|
1750 | |||
1750 | while 1: |
|
1751 | while 1: | |
1751 | try: |
|
1752 | try: | |
1752 | self.interact(banner) |
|
1753 | self.interact(banner) | |
1753 | #self.interact_with_readline() |
|
1754 | #self.interact_with_readline() | |
1754 |
|
1755 | |||
1755 | # XXX for testing of a readline-decoupled repl loop, call |
|
1756 | # XXX for testing of a readline-decoupled repl loop, call | |
1756 | # interact_with_readline above |
|
1757 | # interact_with_readline above | |
1757 |
|
1758 | |||
1758 | break |
|
1759 | break | |
1759 | except KeyboardInterrupt: |
|
1760 | except KeyboardInterrupt: | |
1760 | # this should not be necessary, but KeyboardInterrupt |
|
1761 | # this should not be necessary, but KeyboardInterrupt | |
1761 | # handling seems rather unpredictable... |
|
1762 | # handling seems rather unpredictable... | |
1762 | self.write("\nKeyboardInterrupt in interact()\n") |
|
1763 | self.write("\nKeyboardInterrupt in interact()\n") | |
1763 |
|
1764 | |||
1764 | def exec_init_cmd(self): |
|
1765 | def exec_init_cmd(self): | |
1765 | """Execute a command given at the command line. |
|
1766 | """Execute a command given at the command line. | |
1766 |
|
1767 | |||
1767 | This emulates Python's -c option.""" |
|
1768 | This emulates Python's -c option.""" | |
1768 |
|
1769 | |||
1769 | #sys.argv = ['-c'] |
|
1770 | #sys.argv = ['-c'] | |
1770 | self.push(self.prefilter(self.rc.c, False)) |
|
1771 | self.push(self.prefilter(self.rc.c, False)) | |
1771 | if not self.rc.interact: |
|
1772 | if not self.rc.interact: | |
1772 | self.ask_exit() |
|
1773 | self.ask_exit() | |
1773 |
|
1774 | |||
1774 | def embed_mainloop(self,header='',local_ns=None,global_ns=None,stack_depth=0): |
|
1775 | def embed_mainloop(self,header='',local_ns=None,global_ns=None,stack_depth=0): | |
1775 | """Embeds IPython into a running python program. |
|
1776 | """Embeds IPython into a running python program. | |
1776 |
|
1777 | |||
1777 | Input: |
|
1778 | Input: | |
1778 |
|
1779 | |||
1779 | - header: An optional header message can be specified. |
|
1780 | - header: An optional header message can be specified. | |
1780 |
|
1781 | |||
1781 | - local_ns, global_ns: working namespaces. If given as None, the |
|
1782 | - local_ns, global_ns: working namespaces. If given as None, the | |
1782 | IPython-initialized one is updated with __main__.__dict__, so that |
|
1783 | IPython-initialized one is updated with __main__.__dict__, so that | |
1783 | program variables become visible but user-specific configuration |
|
1784 | program variables become visible but user-specific configuration | |
1784 | remains possible. |
|
1785 | remains possible. | |
1785 |
|
1786 | |||
1786 | - stack_depth: specifies how many levels in the stack to go to |
|
1787 | - stack_depth: specifies how many levels in the stack to go to | |
1787 | looking for namespaces (when local_ns and global_ns are None). This |
|
1788 | looking for namespaces (when local_ns and global_ns are None). This | |
1788 | allows an intermediate caller to make sure that this function gets |
|
1789 | allows an intermediate caller to make sure that this function gets | |
1789 | the namespace from the intended level in the stack. By default (0) |
|
1790 | the namespace from the intended level in the stack. By default (0) | |
1790 | it will get its locals and globals from the immediate caller. |
|
1791 | it will get its locals and globals from the immediate caller. | |
1791 |
|
1792 | |||
1792 | Warning: it's possible to use this in a program which is being run by |
|
1793 | Warning: it's possible to use this in a program which is being run by | |
1793 | IPython itself (via %run), but some funny things will happen (a few |
|
1794 | IPython itself (via %run), but some funny things will happen (a few | |
1794 | globals get overwritten). In the future this will be cleaned up, as |
|
1795 | globals get overwritten). In the future this will be cleaned up, as | |
1795 | there is no fundamental reason why it can't work perfectly.""" |
|
1796 | there is no fundamental reason why it can't work perfectly.""" | |
1796 |
|
1797 | |||
1797 | # Get locals and globals from caller |
|
1798 | # Get locals and globals from caller | |
1798 | if local_ns is None or global_ns is None: |
|
1799 | if local_ns is None or global_ns is None: | |
1799 | call_frame = sys._getframe(stack_depth).f_back |
|
1800 | call_frame = sys._getframe(stack_depth).f_back | |
1800 |
|
1801 | |||
1801 | if local_ns is None: |
|
1802 | if local_ns is None: | |
1802 | local_ns = call_frame.f_locals |
|
1803 | local_ns = call_frame.f_locals | |
1803 | if global_ns is None: |
|
1804 | if global_ns is None: | |
1804 | global_ns = call_frame.f_globals |
|
1805 | global_ns = call_frame.f_globals | |
1805 |
|
1806 | |||
1806 | # Update namespaces and fire up interpreter |
|
1807 | # Update namespaces and fire up interpreter | |
1807 |
|
1808 | |||
1808 | # The global one is easy, we can just throw it in |
|
1809 | # The global one is easy, we can just throw it in | |
1809 | self.user_global_ns = global_ns |
|
1810 | self.user_global_ns = global_ns | |
1810 |
|
1811 | |||
1811 | # but the user/local one is tricky: ipython needs it to store internal |
|
1812 | # but the user/local one is tricky: ipython needs it to store internal | |
1812 | # data, but we also need the locals. We'll copy locals in the user |
|
1813 | # data, but we also need the locals. We'll copy locals in the user | |
1813 | # one, but will track what got copied so we can delete them at exit. |
|
1814 | # one, but will track what got copied so we can delete them at exit. | |
1814 | # This is so that a later embedded call doesn't see locals from a |
|
1815 | # This is so that a later embedded call doesn't see locals from a | |
1815 | # previous call (which most likely existed in a separate scope). |
|
1816 | # previous call (which most likely existed in a separate scope). | |
1816 | local_varnames = local_ns.keys() |
|
1817 | local_varnames = local_ns.keys() | |
1817 | self.user_ns.update(local_ns) |
|
1818 | self.user_ns.update(local_ns) | |
1818 | #self.user_ns['local_ns'] = local_ns # dbg |
|
1819 | #self.user_ns['local_ns'] = local_ns # dbg | |
1819 |
|
1820 | |||
1820 | # Patch for global embedding to make sure that things don't overwrite |
|
1821 | # Patch for global embedding to make sure that things don't overwrite | |
1821 | # user globals accidentally. Thanks to Richard <rxe@renre-europe.com> |
|
1822 | # user globals accidentally. Thanks to Richard <rxe@renre-europe.com> | |
1822 | # FIXME. Test this a bit more carefully (the if.. is new) |
|
1823 | # FIXME. Test this a bit more carefully (the if.. is new) | |
1823 | if local_ns is None and global_ns is None: |
|
1824 | if local_ns is None and global_ns is None: | |
1824 | self.user_global_ns.update(__main__.__dict__) |
|
1825 | self.user_global_ns.update(__main__.__dict__) | |
1825 |
|
1826 | |||
1826 | # make sure the tab-completer has the correct frame information, so it |
|
1827 | # make sure the tab-completer has the correct frame information, so it | |
1827 | # actually completes using the frame's locals/globals |
|
1828 | # actually completes using the frame's locals/globals | |
1828 | self.set_completer_frame() |
|
1829 | self.set_completer_frame() | |
1829 |
|
1830 | |||
1830 | # before activating the interactive mode, we need to make sure that |
|
1831 | # before activating the interactive mode, we need to make sure that | |
1831 | # all names in the builtin namespace needed by ipython point to |
|
1832 | # all names in the builtin namespace needed by ipython point to | |
1832 | # ourselves, and not to other instances. |
|
1833 | # ourselves, and not to other instances. | |
1833 | self.add_builtins() |
|
1834 | self.add_builtins() | |
1834 |
|
1835 | |||
1835 | self.interact(header) |
|
1836 | self.interact(header) | |
1836 |
|
1837 | |||
1837 | # now, purge out the user namespace from anything we might have added |
|
1838 | # now, purge out the user namespace from anything we might have added | |
1838 | # from the caller's local namespace |
|
1839 | # from the caller's local namespace | |
1839 | delvar = self.user_ns.pop |
|
1840 | delvar = self.user_ns.pop | |
1840 | for var in local_varnames: |
|
1841 | for var in local_varnames: | |
1841 | delvar(var,None) |
|
1842 | delvar(var,None) | |
1842 | # and clean builtins we may have overridden |
|
1843 | # and clean builtins we may have overridden | |
1843 | self.clean_builtins() |
|
1844 | self.clean_builtins() | |
1844 |
|
1845 | |||
1845 | def interact_prompt(self): |
|
1846 | def interact_prompt(self): | |
1846 | """ Print the prompt (in read-eval-print loop) |
|
1847 | """ Print the prompt (in read-eval-print loop) | |
1847 |
|
1848 | |||
1848 | Provided for those who want to implement their own read-eval-print loop (e.g. GUIs), not |
|
1849 | Provided for those who want to implement their own read-eval-print loop (e.g. GUIs), not | |
1849 | used in standard IPython flow. |
|
1850 | used in standard IPython flow. | |
1850 | """ |
|
1851 | """ | |
1851 | if self.more: |
|
1852 | if self.more: | |
1852 | try: |
|
1853 | try: | |
1853 | prompt = self.hooks.generate_prompt(True) |
|
1854 | prompt = self.hooks.generate_prompt(True) | |
1854 | except: |
|
1855 | except: | |
1855 | self.showtraceback() |
|
1856 | self.showtraceback() | |
1856 | if self.autoindent: |
|
1857 | if self.autoindent: | |
1857 | self.rl_do_indent = True |
|
1858 | self.rl_do_indent = True | |
1858 |
|
1859 | |||
1859 | else: |
|
1860 | else: | |
1860 | try: |
|
1861 | try: | |
1861 | prompt = self.hooks.generate_prompt(False) |
|
1862 | prompt = self.hooks.generate_prompt(False) | |
1862 | except: |
|
1863 | except: | |
1863 | self.showtraceback() |
|
1864 | self.showtraceback() | |
1864 | self.write(prompt) |
|
1865 | self.write(prompt) | |
1865 |
|
1866 | |||
1866 | def interact_handle_input(self,line): |
|
1867 | def interact_handle_input(self,line): | |
1867 | """ Handle the input line (in read-eval-print loop) |
|
1868 | """ Handle the input line (in read-eval-print loop) | |
1868 |
|
1869 | |||
1869 | Provided for those who want to implement their own read-eval-print loop (e.g. GUIs), not |
|
1870 | Provided for those who want to implement their own read-eval-print loop (e.g. GUIs), not | |
1870 | used in standard IPython flow. |
|
1871 | used in standard IPython flow. | |
1871 | """ |
|
1872 | """ | |
1872 | if line.lstrip() == line: |
|
1873 | if line.lstrip() == line: | |
1873 | self.shadowhist.add(line.strip()) |
|
1874 | self.shadowhist.add(line.strip()) | |
1874 | lineout = self.prefilter(line,self.more) |
|
1875 | lineout = self.prefilter(line,self.more) | |
1875 |
|
1876 | |||
1876 | if line.strip(): |
|
1877 | if line.strip(): | |
1877 | if self.more: |
|
1878 | if self.more: | |
1878 | self.input_hist_raw[-1] += '%s\n' % line |
|
1879 | self.input_hist_raw[-1] += '%s\n' % line | |
1879 | else: |
|
1880 | else: | |
1880 | self.input_hist_raw.append('%s\n' % line) |
|
1881 | self.input_hist_raw.append('%s\n' % line) | |
1881 |
|
1882 | |||
1882 |
|
1883 | |||
1883 | self.more = self.push(lineout) |
|
1884 | self.more = self.push(lineout) | |
1884 | if (self.SyntaxTB.last_syntax_error and |
|
1885 | if (self.SyntaxTB.last_syntax_error and | |
1885 | self.rc.autoedit_syntax): |
|
1886 | self.rc.autoedit_syntax): | |
1886 | self.edit_syntax_error() |
|
1887 | self.edit_syntax_error() | |
1887 |
|
1888 | |||
1888 | def interact_with_readline(self): |
|
1889 | def interact_with_readline(self): | |
1889 | """ Demo of using interact_handle_input, interact_prompt |
|
1890 | """ Demo of using interact_handle_input, interact_prompt | |
1890 |
|
1891 | |||
1891 | This is the main read-eval-print loop. If you need to implement your own (e.g. for GUI), |
|
1892 | This is the main read-eval-print loop. If you need to implement your own (e.g. for GUI), | |
1892 | it should work like this. |
|
1893 | it should work like this. | |
1893 | """ |
|
1894 | """ | |
1894 | self.readline_startup_hook(self.pre_readline) |
|
1895 | self.readline_startup_hook(self.pre_readline) | |
1895 | while not self.exit_now: |
|
1896 | while not self.exit_now: | |
1896 | self.interact_prompt() |
|
1897 | self.interact_prompt() | |
1897 | if self.more: |
|
1898 | if self.more: | |
1898 | self.rl_do_indent = True |
|
1899 | self.rl_do_indent = True | |
1899 | else: |
|
1900 | else: | |
1900 | self.rl_do_indent = False |
|
1901 | self.rl_do_indent = False | |
1901 | line = raw_input_original().decode(self.stdin_encoding) |
|
1902 | line = raw_input_original().decode(self.stdin_encoding) | |
1902 | self.interact_handle_input(line) |
|
1903 | self.interact_handle_input(line) | |
1903 |
|
1904 | |||
1904 |
|
1905 | |||
1905 | def interact(self, banner=None): |
|
1906 | def interact(self, banner=None): | |
1906 | """Closely emulate the interactive Python console. |
|
1907 | """Closely emulate the interactive Python console. | |
1907 |
|
1908 | |||
1908 | The optional banner argument specify the banner to print |
|
1909 | The optional banner argument specify the banner to print | |
1909 | before the first interaction; by default it prints a banner |
|
1910 | before the first interaction; by default it prints a banner | |
1910 | similar to the one printed by the real Python interpreter, |
|
1911 | similar to the one printed by the real Python interpreter, | |
1911 | followed by the current class name in parentheses (so as not |
|
1912 | followed by the current class name in parentheses (so as not | |
1912 | to confuse this with the real interpreter -- since it's so |
|
1913 | to confuse this with the real interpreter -- since it's so | |
1913 | close!). |
|
1914 | close!). | |
1914 |
|
1915 | |||
1915 | """ |
|
1916 | """ | |
1916 |
|
1917 | |||
1917 | if self.exit_now: |
|
1918 | if self.exit_now: | |
1918 | # batch run -> do not interact |
|
1919 | # batch run -> do not interact | |
1919 | return |
|
1920 | return | |
1920 | cprt = 'Type "copyright", "credits" or "license" for more information.' |
|
1921 | cprt = 'Type "copyright", "credits" or "license" for more information.' | |
1921 | if banner is None: |
|
1922 | if banner is None: | |
1922 | self.write("Python %s on %s\n%s\n(%s)\n" % |
|
1923 | self.write("Python %s on %s\n%s\n(%s)\n" % | |
1923 | (sys.version, sys.platform, cprt, |
|
1924 | (sys.version, sys.platform, cprt, | |
1924 | self.__class__.__name__)) |
|
1925 | self.__class__.__name__)) | |
1925 | else: |
|
1926 | else: | |
1926 | self.write(banner) |
|
1927 | self.write(banner) | |
1927 |
|
1928 | |||
1928 | more = 0 |
|
1929 | more = 0 | |
1929 |
|
1930 | |||
1930 | # Mark activity in the builtins |
|
1931 | # Mark activity in the builtins | |
1931 | __builtin__.__dict__['__IPYTHON__active'] += 1 |
|
1932 | __builtin__.__dict__['__IPYTHON__active'] += 1 | |
1932 |
|
1933 | |||
1933 | if self.has_readline: |
|
1934 | if self.has_readline: | |
1934 | self.readline_startup_hook(self.pre_readline) |
|
1935 | self.readline_startup_hook(self.pre_readline) | |
1935 | # exit_now is set by a call to %Exit or %Quit, through the |
|
1936 | # exit_now is set by a call to %Exit or %Quit, through the | |
1936 | # ask_exit callback. |
|
1937 | # ask_exit callback. | |
1937 |
|
1938 | |||
1938 | while not self.exit_now: |
|
1939 | while not self.exit_now: | |
1939 | self.hooks.pre_prompt_hook() |
|
1940 | self.hooks.pre_prompt_hook() | |
1940 | if more: |
|
1941 | if more: | |
1941 | try: |
|
1942 | try: | |
1942 | prompt = self.hooks.generate_prompt(True) |
|
1943 | prompt = self.hooks.generate_prompt(True) | |
1943 | except: |
|
1944 | except: | |
1944 | self.showtraceback() |
|
1945 | self.showtraceback() | |
1945 | if self.autoindent: |
|
1946 | if self.autoindent: | |
1946 | self.rl_do_indent = True |
|
1947 | self.rl_do_indent = True | |
1947 |
|
1948 | |||
1948 | else: |
|
1949 | else: | |
1949 | try: |
|
1950 | try: | |
1950 | prompt = self.hooks.generate_prompt(False) |
|
1951 | prompt = self.hooks.generate_prompt(False) | |
1951 | except: |
|
1952 | except: | |
1952 | self.showtraceback() |
|
1953 | self.showtraceback() | |
1953 | try: |
|
1954 | try: | |
1954 | line = self.raw_input(prompt,more) |
|
1955 | line = self.raw_input(prompt,more) | |
1955 | if self.exit_now: |
|
1956 | if self.exit_now: | |
1956 | # quick exit on sys.std[in|out] close |
|
1957 | # quick exit on sys.std[in|out] close | |
1957 | break |
|
1958 | break | |
1958 | if self.autoindent: |
|
1959 | if self.autoindent: | |
1959 | self.rl_do_indent = False |
|
1960 | self.rl_do_indent = False | |
1960 |
|
1961 | |||
1961 | except KeyboardInterrupt: |
|
1962 | except KeyboardInterrupt: | |
1962 | #double-guard against keyboardinterrupts during kbdint handling |
|
1963 | #double-guard against keyboardinterrupts during kbdint handling | |
1963 | try: |
|
1964 | try: | |
1964 | self.write('\nKeyboardInterrupt\n') |
|
1965 | self.write('\nKeyboardInterrupt\n') | |
1965 | self.resetbuffer() |
|
1966 | self.resetbuffer() | |
1966 | # keep cache in sync with the prompt counter: |
|
1967 | # keep cache in sync with the prompt counter: | |
1967 | self.outputcache.prompt_count -= 1 |
|
1968 | self.outputcache.prompt_count -= 1 | |
1968 |
|
1969 | |||
1969 | if self.autoindent: |
|
1970 | if self.autoindent: | |
1970 | self.indent_current_nsp = 0 |
|
1971 | self.indent_current_nsp = 0 | |
1971 | more = 0 |
|
1972 | more = 0 | |
1972 | except KeyboardInterrupt: |
|
1973 | except KeyboardInterrupt: | |
1973 | pass |
|
1974 | pass | |
1974 | except EOFError: |
|
1975 | except EOFError: | |
1975 | if self.autoindent: |
|
1976 | if self.autoindent: | |
1976 | self.rl_do_indent = False |
|
1977 | self.rl_do_indent = False | |
1977 | self.readline_startup_hook(None) |
|
1978 | self.readline_startup_hook(None) | |
1978 | self.write('\n') |
|
1979 | self.write('\n') | |
1979 | self.exit() |
|
1980 | self.exit() | |
1980 | except bdb.BdbQuit: |
|
1981 | except bdb.BdbQuit: | |
1981 | warn('The Python debugger has exited with a BdbQuit exception.\n' |
|
1982 | warn('The Python debugger has exited with a BdbQuit exception.\n' | |
1982 | 'Because of how pdb handles the stack, it is impossible\n' |
|
1983 | 'Because of how pdb handles the stack, it is impossible\n' | |
1983 | 'for IPython to properly format this particular exception.\n' |
|
1984 | 'for IPython to properly format this particular exception.\n' | |
1984 | 'IPython will resume normal operation.') |
|
1985 | 'IPython will resume normal operation.') | |
1985 | except: |
|
1986 | except: | |
1986 | # exceptions here are VERY RARE, but they can be triggered |
|
1987 | # exceptions here are VERY RARE, but they can be triggered | |
1987 | # asynchronously by signal handlers, for example. |
|
1988 | # asynchronously by signal handlers, for example. | |
1988 | self.showtraceback() |
|
1989 | self.showtraceback() | |
1989 | else: |
|
1990 | else: | |
1990 | more = self.push(line) |
|
1991 | more = self.push(line) | |
1991 | if (self.SyntaxTB.last_syntax_error and |
|
1992 | if (self.SyntaxTB.last_syntax_error and | |
1992 | self.rc.autoedit_syntax): |
|
1993 | self.rc.autoedit_syntax): | |
1993 | self.edit_syntax_error() |
|
1994 | self.edit_syntax_error() | |
1994 |
|
1995 | |||
1995 | # We are off again... |
|
1996 | # We are off again... | |
1996 | __builtin__.__dict__['__IPYTHON__active'] -= 1 |
|
1997 | __builtin__.__dict__['__IPYTHON__active'] -= 1 | |
1997 |
|
1998 | |||
1998 | def excepthook(self, etype, value, tb): |
|
1999 | def excepthook(self, etype, value, tb): | |
1999 | """One more defense for GUI apps that call sys.excepthook. |
|
2000 | """One more defense for GUI apps that call sys.excepthook. | |
2000 |
|
2001 | |||
2001 | GUI frameworks like wxPython trap exceptions and call |
|
2002 | GUI frameworks like wxPython trap exceptions and call | |
2002 | sys.excepthook themselves. I guess this is a feature that |
|
2003 | sys.excepthook themselves. I guess this is a feature that | |
2003 | enables them to keep running after exceptions that would |
|
2004 | enables them to keep running after exceptions that would | |
2004 | otherwise kill their mainloop. This is a bother for IPython |
|
2005 | otherwise kill their mainloop. This is a bother for IPython | |
2005 | which excepts to catch all of the program exceptions with a try: |
|
2006 | which excepts to catch all of the program exceptions with a try: | |
2006 | except: statement. |
|
2007 | except: statement. | |
2007 |
|
2008 | |||
2008 | Normally, IPython sets sys.excepthook to a CrashHandler instance, so if |
|
2009 | Normally, IPython sets sys.excepthook to a CrashHandler instance, so if | |
2009 | any app directly invokes sys.excepthook, it will look to the user like |
|
2010 | any app directly invokes sys.excepthook, it will look to the user like | |
2010 | IPython crashed. In order to work around this, we can disable the |
|
2011 | IPython crashed. In order to work around this, we can disable the | |
2011 | CrashHandler and replace it with this excepthook instead, which prints a |
|
2012 | CrashHandler and replace it with this excepthook instead, which prints a | |
2012 | regular traceback using our InteractiveTB. In this fashion, apps which |
|
2013 | regular traceback using our InteractiveTB. In this fashion, apps which | |
2013 | call sys.excepthook will generate a regular-looking exception from |
|
2014 | call sys.excepthook will generate a regular-looking exception from | |
2014 | IPython, and the CrashHandler will only be triggered by real IPython |
|
2015 | IPython, and the CrashHandler will only be triggered by real IPython | |
2015 | crashes. |
|
2016 | crashes. | |
2016 |
|
2017 | |||
2017 | This hook should be used sparingly, only in places which are not likely |
|
2018 | This hook should be used sparingly, only in places which are not likely | |
2018 | to be true IPython errors. |
|
2019 | to be true IPython errors. | |
2019 | """ |
|
2020 | """ | |
2020 | self.showtraceback((etype,value,tb),tb_offset=0) |
|
2021 | self.showtraceback((etype,value,tb),tb_offset=0) | |
2021 |
|
2022 | |||
2022 | def expand_aliases(self,fn,rest): |
|
2023 | def expand_aliases(self,fn,rest): | |
2023 | """ Expand multiple levels of aliases: |
|
2024 | """ Expand multiple levels of aliases: | |
2024 |
|
2025 | |||
2025 | if: |
|
2026 | if: | |
2026 |
|
2027 | |||
2027 | alias foo bar /tmp |
|
2028 | alias foo bar /tmp | |
2028 | alias baz foo |
|
2029 | alias baz foo | |
2029 |
|
2030 | |||
2030 | then: |
|
2031 | then: | |
2031 |
|
2032 | |||
2032 | baz huhhahhei -> bar /tmp huhhahhei |
|
2033 | baz huhhahhei -> bar /tmp huhhahhei | |
2033 |
|
2034 | |||
2034 | """ |
|
2035 | """ | |
2035 | line = fn + " " + rest |
|
2036 | line = fn + " " + rest | |
2036 |
|
2037 | |||
2037 | done = set() |
|
2038 | done = set() | |
2038 | while 1: |
|
2039 | while 1: | |
2039 | pre,fn,rest = prefilter.splitUserInput(line, |
|
2040 | pre,fn,rest = prefilter.splitUserInput(line, | |
2040 | prefilter.shell_line_split) |
|
2041 | prefilter.shell_line_split) | |
2041 | if fn in self.alias_table: |
|
2042 | if fn in self.alias_table: | |
2042 | if fn in done: |
|
2043 | if fn in done: | |
2043 | warn("Cyclic alias definition, repeated '%s'" % fn) |
|
2044 | warn("Cyclic alias definition, repeated '%s'" % fn) | |
2044 | return "" |
|
2045 | return "" | |
2045 | done.add(fn) |
|
2046 | done.add(fn) | |
2046 |
|
2047 | |||
2047 | l2 = self.transform_alias(fn,rest) |
|
2048 | l2 = self.transform_alias(fn,rest) | |
2048 | # dir -> dir |
|
2049 | # dir -> dir | |
2049 | # print "alias",line, "->",l2 #dbg |
|
2050 | # print "alias",line, "->",l2 #dbg | |
2050 | if l2 == line: |
|
2051 | if l2 == line: | |
2051 | break |
|
2052 | break | |
2052 | # ls -> ls -F should not recurse forever |
|
2053 | # ls -> ls -F should not recurse forever | |
2053 | if l2.split(None,1)[0] == line.split(None,1)[0]: |
|
2054 | if l2.split(None,1)[0] == line.split(None,1)[0]: | |
2054 | line = l2 |
|
2055 | line = l2 | |
2055 | break |
|
2056 | break | |
2056 |
|
2057 | |||
2057 | line=l2 |
|
2058 | line=l2 | |
2058 |
|
2059 | |||
2059 |
|
2060 | |||
2060 | # print "al expand to",line #dbg |
|
2061 | # print "al expand to",line #dbg | |
2061 | else: |
|
2062 | else: | |
2062 | break |
|
2063 | break | |
2063 |
|
2064 | |||
2064 | return line |
|
2065 | return line | |
2065 |
|
2066 | |||
2066 | def transform_alias(self, alias,rest=''): |
|
2067 | def transform_alias(self, alias,rest=''): | |
2067 | """ Transform alias to system command string. |
|
2068 | """ Transform alias to system command string. | |
2068 | """ |
|
2069 | """ | |
2069 | trg = self.alias_table[alias] |
|
2070 | trg = self.alias_table[alias] | |
2070 |
|
2071 | |||
2071 | nargs,cmd = trg |
|
2072 | nargs,cmd = trg | |
2072 | # print trg #dbg |
|
2073 | # print trg #dbg | |
2073 | if ' ' in cmd and os.path.isfile(cmd): |
|
2074 | if ' ' in cmd and os.path.isfile(cmd): | |
2074 | cmd = '"%s"' % cmd |
|
2075 | cmd = '"%s"' % cmd | |
2075 |
|
2076 | |||
2076 | # Expand the %l special to be the user's input line |
|
2077 | # Expand the %l special to be the user's input line | |
2077 | if cmd.find('%l') >= 0: |
|
2078 | if cmd.find('%l') >= 0: | |
2078 | cmd = cmd.replace('%l',rest) |
|
2079 | cmd = cmd.replace('%l',rest) | |
2079 | rest = '' |
|
2080 | rest = '' | |
2080 | if nargs==0: |
|
2081 | if nargs==0: | |
2081 | # Simple, argument-less aliases |
|
2082 | # Simple, argument-less aliases | |
2082 | cmd = '%s %s' % (cmd,rest) |
|
2083 | cmd = '%s %s' % (cmd,rest) | |
2083 | else: |
|
2084 | else: | |
2084 | # Handle aliases with positional arguments |
|
2085 | # Handle aliases with positional arguments | |
2085 | args = rest.split(None,nargs) |
|
2086 | args = rest.split(None,nargs) | |
2086 | if len(args)< nargs: |
|
2087 | if len(args)< nargs: | |
2087 | error('Alias <%s> requires %s arguments, %s given.' % |
|
2088 | error('Alias <%s> requires %s arguments, %s given.' % | |
2088 | (alias,nargs,len(args))) |
|
2089 | (alias,nargs,len(args))) | |
2089 | return None |
|
2090 | return None | |
2090 | cmd = '%s %s' % (cmd % tuple(args[:nargs]),' '.join(args[nargs:])) |
|
2091 | cmd = '%s %s' % (cmd % tuple(args[:nargs]),' '.join(args[nargs:])) | |
2091 | # Now call the macro, evaluating in the user's namespace |
|
2092 | # Now call the macro, evaluating in the user's namespace | |
2092 | #print 'new command: <%r>' % cmd # dbg |
|
2093 | #print 'new command: <%r>' % cmd # dbg | |
2093 | return cmd |
|
2094 | return cmd | |
2094 |
|
2095 | |||
2095 | def call_alias(self,alias,rest=''): |
|
2096 | def call_alias(self,alias,rest=''): | |
2096 | """Call an alias given its name and the rest of the line. |
|
2097 | """Call an alias given its name and the rest of the line. | |
2097 |
|
2098 | |||
2098 | This is only used to provide backwards compatibility for users of |
|
2099 | This is only used to provide backwards compatibility for users of | |
2099 | ipalias(), use of which is not recommended for anymore.""" |
|
2100 | ipalias(), use of which is not recommended for anymore.""" | |
2100 |
|
2101 | |||
2101 | # Now call the macro, evaluating in the user's namespace |
|
2102 | # Now call the macro, evaluating in the user's namespace | |
2102 | cmd = self.transform_alias(alias, rest) |
|
2103 | cmd = self.transform_alias(alias, rest) | |
2103 | try: |
|
2104 | try: | |
2104 | self.system(cmd) |
|
2105 | self.system(cmd) | |
2105 | except: |
|
2106 | except: | |
2106 | self.showtraceback() |
|
2107 | self.showtraceback() | |
2107 |
|
2108 | |||
2108 | def indent_current_str(self): |
|
2109 | def indent_current_str(self): | |
2109 | """return the current level of indentation as a string""" |
|
2110 | """return the current level of indentation as a string""" | |
2110 | return self.indent_current_nsp * ' ' |
|
2111 | return self.indent_current_nsp * ' ' | |
2111 |
|
2112 | |||
2112 | def autoindent_update(self,line): |
|
2113 | def autoindent_update(self,line): | |
2113 | """Keep track of the indent level.""" |
|
2114 | """Keep track of the indent level.""" | |
2114 |
|
2115 | |||
2115 | #debugx('line') |
|
2116 | #debugx('line') | |
2116 | #debugx('self.indent_current_nsp') |
|
2117 | #debugx('self.indent_current_nsp') | |
2117 | if self.autoindent: |
|
2118 | if self.autoindent: | |
2118 | if line: |
|
2119 | if line: | |
2119 | inisp = num_ini_spaces(line) |
|
2120 | inisp = num_ini_spaces(line) | |
2120 | if inisp < self.indent_current_nsp: |
|
2121 | if inisp < self.indent_current_nsp: | |
2121 | self.indent_current_nsp = inisp |
|
2122 | self.indent_current_nsp = inisp | |
2122 |
|
2123 | |||
2123 | if line[-1] == ':': |
|
2124 | if line[-1] == ':': | |
2124 | self.indent_current_nsp += 4 |
|
2125 | self.indent_current_nsp += 4 | |
2125 | elif dedent_re.match(line): |
|
2126 | elif dedent_re.match(line): | |
2126 | self.indent_current_nsp -= 4 |
|
2127 | self.indent_current_nsp -= 4 | |
2127 | else: |
|
2128 | else: | |
2128 | self.indent_current_nsp = 0 |
|
2129 | self.indent_current_nsp = 0 | |
2129 |
|
2130 | |||
2130 | def runlines(self,lines): |
|
2131 | def runlines(self,lines): | |
2131 | """Run a string of one or more lines of source. |
|
2132 | """Run a string of one or more lines of source. | |
2132 |
|
2133 | |||
2133 | This method is capable of running a string containing multiple source |
|
2134 | This method is capable of running a string containing multiple source | |
2134 | lines, as if they had been entered at the IPython prompt. Since it |
|
2135 | lines, as if they had been entered at the IPython prompt. Since it | |
2135 | exposes IPython's processing machinery, the given strings can contain |
|
2136 | exposes IPython's processing machinery, the given strings can contain | |
2136 | magic calls (%magic), special shell access (!cmd), etc.""" |
|
2137 | magic calls (%magic), special shell access (!cmd), etc.""" | |
2137 |
|
2138 | |||
2138 | # We must start with a clean buffer, in case this is run from an |
|
2139 | # We must start with a clean buffer, in case this is run from an | |
2139 | # interactive IPython session (via a magic, for example). |
|
2140 | # interactive IPython session (via a magic, for example). | |
2140 | self.resetbuffer() |
|
2141 | self.resetbuffer() | |
2141 | lines = lines.split('\n') |
|
2142 | lines = lines.split('\n') | |
2142 | more = 0 |
|
2143 | more = 0 | |
2143 |
|
2144 | |||
2144 | for line in lines: |
|
2145 | for line in lines: | |
2145 | # skip blank lines so we don't mess up the prompt counter, but do |
|
2146 | # skip blank lines so we don't mess up the prompt counter, but do | |
2146 | # NOT skip even a blank line if we are in a code block (more is |
|
2147 | # NOT skip even a blank line if we are in a code block (more is | |
2147 | # true) |
|
2148 | # true) | |
2148 |
|
2149 | |||
2149 | if line or more: |
|
2150 | if line or more: | |
2150 | # push to raw history, so hist line numbers stay in sync |
|
2151 | # push to raw history, so hist line numbers stay in sync | |
2151 | self.input_hist_raw.append("# " + line + "\n") |
|
2152 | self.input_hist_raw.append("# " + line + "\n") | |
2152 | more = self.push(self.prefilter(line,more)) |
|
2153 | more = self.push(self.prefilter(line,more)) | |
2153 | # IPython's runsource returns None if there was an error |
|
2154 | # IPython's runsource returns None if there was an error | |
2154 | # compiling the code. This allows us to stop processing right |
|
2155 | # compiling the code. This allows us to stop processing right | |
2155 | # away, so the user gets the error message at the right place. |
|
2156 | # away, so the user gets the error message at the right place. | |
2156 | if more is None: |
|
2157 | if more is None: | |
2157 | break |
|
2158 | break | |
2158 | else: |
|
2159 | else: | |
2159 | self.input_hist_raw.append("\n") |
|
2160 | self.input_hist_raw.append("\n") | |
2160 | # final newline in case the input didn't have it, so that the code |
|
2161 | # final newline in case the input didn't have it, so that the code | |
2161 | # actually does get executed |
|
2162 | # actually does get executed | |
2162 | if more: |
|
2163 | if more: | |
2163 | self.push('\n') |
|
2164 | self.push('\n') | |
2164 |
|
2165 | |||
2165 | def runsource(self, source, filename='<input>', symbol='single'): |
|
2166 | def runsource(self, source, filename='<input>', symbol='single'): | |
2166 | """Compile and run some source in the interpreter. |
|
2167 | """Compile and run some source in the interpreter. | |
2167 |
|
2168 | |||
2168 | Arguments are as for compile_command(). |
|
2169 | Arguments are as for compile_command(). | |
2169 |
|
2170 | |||
2170 | One several things can happen: |
|
2171 | One several things can happen: | |
2171 |
|
2172 | |||
2172 | 1) The input is incorrect; compile_command() raised an |
|
2173 | 1) The input is incorrect; compile_command() raised an | |
2173 | exception (SyntaxError or OverflowError). A syntax traceback |
|
2174 | exception (SyntaxError or OverflowError). A syntax traceback | |
2174 | will be printed by calling the showsyntaxerror() method. |
|
2175 | will be printed by calling the showsyntaxerror() method. | |
2175 |
|
2176 | |||
2176 | 2) The input is incomplete, and more input is required; |
|
2177 | 2) The input is incomplete, and more input is required; | |
2177 | compile_command() returned None. Nothing happens. |
|
2178 | compile_command() returned None. Nothing happens. | |
2178 |
|
2179 | |||
2179 | 3) The input is complete; compile_command() returned a code |
|
2180 | 3) The input is complete; compile_command() returned a code | |
2180 | object. The code is executed by calling self.runcode() (which |
|
2181 | object. The code is executed by calling self.runcode() (which | |
2181 | also handles run-time exceptions, except for SystemExit). |
|
2182 | also handles run-time exceptions, except for SystemExit). | |
2182 |
|
2183 | |||
2183 | The return value is: |
|
2184 | The return value is: | |
2184 |
|
2185 | |||
2185 | - True in case 2 |
|
2186 | - True in case 2 | |
2186 |
|
2187 | |||
2187 | - False in the other cases, unless an exception is raised, where |
|
2188 | - False in the other cases, unless an exception is raised, where | |
2188 | None is returned instead. This can be used by external callers to |
|
2189 | None is returned instead. This can be used by external callers to | |
2189 | know whether to continue feeding input or not. |
|
2190 | know whether to continue feeding input or not. | |
2190 |
|
2191 | |||
2191 | The return value can be used to decide whether to use sys.ps1 or |
|
2192 | The return value can be used to decide whether to use sys.ps1 or | |
2192 | sys.ps2 to prompt the next line.""" |
|
2193 | sys.ps2 to prompt the next line.""" | |
2193 |
|
2194 | |||
2194 | # if the source code has leading blanks, add 'if 1:\n' to it |
|
2195 | # if the source code has leading blanks, add 'if 1:\n' to it | |
2195 | # this allows execution of indented pasted code. It is tempting |
|
2196 | # this allows execution of indented pasted code. It is tempting | |
2196 | # to add '\n' at the end of source to run commands like ' a=1' |
|
2197 | # to add '\n' at the end of source to run commands like ' a=1' | |
2197 | # directly, but this fails for more complicated scenarios |
|
2198 | # directly, but this fails for more complicated scenarios | |
2198 | source=source.encode(self.stdin_encoding) |
|
2199 | source=source.encode(self.stdin_encoding) | |
2199 | if source[:1] in [' ', '\t']: |
|
2200 | if source[:1] in [' ', '\t']: | |
2200 | source = 'if 1:\n%s' % source |
|
2201 | source = 'if 1:\n%s' % source | |
2201 |
|
2202 | |||
2202 | try: |
|
2203 | try: | |
2203 | code = self.compile(source,filename,symbol) |
|
2204 | code = self.compile(source,filename,symbol) | |
2204 | except (OverflowError, SyntaxError, ValueError, TypeError, MemoryError): |
|
2205 | except (OverflowError, SyntaxError, ValueError, TypeError, MemoryError): | |
2205 | # Case 1 |
|
2206 | # Case 1 | |
2206 | self.showsyntaxerror(filename) |
|
2207 | self.showsyntaxerror(filename) | |
2207 | return None |
|
2208 | return None | |
2208 |
|
2209 | |||
2209 | if code is None: |
|
2210 | if code is None: | |
2210 | # Case 2 |
|
2211 | # Case 2 | |
2211 | return True |
|
2212 | return True | |
2212 |
|
2213 | |||
2213 | # Case 3 |
|
2214 | # Case 3 | |
2214 | # We store the code object so that threaded shells and |
|
2215 | # We store the code object so that threaded shells and | |
2215 | # custom exception handlers can access all this info if needed. |
|
2216 | # custom exception handlers can access all this info if needed. | |
2216 | # The source corresponding to this can be obtained from the |
|
2217 | # The source corresponding to this can be obtained from the | |
2217 | # buffer attribute as '\n'.join(self.buffer). |
|
2218 | # buffer attribute as '\n'.join(self.buffer). | |
2218 | self.code_to_run = code |
|
2219 | self.code_to_run = code | |
2219 | # now actually execute the code object |
|
2220 | # now actually execute the code object | |
2220 | if self.runcode(code) == 0: |
|
2221 | if self.runcode(code) == 0: | |
2221 | return False |
|
2222 | return False | |
2222 | else: |
|
2223 | else: | |
2223 | return None |
|
2224 | return None | |
2224 |
|
2225 | |||
2225 | def runcode(self,code_obj): |
|
2226 | def runcode(self,code_obj): | |
2226 | """Execute a code object. |
|
2227 | """Execute a code object. | |
2227 |
|
2228 | |||
2228 | When an exception occurs, self.showtraceback() is called to display a |
|
2229 | When an exception occurs, self.showtraceback() is called to display a | |
2229 | traceback. |
|
2230 | traceback. | |
2230 |
|
2231 | |||
2231 | Return value: a flag indicating whether the code to be run completed |
|
2232 | Return value: a flag indicating whether the code to be run completed | |
2232 | successfully: |
|
2233 | successfully: | |
2233 |
|
2234 | |||
2234 | - 0: successful execution. |
|
2235 | - 0: successful execution. | |
2235 | - 1: an error occurred. |
|
2236 | - 1: an error occurred. | |
2236 | """ |
|
2237 | """ | |
2237 |
|
2238 | |||
2238 | # Set our own excepthook in case the user code tries to call it |
|
2239 | # Set our own excepthook in case the user code tries to call it | |
2239 | # directly, so that the IPython crash handler doesn't get triggered |
|
2240 | # directly, so that the IPython crash handler doesn't get triggered | |
2240 | old_excepthook,sys.excepthook = sys.excepthook, self.excepthook |
|
2241 | old_excepthook,sys.excepthook = sys.excepthook, self.excepthook | |
2241 |
|
2242 | |||
2242 | # we save the original sys.excepthook in the instance, in case config |
|
2243 | # we save the original sys.excepthook in the instance, in case config | |
2243 | # code (such as magics) needs access to it. |
|
2244 | # code (such as magics) needs access to it. | |
2244 | self.sys_excepthook = old_excepthook |
|
2245 | self.sys_excepthook = old_excepthook | |
2245 | outflag = 1 # happens in more places, so it's easier as default |
|
2246 | outflag = 1 # happens in more places, so it's easier as default | |
2246 | try: |
|
2247 | try: | |
2247 | try: |
|
2248 | try: | |
2248 | self.hooks.pre_runcode_hook() |
|
2249 | self.hooks.pre_runcode_hook() | |
2249 | exec code_obj in self.user_global_ns, self.user_ns |
|
2250 | exec code_obj in self.user_global_ns, self.user_ns | |
2250 | finally: |
|
2251 | finally: | |
2251 | # Reset our crash handler in place |
|
2252 | # Reset our crash handler in place | |
2252 | sys.excepthook = old_excepthook |
|
2253 | sys.excepthook = old_excepthook | |
2253 | except SystemExit: |
|
2254 | except SystemExit: | |
2254 | self.resetbuffer() |
|
2255 | self.resetbuffer() | |
2255 | self.showtraceback() |
|
2256 | self.showtraceback() | |
2256 | warn("Type %exit or %quit to exit IPython " |
|
2257 | warn("Type %exit or %quit to exit IPython " | |
2257 | "(%Exit or %Quit do so unconditionally).",level=1) |
|
2258 | "(%Exit or %Quit do so unconditionally).",level=1) | |
2258 | except self.custom_exceptions: |
|
2259 | except self.custom_exceptions: | |
2259 | etype,value,tb = sys.exc_info() |
|
2260 | etype,value,tb = sys.exc_info() | |
2260 | self.CustomTB(etype,value,tb) |
|
2261 | self.CustomTB(etype,value,tb) | |
2261 | except: |
|
2262 | except: | |
2262 | self.showtraceback() |
|
2263 | self.showtraceback() | |
2263 | else: |
|
2264 | else: | |
2264 | outflag = 0 |
|
2265 | outflag = 0 | |
2265 | if softspace(sys.stdout, 0): |
|
2266 | if softspace(sys.stdout, 0): | |
2266 |
|
2267 | |||
2267 | # Flush out code object which has been run (and source) |
|
2268 | # Flush out code object which has been run (and source) | |
2268 | self.code_to_run = None |
|
2269 | self.code_to_run = None | |
2269 | return outflag |
|
2270 | return outflag | |
2270 |
|
2271 | |||
2271 | def push(self, line): |
|
2272 | def push(self, line): | |
2272 | """Push a line to the interpreter. |
|
2273 | """Push a line to the interpreter. | |
2273 |
|
2274 | |||
2274 | The line should not have a trailing newline; it may have |
|
2275 | The line should not have a trailing newline; it may have | |
2275 | internal newlines. The line is appended to a buffer and the |
|
2276 | internal newlines. The line is appended to a buffer and the | |
2276 | interpreter's runsource() method is called with the |
|
2277 | interpreter's runsource() method is called with the | |
2277 | concatenated contents of the buffer as source. If this |
|
2278 | concatenated contents of the buffer as source. If this | |
2278 | indicates that the command was executed or invalid, the buffer |
|
2279 | indicates that the command was executed or invalid, the buffer | |
2279 | is reset; otherwise, the command is incomplete, and the buffer |
|
2280 | is reset; otherwise, the command is incomplete, and the buffer | |
2280 | is left as it was after the line was appended. The return |
|
2281 | is left as it was after the line was appended. The return | |
2281 | value is 1 if more input is required, 0 if the line was dealt |
|
2282 | value is 1 if more input is required, 0 if the line was dealt | |
2282 | with in some way (this is the same as runsource()). |
|
2283 | with in some way (this is the same as runsource()). | |
2283 | """ |
|
2284 | """ | |
2284 |
|
2285 | |||
2285 | # autoindent management should be done here, and not in the |
|
2286 | # autoindent management should be done here, and not in the | |
2286 | # interactive loop, since that one is only seen by keyboard input. We |
|
2287 | # interactive loop, since that one is only seen by keyboard input. We | |
2287 | # need this done correctly even for code run via runlines (which uses |
|
2288 | # need this done correctly even for code run via runlines (which uses | |
2288 | # push). |
|
2289 | # push). | |
2289 |
|
2290 | |||
2290 | #print 'push line: <%s>' % line # dbg |
|
2291 | #print 'push line: <%s>' % line # dbg | |
2291 | for subline in line.splitlines(): |
|
2292 | for subline in line.splitlines(): | |
2292 | self.autoindent_update(subline) |
|
2293 | self.autoindent_update(subline) | |
2293 | self.buffer.append(line) |
|
2294 | self.buffer.append(line) | |
2294 | more = self.runsource('\n'.join(self.buffer), self.filename) |
|
2295 | more = self.runsource('\n'.join(self.buffer), self.filename) | |
2295 | if not more: |
|
2296 | if not more: | |
2296 | self.resetbuffer() |
|
2297 | self.resetbuffer() | |
2297 | return more |
|
2298 | return more | |
2298 |
|
2299 | |||
2299 | def split_user_input(self, line): |
|
2300 | def split_user_input(self, line): | |
2300 | # This is really a hold-over to support ipapi and some extensions |
|
2301 | # This is really a hold-over to support ipapi and some extensions | |
2301 | return prefilter.splitUserInput(line) |
|
2302 | return prefilter.splitUserInput(line) | |
2302 |
|
2303 | |||
2303 | def resetbuffer(self): |
|
2304 | def resetbuffer(self): | |
2304 | """Reset the input buffer.""" |
|
2305 | """Reset the input buffer.""" | |
2305 | self.buffer[:] = [] |
|
2306 | self.buffer[:] = [] | |
2306 |
|
2307 | |||
2307 | def raw_input(self,prompt='',continue_prompt=False): |
|
2308 | def raw_input(self,prompt='',continue_prompt=False): | |
2308 | """Write a prompt and read a line. |
|
2309 | """Write a prompt and read a line. | |
2309 |
|
2310 | |||
2310 | The returned line does not include the trailing newline. |
|
2311 | The returned line does not include the trailing newline. | |
2311 | When the user enters the EOF key sequence, EOFError is raised. |
|
2312 | When the user enters the EOF key sequence, EOFError is raised. | |
2312 |
|
2313 | |||
2313 | Optional inputs: |
|
2314 | Optional inputs: | |
2314 |
|
2315 | |||
2315 | - prompt(''): a string to be printed to prompt the user. |
|
2316 | - prompt(''): a string to be printed to prompt the user. | |
2316 |
|
2317 | |||
2317 | - continue_prompt(False): whether this line is the first one or a |
|
2318 | - continue_prompt(False): whether this line is the first one or a | |
2318 | continuation in a sequence of inputs. |
|
2319 | continuation in a sequence of inputs. | |
2319 | """ |
|
2320 | """ | |
2320 |
|
2321 | |||
2321 | # Code run by the user may have modified the readline completer state. |
|
2322 | # Code run by the user may have modified the readline completer state. | |
2322 | # We must ensure that our completer is back in place. |
|
2323 | # We must ensure that our completer is back in place. | |
2323 | if self.has_readline: |
|
2324 | if self.has_readline: | |
2324 | self.set_completer() |
|
2325 | self.set_completer() | |
2325 |
|
2326 | |||
2326 | try: |
|
2327 | try: | |
2327 | line = raw_input_original(prompt).decode(self.stdin_encoding) |
|
2328 | line = raw_input_original(prompt).decode(self.stdin_encoding) | |
2328 | except ValueError: |
|
2329 | except ValueError: | |
2329 | warn("\n********\nYou or a %run:ed script called sys.stdin.close()" |
|
2330 | warn("\n********\nYou or a %run:ed script called sys.stdin.close()" | |
2330 | " or sys.stdout.close()!\nExiting IPython!") |
|
2331 | " or sys.stdout.close()!\nExiting IPython!") | |
2331 | self.ask_exit() |
|
2332 | self.ask_exit() | |
2332 | return "" |
|
2333 | return "" | |
2333 |
|
2334 | |||
2334 | # Try to be reasonably smart about not re-indenting pasted input more |
|
2335 | # Try to be reasonably smart about not re-indenting pasted input more | |
2335 | # than necessary. We do this by trimming out the auto-indent initial |
|
2336 | # than necessary. We do this by trimming out the auto-indent initial | |
2336 | # spaces, if the user's actual input started itself with whitespace. |
|
2337 | # spaces, if the user's actual input started itself with whitespace. | |
2337 | #debugx('self.buffer[-1]') |
|
2338 | #debugx('self.buffer[-1]') | |
2338 |
|
2339 | |||
2339 | if self.autoindent: |
|
2340 | if self.autoindent: | |
2340 | if num_ini_spaces(line) > self.indent_current_nsp: |
|
2341 | if num_ini_spaces(line) > self.indent_current_nsp: | |
2341 | line = line[self.indent_current_nsp:] |
|
2342 | line = line[self.indent_current_nsp:] | |
2342 | self.indent_current_nsp = 0 |
|
2343 | self.indent_current_nsp = 0 | |
2343 |
|
2344 | |||
2344 | # store the unfiltered input before the user has any chance to modify |
|
2345 | # store the unfiltered input before the user has any chance to modify | |
2345 | # it. |
|
2346 | # it. | |
2346 | if line.strip(): |
|
2347 | if line.strip(): | |
2347 | if continue_prompt: |
|
2348 | if continue_prompt: | |
2348 | self.input_hist_raw[-1] += '%s\n' % line |
|
2349 | self.input_hist_raw[-1] += '%s\n' % line | |
2349 | if self.has_readline: # and some config option is set? |
|
2350 | if self.has_readline: # and some config option is set? | |
2350 | try: |
|
2351 | try: | |
2351 | histlen = self.readline.get_current_history_length() |
|
2352 | histlen = self.readline.get_current_history_length() | |
2352 | if histlen > 1: |
|
2353 | if histlen > 1: | |
2353 | newhist = self.input_hist_raw[-1].rstrip() |
|
2354 | newhist = self.input_hist_raw[-1].rstrip() | |
2354 | self.readline.remove_history_item(histlen-1) |
|
2355 | self.readline.remove_history_item(histlen-1) | |
2355 | self.readline.replace_history_item(histlen-2, |
|
2356 | self.readline.replace_history_item(histlen-2, | |
2356 | newhist.encode(self.stdin_encoding)) |
|
2357 | newhist.encode(self.stdin_encoding)) | |
2357 | except AttributeError: |
|
2358 | except AttributeError: | |
2358 | pass # re{move,place}_history_item are new in 2.4. |
|
2359 | pass # re{move,place}_history_item are new in 2.4. | |
2359 | else: |
|
2360 | else: | |
2360 | self.input_hist_raw.append('%s\n' % line) |
|
2361 | self.input_hist_raw.append('%s\n' % line) | |
2361 | # only entries starting at first column go to shadow history |
|
2362 | # only entries starting at first column go to shadow history | |
2362 | if line.lstrip() == line: |
|
2363 | if line.lstrip() == line: | |
2363 | self.shadowhist.add(line.strip()) |
|
2364 | self.shadowhist.add(line.strip()) | |
2364 | elif not continue_prompt: |
|
2365 | elif not continue_prompt: | |
2365 | self.input_hist_raw.append('\n') |
|
2366 | self.input_hist_raw.append('\n') | |
2366 | try: |
|
2367 | try: | |
2367 | lineout = self.prefilter(line,continue_prompt) |
|
2368 | lineout = self.prefilter(line,continue_prompt) | |
2368 | except: |
|
2369 | except: | |
2369 | # blanket except, in case a user-defined prefilter crashes, so it |
|
2370 | # blanket except, in case a user-defined prefilter crashes, so it | |
2370 | # can't take all of ipython with it. |
|
2371 | # can't take all of ipython with it. | |
2371 | self.showtraceback() |
|
2372 | self.showtraceback() | |
2372 | return '' |
|
2373 | return '' | |
2373 | else: |
|
2374 | else: | |
2374 | return lineout |
|
2375 | return lineout | |
2375 |
|
2376 | |||
2376 | def _prefilter(self, line, continue_prompt): |
|
2377 | def _prefilter(self, line, continue_prompt): | |
2377 | """Calls different preprocessors, depending on the form of line.""" |
|
2378 | """Calls different preprocessors, depending on the form of line.""" | |
2378 |
|
2379 | |||
2379 | # All handlers *must* return a value, even if it's blank (''). |
|
2380 | # All handlers *must* return a value, even if it's blank (''). | |
2380 |
|
2381 | |||
2381 | # Lines are NOT logged here. Handlers should process the line as |
|
2382 | # Lines are NOT logged here. Handlers should process the line as | |
2382 | # needed, update the cache AND log it (so that the input cache array |
|
2383 | # needed, update the cache AND log it (so that the input cache array | |
2383 | # stays synced). |
|
2384 | # stays synced). | |
2384 |
|
2385 | |||
2385 | #..................................................................... |
|
2386 | #..................................................................... | |
2386 | # Code begins |
|
2387 | # Code begins | |
2387 |
|
2388 | |||
2388 | #if line.startswith('%crash'): raise RuntimeError,'Crash now!' # dbg |
|
2389 | #if line.startswith('%crash'): raise RuntimeError,'Crash now!' # dbg | |
2389 |
|
2390 | |||
2390 | # save the line away in case we crash, so the post-mortem handler can |
|
2391 | # save the line away in case we crash, so the post-mortem handler can | |
2391 | # record it |
|
2392 | # record it | |
2392 | self._last_input_line = line |
|
2393 | self._last_input_line = line | |
2393 |
|
2394 | |||
2394 | #print '***line: <%s>' % line # dbg |
|
2395 | #print '***line: <%s>' % line # dbg | |
2395 |
|
2396 | |||
2396 | if not line: |
|
2397 | if not line: | |
2397 | # Return immediately on purely empty lines, so that if the user |
|
2398 | # Return immediately on purely empty lines, so that if the user | |
2398 | # previously typed some whitespace that started a continuation |
|
2399 | # previously typed some whitespace that started a continuation | |
2399 | # prompt, he can break out of that loop with just an empty line. |
|
2400 | # prompt, he can break out of that loop with just an empty line. | |
2400 | # This is how the default python prompt works. |
|
2401 | # This is how the default python prompt works. | |
2401 |
|
2402 | |||
2402 | # Only return if the accumulated input buffer was just whitespace! |
|
2403 | # Only return if the accumulated input buffer was just whitespace! | |
2403 | if ''.join(self.buffer).isspace(): |
|
2404 | if ''.join(self.buffer).isspace(): | |
2404 | self.buffer[:] = [] |
|
2405 | self.buffer[:] = [] | |
2405 | return '' |
|
2406 | return '' | |
2406 |
|
2407 | |||
2407 | line_info = prefilter.LineInfo(line, continue_prompt) |
|
2408 | line_info = prefilter.LineInfo(line, continue_prompt) | |
2408 |
|
2409 | |||
2409 | # the input history needs to track even empty lines |
|
2410 | # the input history needs to track even empty lines | |
2410 | stripped = line.strip() |
|
2411 | stripped = line.strip() | |
2411 |
|
2412 | |||
2412 | if not stripped: |
|
2413 | if not stripped: | |
2413 | if not continue_prompt: |
|
2414 | if not continue_prompt: | |
2414 | self.outputcache.prompt_count -= 1 |
|
2415 | self.outputcache.prompt_count -= 1 | |
2415 | return self.handle_normal(line_info) |
|
2416 | return self.handle_normal(line_info) | |
2416 |
|
2417 | |||
2417 | # print '***cont',continue_prompt # dbg |
|
2418 | # print '***cont',continue_prompt # dbg | |
2418 | # special handlers are only allowed for single line statements |
|
2419 | # special handlers are only allowed for single line statements | |
2419 | if continue_prompt and not self.rc.multi_line_specials: |
|
2420 | if continue_prompt and not self.rc.multi_line_specials: | |
2420 | return self.handle_normal(line_info) |
|
2421 | return self.handle_normal(line_info) | |
2421 |
|
2422 | |||
2422 |
|
2423 | |||
2423 | # See whether any pre-existing handler can take care of it |
|
2424 | # See whether any pre-existing handler can take care of it | |
2424 | rewritten = self.hooks.input_prefilter(stripped) |
|
2425 | rewritten = self.hooks.input_prefilter(stripped) | |
2425 | if rewritten != stripped: # ok, some prefilter did something |
|
2426 | if rewritten != stripped: # ok, some prefilter did something | |
2426 | rewritten = line_info.pre + rewritten # add indentation |
|
2427 | rewritten = line_info.pre + rewritten # add indentation | |
2427 | return self.handle_normal(prefilter.LineInfo(rewritten, |
|
2428 | return self.handle_normal(prefilter.LineInfo(rewritten, | |
2428 | continue_prompt)) |
|
2429 | continue_prompt)) | |
2429 |
|
2430 | |||
2430 | #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun,theRest) # dbg |
|
2431 | #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun,theRest) # dbg | |
2431 |
|
2432 | |||
2432 | return prefilter.prefilter(line_info, self) |
|
2433 | return prefilter.prefilter(line_info, self) | |
2433 |
|
2434 | |||
2434 |
|
2435 | |||
2435 | def _prefilter_dumb(self, line, continue_prompt): |
|
2436 | def _prefilter_dumb(self, line, continue_prompt): | |
2436 | """simple prefilter function, for debugging""" |
|
2437 | """simple prefilter function, for debugging""" | |
2437 | return self.handle_normal(line,continue_prompt) |
|
2438 | return self.handle_normal(line,continue_prompt) | |
2438 |
|
2439 | |||
2439 |
|
2440 | |||
2440 | def multiline_prefilter(self, line, continue_prompt): |
|
2441 | def multiline_prefilter(self, line, continue_prompt): | |
2441 | """ Run _prefilter for each line of input |
|
2442 | """ Run _prefilter for each line of input | |
2442 |
|
2443 | |||
2443 | Covers cases where there are multiple lines in the user entry, |
|
2444 | Covers cases where there are multiple lines in the user entry, | |
2444 | which is the case when the user goes back to a multiline history |
|
2445 | which is the case when the user goes back to a multiline history | |
2445 | entry and presses enter. |
|
2446 | entry and presses enter. | |
2446 |
|
2447 | |||
2447 | """ |
|
2448 | """ | |
2448 | out = [] |
|
2449 | out = [] | |
2449 | for l in line.rstrip('\n').split('\n'): |
|
2450 | for l in line.rstrip('\n').split('\n'): | |
2450 | out.append(self._prefilter(l, continue_prompt)) |
|
2451 | out.append(self._prefilter(l, continue_prompt)) | |
2451 | return '\n'.join(out) |
|
2452 | return '\n'.join(out) | |
2452 |
|
2453 | |||
2453 | # Set the default prefilter() function (this can be user-overridden) |
|
2454 | # Set the default prefilter() function (this can be user-overridden) | |
2454 | prefilter = multiline_prefilter |
|
2455 | prefilter = multiline_prefilter | |
2455 |
|
2456 | |||
2456 | def handle_normal(self,line_info): |
|
2457 | def handle_normal(self,line_info): | |
2457 | """Handle normal input lines. Use as a template for handlers.""" |
|
2458 | """Handle normal input lines. Use as a template for handlers.""" | |
2458 |
|
2459 | |||
2459 | # With autoindent on, we need some way to exit the input loop, and I |
|
2460 | # With autoindent on, we need some way to exit the input loop, and I | |
2460 | # don't want to force the user to have to backspace all the way to |
|
2461 | # don't want to force the user to have to backspace all the way to | |
2461 | # clear the line. The rule will be in this case, that either two |
|
2462 | # clear the line. The rule will be in this case, that either two | |
2462 | # lines of pure whitespace in a row, or a line of pure whitespace but |
|
2463 | # lines of pure whitespace in a row, or a line of pure whitespace but | |
2463 | # of a size different to the indent level, will exit the input loop. |
|
2464 | # of a size different to the indent level, will exit the input loop. | |
2464 | line = line_info.line |
|
2465 | line = line_info.line | |
2465 | continue_prompt = line_info.continue_prompt |
|
2466 | continue_prompt = line_info.continue_prompt | |
2466 |
|
2467 | |||
2467 | if (continue_prompt and self.autoindent and line.isspace() and |
|
2468 | if (continue_prompt and self.autoindent and line.isspace() and | |
2468 | (0 < abs(len(line) - self.indent_current_nsp) <= 2 or |
|
2469 | (0 < abs(len(line) - self.indent_current_nsp) <= 2 or | |
2469 | (self.buffer[-1]).isspace() )): |
|
2470 | (self.buffer[-1]).isspace() )): | |
2470 | line = '' |
|
2471 | line = '' | |
2471 |
|
2472 | |||
2472 | self.log(line,line,continue_prompt) |
|
2473 | self.log(line,line,continue_prompt) | |
2473 | return line |
|
2474 | return line | |
2474 |
|
2475 | |||
2475 | def handle_alias(self,line_info): |
|
2476 | def handle_alias(self,line_info): | |
2476 | """Handle alias input lines. """ |
|
2477 | """Handle alias input lines. """ | |
2477 | tgt = self.alias_table[line_info.iFun] |
|
2478 | tgt = self.alias_table[line_info.iFun] | |
2478 | # print "=>",tgt #dbg |
|
2479 | # print "=>",tgt #dbg | |
2479 | if callable(tgt): |
|
2480 | if callable(tgt): | |
2480 | if '$' in line_info.line: |
|
2481 | if '$' in line_info.line: | |
2481 | call_meth = '(_ip, _ip.itpl(%s))' |
|
2482 | call_meth = '(_ip, _ip.itpl(%s))' | |
2482 | else: |
|
2483 | else: | |
2483 | call_meth = '(_ip,%s)' |
|
2484 | call_meth = '(_ip,%s)' | |
2484 | line_out = ("%s_sh.%s" + call_meth) % (line_info.preWhitespace, |
|
2485 | line_out = ("%s_sh.%s" + call_meth) % (line_info.preWhitespace, | |
2485 | line_info.iFun, |
|
2486 | line_info.iFun, | |
2486 | make_quoted_expr(line_info.line)) |
|
2487 | make_quoted_expr(line_info.line)) | |
2487 | else: |
|
2488 | else: | |
2488 | transformed = self.expand_aliases(line_info.iFun,line_info.theRest) |
|
2489 | transformed = self.expand_aliases(line_info.iFun,line_info.theRest) | |
2489 |
|
2490 | |||
2490 | # pre is needed, because it carries the leading whitespace. Otherwise |
|
2491 | # pre is needed, because it carries the leading whitespace. Otherwise | |
2491 | # aliases won't work in indented sections. |
|
2492 | # aliases won't work in indented sections. | |
2492 | line_out = '%s_ip.system(%s)' % (line_info.preWhitespace, |
|
2493 | line_out = '%s_ip.system(%s)' % (line_info.preWhitespace, | |
2493 | make_quoted_expr( transformed )) |
|
2494 | make_quoted_expr( transformed )) | |
2494 |
|
2495 | |||
2495 | self.log(line_info.line,line_out,line_info.continue_prompt) |
|
2496 | self.log(line_info.line,line_out,line_info.continue_prompt) | |
2496 | #print 'line out:',line_out # dbg |
|
2497 | #print 'line out:',line_out # dbg | |
2497 | return line_out |
|
2498 | return line_out | |
2498 |
|
2499 | |||
2499 | def handle_shell_escape(self, line_info): |
|
2500 | def handle_shell_escape(self, line_info): | |
2500 | """Execute the line in a shell, empty return value""" |
|
2501 | """Execute the line in a shell, empty return value""" | |
2501 | #print 'line in :', `line` # dbg |
|
2502 | #print 'line in :', `line` # dbg | |
2502 | line = line_info.line |
|
2503 | line = line_info.line | |
2503 | if line.lstrip().startswith('!!'): |
|
2504 | if line.lstrip().startswith('!!'): | |
2504 | # rewrite LineInfo's line, iFun and theRest to properly hold the |
|
2505 | # rewrite LineInfo's line, iFun and theRest to properly hold the | |
2505 | # call to %sx and the actual command to be executed, so |
|
2506 | # call to %sx and the actual command to be executed, so | |
2506 | # handle_magic can work correctly. Note that this works even if |
|
2507 | # handle_magic can work correctly. Note that this works even if | |
2507 | # the line is indented, so it handles multi_line_specials |
|
2508 | # the line is indented, so it handles multi_line_specials | |
2508 | # properly. |
|
2509 | # properly. | |
2509 | new_rest = line.lstrip()[2:] |
|
2510 | new_rest = line.lstrip()[2:] | |
2510 | line_info.line = '%ssx %s' % (self.ESC_MAGIC,new_rest) |
|
2511 | line_info.line = '%ssx %s' % (self.ESC_MAGIC,new_rest) | |
2511 | line_info.iFun = 'sx' |
|
2512 | line_info.iFun = 'sx' | |
2512 | line_info.theRest = new_rest |
|
2513 | line_info.theRest = new_rest | |
2513 | return self.handle_magic(line_info) |
|
2514 | return self.handle_magic(line_info) | |
2514 | else: |
|
2515 | else: | |
2515 | cmd = line.lstrip().lstrip('!') |
|
2516 | cmd = line.lstrip().lstrip('!') | |
2516 | line_out = '%s_ip.system(%s)' % (line_info.preWhitespace, |
|
2517 | line_out = '%s_ip.system(%s)' % (line_info.preWhitespace, | |
2517 | make_quoted_expr(cmd)) |
|
2518 | make_quoted_expr(cmd)) | |
2518 | # update cache/log and return |
|
2519 | # update cache/log and return | |
2519 | self.log(line,line_out,line_info.continue_prompt) |
|
2520 | self.log(line,line_out,line_info.continue_prompt) | |
2520 | return line_out |
|
2521 | return line_out | |
2521 |
|
2522 | |||
2522 | def handle_magic(self, line_info): |
|
2523 | def handle_magic(self, line_info): | |
2523 | """Execute magic functions.""" |
|
2524 | """Execute magic functions.""" | |
2524 | iFun = line_info.iFun |
|
2525 | iFun = line_info.iFun | |
2525 | theRest = line_info.theRest |
|
2526 | theRest = line_info.theRest | |
2526 | cmd = '%s_ip.magic(%s)' % (line_info.preWhitespace, |
|
2527 | cmd = '%s_ip.magic(%s)' % (line_info.preWhitespace, | |
2527 | make_quoted_expr(iFun + " " + theRest)) |
|
2528 | make_quoted_expr(iFun + " " + theRest)) | |
2528 | self.log(line_info.line,cmd,line_info.continue_prompt) |
|
2529 | self.log(line_info.line,cmd,line_info.continue_prompt) | |
2529 | #print 'in handle_magic, cmd=<%s>' % cmd # dbg |
|
2530 | #print 'in handle_magic, cmd=<%s>' % cmd # dbg | |
2530 | return cmd |
|
2531 | return cmd | |
2531 |
|
2532 | |||
2532 | def handle_auto(self, line_info): |
|
2533 | def handle_auto(self, line_info): | |
2533 | """Hande lines which can be auto-executed, quoting if requested.""" |
|
2534 | """Hande lines which can be auto-executed, quoting if requested.""" | |
2534 |
|
2535 | |||
2535 | line = line_info.line |
|
2536 | line = line_info.line | |
2536 | iFun = line_info.iFun |
|
2537 | iFun = line_info.iFun | |
2537 | theRest = line_info.theRest |
|
2538 | theRest = line_info.theRest | |
2538 | pre = line_info.pre |
|
2539 | pre = line_info.pre | |
2539 | continue_prompt = line_info.continue_prompt |
|
2540 | continue_prompt = line_info.continue_prompt | |
2540 | obj = line_info.ofind(self)['obj'] |
|
2541 | obj = line_info.ofind(self)['obj'] | |
2541 |
|
2542 | |||
2542 | #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun,theRest) # dbg |
|
2543 | #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun,theRest) # dbg | |
2543 |
|
2544 | |||
2544 | # This should only be active for single-line input! |
|
2545 | # This should only be active for single-line input! | |
2545 | if continue_prompt: |
|
2546 | if continue_prompt: | |
2546 | self.log(line,line,continue_prompt) |
|
2547 | self.log(line,line,continue_prompt) | |
2547 | return line |
|
2548 | return line | |
2548 |
|
2549 | |||
2549 | force_auto = isinstance(obj, IPython.ipapi.IPyAutocall) |
|
2550 | force_auto = isinstance(obj, IPython.ipapi.IPyAutocall) | |
2550 | auto_rewrite = True |
|
2551 | auto_rewrite = True | |
2551 |
|
2552 | |||
2552 | if pre == self.ESC_QUOTE: |
|
2553 | if pre == self.ESC_QUOTE: | |
2553 | # Auto-quote splitting on whitespace |
|
2554 | # Auto-quote splitting on whitespace | |
2554 | newcmd = '%s("%s")' % (iFun,'", "'.join(theRest.split()) ) |
|
2555 | newcmd = '%s("%s")' % (iFun,'", "'.join(theRest.split()) ) | |
2555 | elif pre == self.ESC_QUOTE2: |
|
2556 | elif pre == self.ESC_QUOTE2: | |
2556 | # Auto-quote whole string |
|
2557 | # Auto-quote whole string | |
2557 | newcmd = '%s("%s")' % (iFun,theRest) |
|
2558 | newcmd = '%s("%s")' % (iFun,theRest) | |
2558 | elif pre == self.ESC_PAREN: |
|
2559 | elif pre == self.ESC_PAREN: | |
2559 | newcmd = '%s(%s)' % (iFun,",".join(theRest.split())) |
|
2560 | newcmd = '%s(%s)' % (iFun,",".join(theRest.split())) | |
2560 | else: |
|
2561 | else: | |
2561 | # Auto-paren. |
|
2562 | # Auto-paren. | |
2562 | # We only apply it to argument-less calls if the autocall |
|
2563 | # We only apply it to argument-less calls if the autocall | |
2563 | # parameter is set to 2. We only need to check that autocall is < |
|
2564 | # parameter is set to 2. We only need to check that autocall is < | |
2564 | # 2, since this function isn't called unless it's at least 1. |
|
2565 | # 2, since this function isn't called unless it's at least 1. | |
2565 | if not theRest and (self.rc.autocall < 2) and not force_auto: |
|
2566 | if not theRest and (self.rc.autocall < 2) and not force_auto: | |
2566 | newcmd = '%s %s' % (iFun,theRest) |
|
2567 | newcmd = '%s %s' % (iFun,theRest) | |
2567 | auto_rewrite = False |
|
2568 | auto_rewrite = False | |
2568 | else: |
|
2569 | else: | |
2569 | if not force_auto and theRest.startswith('['): |
|
2570 | if not force_auto and theRest.startswith('['): | |
2570 | if hasattr(obj,'__getitem__'): |
|
2571 | if hasattr(obj,'__getitem__'): | |
2571 | # Don't autocall in this case: item access for an object |
|
2572 | # Don't autocall in this case: item access for an object | |
2572 | # which is BOTH callable and implements __getitem__. |
|
2573 | # which is BOTH callable and implements __getitem__. | |
2573 | newcmd = '%s %s' % (iFun,theRest) |
|
2574 | newcmd = '%s %s' % (iFun,theRest) | |
2574 | auto_rewrite = False |
|
2575 | auto_rewrite = False | |
2575 | else: |
|
2576 | else: | |
2576 | # if the object doesn't support [] access, go ahead and |
|
2577 | # if the object doesn't support [] access, go ahead and | |
2577 | # autocall |
|
2578 | # autocall | |
2578 | newcmd = '%s(%s)' % (iFun.rstrip(),theRest) |
|
2579 | newcmd = '%s(%s)' % (iFun.rstrip(),theRest) | |
2579 | elif theRest.endswith(';'): |
|
2580 | elif theRest.endswith(';'): | |
2580 | newcmd = '%s(%s);' % (iFun.rstrip(),theRest[:-1]) |
|
2581 | newcmd = '%s(%s);' % (iFun.rstrip(),theRest[:-1]) | |
2581 | else: |
|
2582 | else: | |
2582 | newcmd = '%s(%s)' % (iFun.rstrip(), theRest) |
|
2583 | newcmd = '%s(%s)' % (iFun.rstrip(), theRest) | |
2583 |
|
2584 | |||
2584 | if auto_rewrite: |
|
2585 | if auto_rewrite: | |
2585 | rw = self.outputcache.prompt1.auto_rewrite() + newcmd |
|
2586 | rw = self.outputcache.prompt1.auto_rewrite() + newcmd | |
2586 |
|
2587 | |||
2587 | try: |
|
2588 | try: | |
2588 | # plain ascii works better w/ pyreadline, on some machines, so |
|
2589 | # plain ascii works better w/ pyreadline, on some machines, so | |
2589 | # we use it and only print uncolored rewrite if we have unicode |
|
2590 | # we use it and only print uncolored rewrite if we have unicode | |
2590 | rw = str(rw) |
|
2591 | rw = str(rw) | |
2591 | print >>Term.cout, rw |
|
2592 | print >>Term.cout, rw | |
2592 | except UnicodeEncodeError: |
|
2593 | except UnicodeEncodeError: | |
2593 | print "-------------->" + newcmd |
|
2594 | print "-------------->" + newcmd | |
2594 |
|
2595 | |||
2595 | # log what is now valid Python, not the actual user input (without the |
|
2596 | # log what is now valid Python, not the actual user input (without the | |
2596 | # final newline) |
|
2597 | # final newline) | |
2597 | self.log(line,newcmd,continue_prompt) |
|
2598 | self.log(line,newcmd,continue_prompt) | |
2598 | return newcmd |
|
2599 | return newcmd | |
2599 |
|
2600 | |||
2600 | def handle_help(self, line_info): |
|
2601 | def handle_help(self, line_info): | |
2601 | """Try to get some help for the object. |
|
2602 | """Try to get some help for the object. | |
2602 |
|
2603 | |||
2603 | obj? or ?obj -> basic information. |
|
2604 | obj? or ?obj -> basic information. | |
2604 | obj?? or ??obj -> more details. |
|
2605 | obj?? or ??obj -> more details. | |
2605 | """ |
|
2606 | """ | |
2606 |
|
2607 | |||
2607 | line = line_info.line |
|
2608 | line = line_info.line | |
2608 | # We need to make sure that we don't process lines which would be |
|
2609 | # We need to make sure that we don't process lines which would be | |
2609 | # otherwise valid python, such as "x=1 # what?" |
|
2610 | # otherwise valid python, such as "x=1 # what?" | |
2610 | try: |
|
2611 | try: | |
2611 | codeop.compile_command(line) |
|
2612 | codeop.compile_command(line) | |
2612 | except SyntaxError: |
|
2613 | except SyntaxError: | |
2613 | # We should only handle as help stuff which is NOT valid syntax |
|
2614 | # We should only handle as help stuff which is NOT valid syntax | |
2614 | if line[0]==self.ESC_HELP: |
|
2615 | if line[0]==self.ESC_HELP: | |
2615 | line = line[1:] |
|
2616 | line = line[1:] | |
2616 | elif line[-1]==self.ESC_HELP: |
|
2617 | elif line[-1]==self.ESC_HELP: | |
2617 | line = line[:-1] |
|
2618 | line = line[:-1] | |
2618 | self.log(line,'#?'+line,line_info.continue_prompt) |
|
2619 | self.log(line,'#?'+line,line_info.continue_prompt) | |
2619 | if line: |
|
2620 | if line: | |
2620 | #print 'line:<%r>' % line # dbg |
|
2621 | #print 'line:<%r>' % line # dbg | |
2621 | self.magic_pinfo(line) |
|
2622 | self.magic_pinfo(line) | |
2622 | else: |
|
2623 | else: | |
2623 | page(self.usage,screen_lines=self.rc.screen_length) |
|
2624 | page(self.usage,screen_lines=self.rc.screen_length) | |
2624 | return '' # Empty string is needed here! |
|
2625 | return '' # Empty string is needed here! | |
2625 | except: |
|
2626 | except: | |
2626 | # Pass any other exceptions through to the normal handler |
|
2627 | # Pass any other exceptions through to the normal handler | |
2627 | return self.handle_normal(line_info) |
|
2628 | return self.handle_normal(line_info) | |
2628 | else: |
|
2629 | else: | |
2629 | # If the code compiles ok, we should handle it normally |
|
2630 | # If the code compiles ok, we should handle it normally | |
2630 | return self.handle_normal(line_info) |
|
2631 | return self.handle_normal(line_info) | |
2631 |
|
2632 | |||
2632 | def getapi(self): |
|
2633 | def getapi(self): | |
2633 | """ Get an IPApi object for this shell instance |
|
2634 | """ Get an IPApi object for this shell instance | |
2634 |
|
2635 | |||
2635 | Getting an IPApi object is always preferable to accessing the shell |
|
2636 | Getting an IPApi object is always preferable to accessing the shell | |
2636 | directly, but this holds true especially for extensions. |
|
2637 | directly, but this holds true especially for extensions. | |
2637 |
|
2638 | |||
2638 | It should always be possible to implement an extension with IPApi |
|
2639 | It should always be possible to implement an extension with IPApi | |
2639 | alone. If not, contact maintainer to request an addition. |
|
2640 | alone. If not, contact maintainer to request an addition. | |
2640 |
|
2641 | |||
2641 | """ |
|
2642 | """ | |
2642 | return self.api |
|
2643 | return self.api | |
2643 |
|
2644 | |||
2644 | def handle_emacs(self, line_info): |
|
2645 | def handle_emacs(self, line_info): | |
2645 | """Handle input lines marked by python-mode.""" |
|
2646 | """Handle input lines marked by python-mode.""" | |
2646 |
|
2647 | |||
2647 | # Currently, nothing is done. Later more functionality can be added |
|
2648 | # Currently, nothing is done. Later more functionality can be added | |
2648 | # here if needed. |
|
2649 | # here if needed. | |
2649 |
|
2650 | |||
2650 | # The input cache shouldn't be updated |
|
2651 | # The input cache shouldn't be updated | |
2651 | return line_info.line |
|
2652 | return line_info.line | |
2652 |
|
2653 | |||
2653 |
|
2654 | |||
2654 | def mktempfile(self,data=None): |
|
2655 | def mktempfile(self,data=None): | |
2655 | """Make a new tempfile and return its filename. |
|
2656 | """Make a new tempfile and return its filename. | |
2656 |
|
2657 | |||
2657 | This makes a call to tempfile.mktemp, but it registers the created |
|
2658 | This makes a call to tempfile.mktemp, but it registers the created | |
2658 | filename internally so ipython cleans it up at exit time. |
|
2659 | filename internally so ipython cleans it up at exit time. | |
2659 |
|
2660 | |||
2660 | Optional inputs: |
|
2661 | Optional inputs: | |
2661 |
|
2662 | |||
2662 | - data(None): if data is given, it gets written out to the temp file |
|
2663 | - data(None): if data is given, it gets written out to the temp file | |
2663 | immediately, and the file is closed again.""" |
|
2664 | immediately, and the file is closed again.""" | |
2664 |
|
2665 | |||
2665 | filename = tempfile.mktemp('.py','ipython_edit_') |
|
2666 | filename = tempfile.mktemp('.py','ipython_edit_') | |
2666 | self.tempfiles.append(filename) |
|
2667 | self.tempfiles.append(filename) | |
2667 |
|
2668 | |||
2668 | if data: |
|
2669 | if data: | |
2669 | tmp_file = open(filename,'w') |
|
2670 | tmp_file = open(filename,'w') | |
2670 | tmp_file.write(data) |
|
2671 | tmp_file.write(data) | |
2671 | tmp_file.close() |
|
2672 | tmp_file.close() | |
2672 | return filename |
|
2673 | return filename | |
2673 |
|
2674 | |||
2674 | def write(self,data): |
|
2675 | def write(self,data): | |
2675 | """Write a string to the default output""" |
|
2676 | """Write a string to the default output""" | |
2676 | Term.cout.write(data) |
|
2677 | Term.cout.write(data) | |
2677 |
|
2678 | |||
2678 | def write_err(self,data): |
|
2679 | def write_err(self,data): | |
2679 | """Write a string to the default error output""" |
|
2680 | """Write a string to the default error output""" | |
2680 | Term.cerr.write(data) |
|
2681 | Term.cerr.write(data) | |
2681 |
|
2682 | |||
2682 | def ask_exit(self): |
|
2683 | def ask_exit(self): | |
2683 | """ Call for exiting. Can be overiden and used as a callback. """ |
|
2684 | """ Call for exiting. Can be overiden and used as a callback. """ | |
2684 | self.exit_now = True |
|
2685 | self.exit_now = True | |
2685 |
|
2686 | |||
2686 | def exit(self): |
|
2687 | def exit(self): | |
2687 | """Handle interactive exit. |
|
2688 | """Handle interactive exit. | |
2688 |
|
2689 | |||
2689 | This method calls the ask_exit callback.""" |
|
2690 | This method calls the ask_exit callback.""" | |
2690 |
|
2691 | |||
2691 | if self.rc.confirm_exit: |
|
2692 | if self.rc.confirm_exit: | |
2692 | if self.ask_yes_no('Do you really want to exit ([y]/n)?','y'): |
|
2693 | if self.ask_yes_no('Do you really want to exit ([y]/n)?','y'): | |
2693 | self.ask_exit() |
|
2694 | self.ask_exit() | |
2694 | else: |
|
2695 | else: | |
2695 | self.ask_exit() |
|
2696 | self.ask_exit() | |
2696 |
|
2697 | |||
2697 | def safe_execfile(self,fname,*where,**kw): |
|
2698 | def safe_execfile(self,fname,*where,**kw): | |
2698 | """A safe version of the builtin execfile(). |
|
2699 | """A safe version of the builtin execfile(). | |
2699 |
|
2700 | |||
2700 | This version will never throw an exception, and knows how to handle |
|
2701 | This version will never throw an exception, and knows how to handle | |
2701 | ipython logs as well. |
|
2702 | ipython logs as well. | |
2702 |
|
2703 | |||
2703 | :Parameters: |
|
2704 | :Parameters: | |
2704 | fname : string |
|
2705 | fname : string | |
2705 | Name of the file to be executed. |
|
2706 | Name of the file to be executed. | |
2706 |
|
2707 | |||
2707 | where : tuple |
|
2708 | where : tuple | |
2708 | One or two namespaces, passed to execfile() as (globals,locals). |
|
2709 | One or two namespaces, passed to execfile() as (globals,locals). | |
2709 | If only one is given, it is passed as both. |
|
2710 | If only one is given, it is passed as both. | |
2710 |
|
2711 | |||
2711 | :Keywords: |
|
2712 | :Keywords: | |
2712 | islog : boolean (False) |
|
2713 | islog : boolean (False) | |
2713 |
|
2714 | |||
2714 | quiet : boolean (True) |
|
2715 | quiet : boolean (True) | |
2715 |
|
2716 | |||
2716 | exit_ignore : boolean (False) |
|
2717 | exit_ignore : boolean (False) | |
2717 | """ |
|
2718 | """ | |
2718 |
|
2719 | |||
2719 | def syspath_cleanup(): |
|
2720 | def syspath_cleanup(): | |
2720 | """Internal cleanup routine for sys.path.""" |
|
2721 | """Internal cleanup routine for sys.path.""" | |
2721 | if add_dname: |
|
2722 | if add_dname: | |
2722 | try: |
|
2723 | try: | |
2723 | sys.path.remove(dname) |
|
2724 | sys.path.remove(dname) | |
2724 | except ValueError: |
|
2725 | except ValueError: | |
2725 | # For some reason the user has already removed it, ignore. |
|
2726 | # For some reason the user has already removed it, ignore. | |
2726 | pass |
|
2727 | pass | |
2727 |
|
2728 | |||
2728 | fname = os.path.expanduser(fname) |
|
2729 | fname = os.path.expanduser(fname) | |
2729 |
|
2730 | |||
2730 | # Find things also in current directory. This is needed to mimic the |
|
2731 | # Find things also in current directory. This is needed to mimic the | |
2731 | # behavior of running a script from the system command line, where |
|
2732 | # behavior of running a script from the system command line, where | |
2732 | # Python inserts the script's directory into sys.path |
|
2733 | # Python inserts the script's directory into sys.path | |
2733 | dname = os.path.dirname(os.path.abspath(fname)) |
|
2734 | dname = os.path.dirname(os.path.abspath(fname)) | |
2734 | add_dname = False |
|
2735 | add_dname = False | |
2735 | if dname not in sys.path: |
|
2736 | if dname not in sys.path: | |
2736 | sys.path.insert(0,dname) |
|
2737 | sys.path.insert(0,dname) | |
2737 | add_dname = True |
|
2738 | add_dname = True | |
2738 |
|
2739 | |||
2739 | try: |
|
2740 | try: | |
2740 | xfile = open(fname) |
|
2741 | xfile = open(fname) | |
2741 | except: |
|
2742 | except: | |
2742 | print >> Term.cerr, \ |
|
2743 | print >> Term.cerr, \ | |
2743 | 'Could not open file <%s> for safe execution.' % fname |
|
2744 | 'Could not open file <%s> for safe execution.' % fname | |
2744 | syspath_cleanup() |
|
2745 | syspath_cleanup() | |
2745 | return None |
|
2746 | return None | |
2746 |
|
2747 | |||
2747 | kw.setdefault('islog',0) |
|
2748 | kw.setdefault('islog',0) | |
2748 | kw.setdefault('quiet',1) |
|
2749 | kw.setdefault('quiet',1) | |
2749 | kw.setdefault('exit_ignore',0) |
|
2750 | kw.setdefault('exit_ignore',0) | |
2750 |
|
2751 | |||
2751 | first = xfile.readline() |
|
2752 | first = xfile.readline() | |
2752 | loghead = str(self.loghead_tpl).split('\n',1)[0].strip() |
|
2753 | loghead = str(self.loghead_tpl).split('\n',1)[0].strip() | |
2753 | xfile.close() |
|
2754 | xfile.close() | |
2754 | # line by line execution |
|
2755 | # line by line execution | |
2755 | if first.startswith(loghead) or kw['islog']: |
|
2756 | if first.startswith(loghead) or kw['islog']: | |
2756 | print 'Loading log file <%s> one line at a time...' % fname |
|
2757 | print 'Loading log file <%s> one line at a time...' % fname | |
2757 | if kw['quiet']: |
|
2758 | if kw['quiet']: | |
2758 | stdout_save = sys.stdout |
|
2759 | stdout_save = sys.stdout | |
2759 | sys.stdout = StringIO.StringIO() |
|
2760 | sys.stdout = StringIO.StringIO() | |
2760 | try: |
|
2761 | try: | |
2761 | globs,locs = where[0:2] |
|
2762 | globs,locs = where[0:2] | |
2762 | except: |
|
2763 | except: | |
2763 | try: |
|
2764 | try: | |
2764 | globs = locs = where[0] |
|
2765 | globs = locs = where[0] | |
2765 | except: |
|
2766 | except: | |
2766 | globs = locs = globals() |
|
2767 | globs = locs = globals() | |
2767 | badblocks = [] |
|
2768 | badblocks = [] | |
2768 |
|
2769 | |||
2769 | # we also need to identify indented blocks of code when replaying |
|
2770 | # we also need to identify indented blocks of code when replaying | |
2770 | # logs and put them together before passing them to an exec |
|
2771 | # logs and put them together before passing them to an exec | |
2771 | # statement. This takes a bit of regexp and look-ahead work in the |
|
2772 | # statement. This takes a bit of regexp and look-ahead work in the | |
2772 | # file. It's easiest if we swallow the whole thing in memory |
|
2773 | # file. It's easiest if we swallow the whole thing in memory | |
2773 | # first, and manually walk through the lines list moving the |
|
2774 | # first, and manually walk through the lines list moving the | |
2774 | # counter ourselves. |
|
2775 | # counter ourselves. | |
2775 | indent_re = re.compile('\s+\S') |
|
2776 | indent_re = re.compile('\s+\S') | |
2776 | xfile = open(fname) |
|
2777 | xfile = open(fname) | |
2777 | filelines = xfile.readlines() |
|
2778 | filelines = xfile.readlines() | |
2778 | xfile.close() |
|
2779 | xfile.close() | |
2779 | nlines = len(filelines) |
|
2780 | nlines = len(filelines) | |
2780 | lnum = 0 |
|
2781 | lnum = 0 | |
2781 | while lnum < nlines: |
|
2782 | while lnum < nlines: | |
2782 | line = filelines[lnum] |
|
2783 | line = filelines[lnum] | |
2783 | lnum += 1 |
|
2784 | lnum += 1 | |
2784 | # don't re-insert logger status info into cache |
|
2785 | # don't re-insert logger status info into cache | |
2785 | if line.startswith('#log#'): |
|
2786 | if line.startswith('#log#'): | |
2786 | continue |
|
2787 | continue | |
2787 | else: |
|
2788 | else: | |
2788 | # build a block of code (maybe a single line) for execution |
|
2789 | # build a block of code (maybe a single line) for execution | |
2789 | block = line |
|
2790 | block = line | |
2790 | try: |
|
2791 | try: | |
2791 | next = filelines[lnum] # lnum has already incremented |
|
2792 | next = filelines[lnum] # lnum has already incremented | |
2792 | except: |
|
2793 | except: | |
2793 | next = None |
|
2794 | next = None | |
2794 | while next and indent_re.match(next): |
|
2795 | while next and indent_re.match(next): | |
2795 | block += next |
|
2796 | block += next | |
2796 | lnum += 1 |
|
2797 | lnum += 1 | |
2797 | try: |
|
2798 | try: | |
2798 | next = filelines[lnum] |
|
2799 | next = filelines[lnum] | |
2799 | except: |
|
2800 | except: | |
2800 | next = None |
|
2801 | next = None | |
2801 | # now execute the block of one or more lines |
|
2802 | # now execute the block of one or more lines | |
2802 | try: |
|
2803 | try: | |
2803 | exec block in globs,locs |
|
2804 | exec block in globs,locs | |
2804 | except SystemExit: |
|
2805 | except SystemExit: | |
2805 | pass |
|
2806 | pass | |
2806 | except: |
|
2807 | except: | |
2807 | badblocks.append(block.rstrip()) |
|
2808 | badblocks.append(block.rstrip()) | |
2808 | if kw['quiet']: # restore stdout |
|
2809 | if kw['quiet']: # restore stdout | |
2809 | sys.stdout.close() |
|
2810 | sys.stdout.close() | |
2810 | sys.stdout = stdout_save |
|
2811 | sys.stdout = stdout_save | |
2811 | print 'Finished replaying log file <%s>' % fname |
|
2812 | print 'Finished replaying log file <%s>' % fname | |
2812 | if badblocks: |
|
2813 | if badblocks: | |
2813 | print >> sys.stderr, ('\nThe following lines/blocks in file ' |
|
2814 | print >> sys.stderr, ('\nThe following lines/blocks in file ' | |
2814 | '<%s> reported errors:' % fname) |
|
2815 | '<%s> reported errors:' % fname) | |
2815 |
|
2816 | |||
2816 | for badline in badblocks: |
|
2817 | for badline in badblocks: | |
2817 | print >> sys.stderr, badline |
|
2818 | print >> sys.stderr, badline | |
2818 | else: # regular file execution |
|
2819 | else: # regular file execution | |
2819 | try: |
|
2820 | try: | |
2820 | if sys.platform == 'win32' and sys.version_info < (2,5,1): |
|
2821 | if sys.platform == 'win32' and sys.version_info < (2,5,1): | |
2821 | # Work around a bug in Python for Windows. The bug was |
|
2822 | # Work around a bug in Python for Windows. The bug was | |
2822 | # fixed in in Python 2.5 r54159 and 54158, but that's still |
|
2823 | # fixed in in Python 2.5 r54159 and 54158, but that's still | |
2823 | # SVN Python as of March/07. For details, see: |
|
2824 | # SVN Python as of March/07. For details, see: | |
2824 | # http://projects.scipy.org/ipython/ipython/ticket/123 |
|
2825 | # http://projects.scipy.org/ipython/ipython/ticket/123 | |
2825 | try: |
|
2826 | try: | |
2826 | globs,locs = where[0:2] |
|
2827 | globs,locs = where[0:2] | |
2827 | except: |
|
2828 | except: | |
2828 | try: |
|
2829 | try: | |
2829 | globs = locs = where[0] |
|
2830 | globs = locs = where[0] | |
2830 | except: |
|
2831 | except: | |
2831 | globs = locs = globals() |
|
2832 | globs = locs = globals() | |
2832 | exec file(fname) in globs,locs |
|
2833 | exec file(fname) in globs,locs | |
2833 | else: |
|
2834 | else: | |
2834 | execfile(fname,*where) |
|
2835 | execfile(fname,*where) | |
2835 | except SyntaxError: |
|
2836 | except SyntaxError: | |
2836 | self.showsyntaxerror() |
|
2837 | self.showsyntaxerror() | |
2837 | warn('Failure executing file: <%s>' % fname) |
|
2838 | warn('Failure executing file: <%s>' % fname) | |
2838 | except SystemExit,status: |
|
2839 | except SystemExit,status: | |
2839 | # Code that correctly sets the exit status flag to success (0) |
|
2840 | # Code that correctly sets the exit status flag to success (0) | |
2840 | # shouldn't be bothered with a traceback. Note that a plain |
|
2841 | # shouldn't be bothered with a traceback. Note that a plain | |
2841 | # sys.exit() does NOT set the message to 0 (it's empty) so that |
|
2842 | # sys.exit() does NOT set the message to 0 (it's empty) so that | |
2842 | # will still get a traceback. Note that the structure of the |
|
2843 | # will still get a traceback. Note that the structure of the | |
2843 | # SystemExit exception changed between Python 2.4 and 2.5, so |
|
2844 | # SystemExit exception changed between Python 2.4 and 2.5, so | |
2844 | # the checks must be done in a version-dependent way. |
|
2845 | # the checks must be done in a version-dependent way. | |
2845 | show = False |
|
2846 | show = False | |
2846 |
|
2847 | |||
2847 | if sys.version_info[:2] > (2,5): |
|
2848 | if sys.version_info[:2] > (2,5): | |
2848 | if status.message!=0 and not kw['exit_ignore']: |
|
2849 | if status.message!=0 and not kw['exit_ignore']: | |
2849 | show = True |
|
2850 | show = True | |
2850 | else: |
|
2851 | else: | |
2851 | if status.code and not kw['exit_ignore']: |
|
2852 | if status.code and not kw['exit_ignore']: | |
2852 | show = True |
|
2853 | show = True | |
2853 | if show: |
|
2854 | if show: | |
2854 | self.showtraceback() |
|
2855 | self.showtraceback() | |
2855 | warn('Failure executing file: <%s>' % fname) |
|
2856 | warn('Failure executing file: <%s>' % fname) | |
2856 | except: |
|
2857 | except: | |
2857 | self.showtraceback() |
|
2858 | self.showtraceback() | |
2858 | warn('Failure executing file: <%s>' % fname) |
|
2859 | warn('Failure executing file: <%s>' % fname) | |
2859 |
|
2860 | |||
2860 | syspath_cleanup() |
|
2861 | syspath_cleanup() | |
2861 |
|
2862 | |||
2862 | #************************* end of file <iplib.py> ***************************** |
|
2863 | #************************* end of file <iplib.py> ***************************** |
@@ -1,1066 +1,1067 | |||||
1 | # -*- coding: utf-8 -*- |
|
1 | # -*- coding: utf-8 -*- | |
2 | """ |
|
2 | """ | |
3 | ultraTB.py -- Spice up your tracebacks! |
|
3 | ultraTB.py -- Spice up your tracebacks! | |
4 |
|
4 | |||
5 | * ColorTB |
|
5 | * ColorTB | |
6 | I've always found it a bit hard to visually parse tracebacks in Python. The |
|
6 | I've always found it a bit hard to visually parse tracebacks in Python. The | |
7 | ColorTB class is a solution to that problem. It colors the different parts of a |
|
7 | ColorTB class is a solution to that problem. It colors the different parts of a | |
8 | traceback in a manner similar to what you would expect from a syntax-highlighting |
|
8 | traceback in a manner similar to what you would expect from a syntax-highlighting | |
9 | text editor. |
|
9 | text editor. | |
10 |
|
10 | |||
11 | Installation instructions for ColorTB: |
|
11 | Installation instructions for ColorTB: | |
12 | import sys,ultraTB |
|
12 | import sys,ultraTB | |
13 | sys.excepthook = ultraTB.ColorTB() |
|
13 | sys.excepthook = ultraTB.ColorTB() | |
14 |
|
14 | |||
15 | * VerboseTB |
|
15 | * VerboseTB | |
16 | I've also included a port of Ka-Ping Yee's "cgitb.py" that produces all kinds |
|
16 | I've also included a port of Ka-Ping Yee's "cgitb.py" that produces all kinds | |
17 | of useful info when a traceback occurs. Ping originally had it spit out HTML |
|
17 | of useful info when a traceback occurs. Ping originally had it spit out HTML | |
18 | and intended it for CGI programmers, but why should they have all the fun? I |
|
18 | and intended it for CGI programmers, but why should they have all the fun? I | |
19 | altered it to spit out colored text to the terminal. It's a bit overwhelming, |
|
19 | altered it to spit out colored text to the terminal. It's a bit overwhelming, | |
20 | but kind of neat, and maybe useful for long-running programs that you believe |
|
20 | but kind of neat, and maybe useful for long-running programs that you believe | |
21 | are bug-free. If a crash *does* occur in that type of program you want details. |
|
21 | are bug-free. If a crash *does* occur in that type of program you want details. | |
22 | Give it a shot--you'll love it or you'll hate it. |
|
22 | Give it a shot--you'll love it or you'll hate it. | |
23 |
|
23 | |||
24 | Note: |
|
24 | Note: | |
25 |
|
25 | |||
26 | The Verbose mode prints the variables currently visible where the exception |
|
26 | The Verbose mode prints the variables currently visible where the exception | |
27 | happened (shortening their strings if too long). This can potentially be |
|
27 | happened (shortening their strings if too long). This can potentially be | |
28 | very slow, if you happen to have a huge data structure whose string |
|
28 | very slow, if you happen to have a huge data structure whose string | |
29 | representation is complex to compute. Your computer may appear to freeze for |
|
29 | representation is complex to compute. Your computer may appear to freeze for | |
30 | a while with cpu usage at 100%. If this occurs, you can cancel the traceback |
|
30 | a while with cpu usage at 100%. If this occurs, you can cancel the traceback | |
31 | with Ctrl-C (maybe hitting it more than once). |
|
31 | with Ctrl-C (maybe hitting it more than once). | |
32 |
|
32 | |||
33 | If you encounter this kind of situation often, you may want to use the |
|
33 | If you encounter this kind of situation often, you may want to use the | |
34 | Verbose_novars mode instead of the regular Verbose, which avoids formatting |
|
34 | Verbose_novars mode instead of the regular Verbose, which avoids formatting | |
35 | variables (but otherwise includes the information and context given by |
|
35 | variables (but otherwise includes the information and context given by | |
36 | Verbose). |
|
36 | Verbose). | |
37 |
|
37 | |||
38 |
|
38 | |||
39 | Installation instructions for ColorTB: |
|
39 | Installation instructions for ColorTB: | |
40 | import sys,ultraTB |
|
40 | import sys,ultraTB | |
41 | sys.excepthook = ultraTB.VerboseTB() |
|
41 | sys.excepthook = ultraTB.VerboseTB() | |
42 |
|
42 | |||
43 | Note: Much of the code in this module was lifted verbatim from the standard |
|
43 | Note: Much of the code in this module was lifted verbatim from the standard | |
44 | library module 'traceback.py' and Ka-Ping Yee's 'cgitb.py'. |
|
44 | library module 'traceback.py' and Ka-Ping Yee's 'cgitb.py'. | |
45 |
|
45 | |||
46 | * Color schemes |
|
46 | * Color schemes | |
47 | The colors are defined in the class TBTools through the use of the |
|
47 | The colors are defined in the class TBTools through the use of the | |
48 | ColorSchemeTable class. Currently the following exist: |
|
48 | ColorSchemeTable class. Currently the following exist: | |
49 |
|
49 | |||
50 | - NoColor: allows all of this module to be used in any terminal (the color |
|
50 | - NoColor: allows all of this module to be used in any terminal (the color | |
51 | escapes are just dummy blank strings). |
|
51 | escapes are just dummy blank strings). | |
52 |
|
52 | |||
53 | - Linux: is meant to look good in a terminal like the Linux console (black |
|
53 | - Linux: is meant to look good in a terminal like the Linux console (black | |
54 | or very dark background). |
|
54 | or very dark background). | |
55 |
|
55 | |||
56 | - LightBG: similar to Linux but swaps dark/light colors to be more readable |
|
56 | - LightBG: similar to Linux but swaps dark/light colors to be more readable | |
57 | in light background terminals. |
|
57 | in light background terminals. | |
58 |
|
58 | |||
59 | You can implement other color schemes easily, the syntax is fairly |
|
59 | You can implement other color schemes easily, the syntax is fairly | |
60 | self-explanatory. Please send back new schemes you develop to the author for |
|
60 | self-explanatory. Please send back new schemes you develop to the author for | |
61 | possible inclusion in future releases. |
|
61 | possible inclusion in future releases. | |
62 | """ |
|
62 | """ | |
63 |
|
63 | |||
64 | #***************************************************************************** |
|
64 | #***************************************************************************** | |
65 | # Copyright (C) 2001 Nathaniel Gray <n8gray@caltech.edu> |
|
65 | # Copyright (C) 2001 Nathaniel Gray <n8gray@caltech.edu> | |
66 | # Copyright (C) 2001-2004 Fernando Perez <fperez@colorado.edu> |
|
66 | # Copyright (C) 2001-2004 Fernando Perez <fperez@colorado.edu> | |
67 | # |
|
67 | # | |
68 | # Distributed under the terms of the BSD License. The full license is in |
|
68 | # Distributed under the terms of the BSD License. The full license is in | |
69 | # the file COPYING, distributed as part of this software. |
|
69 | # the file COPYING, distributed as part of this software. | |
70 | #***************************************************************************** |
|
70 | #***************************************************************************** | |
71 |
|
71 | |||
72 | # Required modules |
|
72 | # Required modules | |
73 | import inspect |
|
73 | import inspect | |
74 | import keyword |
|
74 | import keyword | |
75 | import linecache |
|
75 | import linecache | |
76 | import os |
|
76 | import os | |
77 | import pydoc |
|
77 | import pydoc | |
78 | import re |
|
78 | import re | |
79 | import string |
|
79 | import string | |
80 | import sys |
|
80 | import sys | |
81 | import time |
|
81 | import time | |
82 | import tokenize |
|
82 | import tokenize | |
83 | import traceback |
|
83 | import traceback | |
84 | import types |
|
84 | import types | |
85 |
|
85 | |||
86 | # For purposes of monkeypatching inspect to fix a bug in it. |
|
86 | # For purposes of monkeypatching inspect to fix a bug in it. | |
87 | from inspect import getsourcefile, getfile, getmodule,\ |
|
87 | from inspect import getsourcefile, getfile, getmodule,\ | |
88 | ismodule, isclass, ismethod, isfunction, istraceback, isframe, iscode |
|
88 | ismodule, isclass, ismethod, isfunction, istraceback, isframe, iscode | |
89 |
|
89 | |||
90 |
|
90 | |||
91 | # IPython's own modules |
|
91 | # IPython's own modules | |
92 | # Modified pdb which doesn't damage IPython's readline handling |
|
92 | # Modified pdb which doesn't damage IPython's readline handling | |
93 |
from IPython import |
|
93 | from IPython import PyColorize | |
|
94 | from IPython.core import debugger | |||
94 | from IPython.ipstruct import Struct |
|
95 | from IPython.ipstruct import Struct | |
95 | from IPython.excolors import exception_colors |
|
96 | from IPython.excolors import exception_colors | |
96 | from IPython.genutils import Term,uniq_stable,error,info |
|
97 | from IPython.genutils import Term,uniq_stable,error,info | |
97 |
|
98 | |||
98 | # Globals |
|
99 | # Globals | |
99 | # amount of space to put line numbers before verbose tracebacks |
|
100 | # amount of space to put line numbers before verbose tracebacks | |
100 | INDENT_SIZE = 8 |
|
101 | INDENT_SIZE = 8 | |
101 |
|
102 | |||
102 | # Default color scheme. This is used, for example, by the traceback |
|
103 | # Default color scheme. This is used, for example, by the traceback | |
103 | # formatter. When running in an actual IPython instance, the user's rc.colors |
|
104 | # formatter. When running in an actual IPython instance, the user's rc.colors | |
104 | # value is used, but havinga module global makes this functionality available |
|
105 | # value is used, but havinga module global makes this functionality available | |
105 | # to users of ultraTB who are NOT running inside ipython. |
|
106 | # to users of ultraTB who are NOT running inside ipython. | |
106 | DEFAULT_SCHEME = 'NoColor' |
|
107 | DEFAULT_SCHEME = 'NoColor' | |
107 |
|
108 | |||
108 | #--------------------------------------------------------------------------- |
|
109 | #--------------------------------------------------------------------------- | |
109 | # Code begins |
|
110 | # Code begins | |
110 |
|
111 | |||
111 | # Utility functions |
|
112 | # Utility functions | |
112 | def inspect_error(): |
|
113 | def inspect_error(): | |
113 | """Print a message about internal inspect errors. |
|
114 | """Print a message about internal inspect errors. | |
114 |
|
115 | |||
115 | These are unfortunately quite common.""" |
|
116 | These are unfortunately quite common.""" | |
116 |
|
117 | |||
117 | error('Internal Python error in the inspect module.\n' |
|
118 | error('Internal Python error in the inspect module.\n' | |
118 | 'Below is the traceback from this internal error.\n') |
|
119 | 'Below is the traceback from this internal error.\n') | |
119 |
|
120 | |||
120 |
|
121 | |||
121 | def findsource(object): |
|
122 | def findsource(object): | |
122 | """Return the entire source file and starting line number for an object. |
|
123 | """Return the entire source file and starting line number for an object. | |
123 |
|
124 | |||
124 | The argument may be a module, class, method, function, traceback, frame, |
|
125 | The argument may be a module, class, method, function, traceback, frame, | |
125 | or code object. The source code is returned as a list of all the lines |
|
126 | or code object. The source code is returned as a list of all the lines | |
126 | in the file and the line number indexes a line in that list. An IOError |
|
127 | in the file and the line number indexes a line in that list. An IOError | |
127 | is raised if the source code cannot be retrieved. |
|
128 | is raised if the source code cannot be retrieved. | |
128 |
|
129 | |||
129 | FIXED version with which we monkeypatch the stdlib to work around a bug.""" |
|
130 | FIXED version with which we monkeypatch the stdlib to work around a bug.""" | |
130 |
|
131 | |||
131 | file = getsourcefile(object) or getfile(object) |
|
132 | file = getsourcefile(object) or getfile(object) | |
132 | # If the object is a frame, then trying to get the globals dict from its |
|
133 | # If the object is a frame, then trying to get the globals dict from its | |
133 | # module won't work. Instead, the frame object itself has the globals |
|
134 | # module won't work. Instead, the frame object itself has the globals | |
134 | # dictionary. |
|
135 | # dictionary. | |
135 | globals_dict = None |
|
136 | globals_dict = None | |
136 | if inspect.isframe(object): |
|
137 | if inspect.isframe(object): | |
137 | # XXX: can this ever be false? |
|
138 | # XXX: can this ever be false? | |
138 | globals_dict = object.f_globals |
|
139 | globals_dict = object.f_globals | |
139 | else: |
|
140 | else: | |
140 | module = getmodule(object, file) |
|
141 | module = getmodule(object, file) | |
141 | if module: |
|
142 | if module: | |
142 | globals_dict = module.__dict__ |
|
143 | globals_dict = module.__dict__ | |
143 | lines = linecache.getlines(file, globals_dict) |
|
144 | lines = linecache.getlines(file, globals_dict) | |
144 | if not lines: |
|
145 | if not lines: | |
145 | raise IOError('could not get source code') |
|
146 | raise IOError('could not get source code') | |
146 |
|
147 | |||
147 | if ismodule(object): |
|
148 | if ismodule(object): | |
148 | return lines, 0 |
|
149 | return lines, 0 | |
149 |
|
150 | |||
150 | if isclass(object): |
|
151 | if isclass(object): | |
151 | name = object.__name__ |
|
152 | name = object.__name__ | |
152 | pat = re.compile(r'^(\s*)class\s*' + name + r'\b') |
|
153 | pat = re.compile(r'^(\s*)class\s*' + name + r'\b') | |
153 | # make some effort to find the best matching class definition: |
|
154 | # make some effort to find the best matching class definition: | |
154 | # use the one with the least indentation, which is the one |
|
155 | # use the one with the least indentation, which is the one | |
155 | # that's most probably not inside a function definition. |
|
156 | # that's most probably not inside a function definition. | |
156 | candidates = [] |
|
157 | candidates = [] | |
157 | for i in range(len(lines)): |
|
158 | for i in range(len(lines)): | |
158 | match = pat.match(lines[i]) |
|
159 | match = pat.match(lines[i]) | |
159 | if match: |
|
160 | if match: | |
160 | # if it's at toplevel, it's already the best one |
|
161 | # if it's at toplevel, it's already the best one | |
161 | if lines[i][0] == 'c': |
|
162 | if lines[i][0] == 'c': | |
162 | return lines, i |
|
163 | return lines, i | |
163 | # else add whitespace to candidate list |
|
164 | # else add whitespace to candidate list | |
164 | candidates.append((match.group(1), i)) |
|
165 | candidates.append((match.group(1), i)) | |
165 | if candidates: |
|
166 | if candidates: | |
166 | # this will sort by whitespace, and by line number, |
|
167 | # this will sort by whitespace, and by line number, | |
167 | # less whitespace first |
|
168 | # less whitespace first | |
168 | candidates.sort() |
|
169 | candidates.sort() | |
169 | return lines, candidates[0][1] |
|
170 | return lines, candidates[0][1] | |
170 | else: |
|
171 | else: | |
171 | raise IOError('could not find class definition') |
|
172 | raise IOError('could not find class definition') | |
172 |
|
173 | |||
173 | if ismethod(object): |
|
174 | if ismethod(object): | |
174 | object = object.im_func |
|
175 | object = object.im_func | |
175 | if isfunction(object): |
|
176 | if isfunction(object): | |
176 | object = object.func_code |
|
177 | object = object.func_code | |
177 | if istraceback(object): |
|
178 | if istraceback(object): | |
178 | object = object.tb_frame |
|
179 | object = object.tb_frame | |
179 | if isframe(object): |
|
180 | if isframe(object): | |
180 | object = object.f_code |
|
181 | object = object.f_code | |
181 | if iscode(object): |
|
182 | if iscode(object): | |
182 | if not hasattr(object, 'co_firstlineno'): |
|
183 | if not hasattr(object, 'co_firstlineno'): | |
183 | raise IOError('could not find function definition') |
|
184 | raise IOError('could not find function definition') | |
184 | pat = re.compile(r'^(\s*def\s)|(.*(?<!\w)lambda(:|\s))|^(\s*@)') |
|
185 | pat = re.compile(r'^(\s*def\s)|(.*(?<!\w)lambda(:|\s))|^(\s*@)') | |
185 | pmatch = pat.match |
|
186 | pmatch = pat.match | |
186 | # fperez - fix: sometimes, co_firstlineno can give a number larger than |
|
187 | # fperez - fix: sometimes, co_firstlineno can give a number larger than | |
187 | # the length of lines, which causes an error. Safeguard against that. |
|
188 | # the length of lines, which causes an error. Safeguard against that. | |
188 | lnum = min(object.co_firstlineno,len(lines))-1 |
|
189 | lnum = min(object.co_firstlineno,len(lines))-1 | |
189 | while lnum > 0: |
|
190 | while lnum > 0: | |
190 | if pmatch(lines[lnum]): break |
|
191 | if pmatch(lines[lnum]): break | |
191 | lnum -= 1 |
|
192 | lnum -= 1 | |
192 |
|
193 | |||
193 | return lines, lnum |
|
194 | return lines, lnum | |
194 | raise IOError('could not find code object') |
|
195 | raise IOError('could not find code object') | |
195 |
|
196 | |||
196 | # Monkeypatch inspect to apply our bugfix. This code only works with py25 |
|
197 | # Monkeypatch inspect to apply our bugfix. This code only works with py25 | |
197 | if sys.version_info[:2] >= (2,5): |
|
198 | if sys.version_info[:2] >= (2,5): | |
198 | inspect.findsource = findsource |
|
199 | inspect.findsource = findsource | |
199 |
|
200 | |||
200 | def fix_frame_records_filenames(records): |
|
201 | def fix_frame_records_filenames(records): | |
201 | """Try to fix the filenames in each record from inspect.getinnerframes(). |
|
202 | """Try to fix the filenames in each record from inspect.getinnerframes(). | |
202 |
|
203 | |||
203 | Particularly, modules loaded from within zip files have useless filenames |
|
204 | Particularly, modules loaded from within zip files have useless filenames | |
204 | attached to their code object, and inspect.getinnerframes() just uses it. |
|
205 | attached to their code object, and inspect.getinnerframes() just uses it. | |
205 | """ |
|
206 | """ | |
206 | fixed_records = [] |
|
207 | fixed_records = [] | |
207 | for frame, filename, line_no, func_name, lines, index in records: |
|
208 | for frame, filename, line_no, func_name, lines, index in records: | |
208 | # Look inside the frame's globals dictionary for __file__, which should |
|
209 | # Look inside the frame's globals dictionary for __file__, which should | |
209 | # be better. |
|
210 | # be better. | |
210 | better_fn = frame.f_globals.get('__file__', None) |
|
211 | better_fn = frame.f_globals.get('__file__', None) | |
211 | if isinstance(better_fn, str): |
|
212 | if isinstance(better_fn, str): | |
212 | # Check the type just in case someone did something weird with |
|
213 | # Check the type just in case someone did something weird with | |
213 | # __file__. It might also be None if the error occurred during |
|
214 | # __file__. It might also be None if the error occurred during | |
214 | # import. |
|
215 | # import. | |
215 | filename = better_fn |
|
216 | filename = better_fn | |
216 | fixed_records.append((frame, filename, line_no, func_name, lines, index)) |
|
217 | fixed_records.append((frame, filename, line_no, func_name, lines, index)) | |
217 | return fixed_records |
|
218 | return fixed_records | |
218 |
|
219 | |||
219 |
|
220 | |||
220 | def _fixed_getinnerframes(etb, context=1,tb_offset=0): |
|
221 | def _fixed_getinnerframes(etb, context=1,tb_offset=0): | |
221 | import linecache |
|
222 | import linecache | |
222 | LNUM_POS, LINES_POS, INDEX_POS = 2, 4, 5 |
|
223 | LNUM_POS, LINES_POS, INDEX_POS = 2, 4, 5 | |
223 |
|
224 | |||
224 | records = fix_frame_records_filenames(inspect.getinnerframes(etb, context)) |
|
225 | records = fix_frame_records_filenames(inspect.getinnerframes(etb, context)) | |
225 |
|
226 | |||
226 | # If the error is at the console, don't build any context, since it would |
|
227 | # If the error is at the console, don't build any context, since it would | |
227 | # otherwise produce 5 blank lines printed out (there is no file at the |
|
228 | # otherwise produce 5 blank lines printed out (there is no file at the | |
228 | # console) |
|
229 | # console) | |
229 | rec_check = records[tb_offset:] |
|
230 | rec_check = records[tb_offset:] | |
230 | try: |
|
231 | try: | |
231 | rname = rec_check[0][1] |
|
232 | rname = rec_check[0][1] | |
232 | if rname == '<ipython console>' or rname.endswith('<string>'): |
|
233 | if rname == '<ipython console>' or rname.endswith('<string>'): | |
233 | return rec_check |
|
234 | return rec_check | |
234 | except IndexError: |
|
235 | except IndexError: | |
235 | pass |
|
236 | pass | |
236 |
|
237 | |||
237 | aux = traceback.extract_tb(etb) |
|
238 | aux = traceback.extract_tb(etb) | |
238 | assert len(records) == len(aux) |
|
239 | assert len(records) == len(aux) | |
239 | for i, (file, lnum, _, _) in zip(range(len(records)), aux): |
|
240 | for i, (file, lnum, _, _) in zip(range(len(records)), aux): | |
240 | maybeStart = lnum-1 - context//2 |
|
241 | maybeStart = lnum-1 - context//2 | |
241 | start = max(maybeStart, 0) |
|
242 | start = max(maybeStart, 0) | |
242 | end = start + context |
|
243 | end = start + context | |
243 | lines = linecache.getlines(file)[start:end] |
|
244 | lines = linecache.getlines(file)[start:end] | |
244 | # pad with empty lines if necessary |
|
245 | # pad with empty lines if necessary | |
245 | if maybeStart < 0: |
|
246 | if maybeStart < 0: | |
246 | lines = (['\n'] * -maybeStart) + lines |
|
247 | lines = (['\n'] * -maybeStart) + lines | |
247 | if len(lines) < context: |
|
248 | if len(lines) < context: | |
248 | lines += ['\n'] * (context - len(lines)) |
|
249 | lines += ['\n'] * (context - len(lines)) | |
249 | buf = list(records[i]) |
|
250 | buf = list(records[i]) | |
250 | buf[LNUM_POS] = lnum |
|
251 | buf[LNUM_POS] = lnum | |
251 | buf[INDEX_POS] = lnum - 1 - start |
|
252 | buf[INDEX_POS] = lnum - 1 - start | |
252 | buf[LINES_POS] = lines |
|
253 | buf[LINES_POS] = lines | |
253 | records[i] = tuple(buf) |
|
254 | records[i] = tuple(buf) | |
254 | return records[tb_offset:] |
|
255 | return records[tb_offset:] | |
255 |
|
256 | |||
256 | # Helper function -- largely belongs to VerboseTB, but we need the same |
|
257 | # Helper function -- largely belongs to VerboseTB, but we need the same | |
257 | # functionality to produce a pseudo verbose TB for SyntaxErrors, so that they |
|
258 | # functionality to produce a pseudo verbose TB for SyntaxErrors, so that they | |
258 | # can be recognized properly by ipython.el's py-traceback-line-re |
|
259 | # can be recognized properly by ipython.el's py-traceback-line-re | |
259 | # (SyntaxErrors have to be treated specially because they have no traceback) |
|
260 | # (SyntaxErrors have to be treated specially because they have no traceback) | |
260 |
|
261 | |||
261 | _parser = PyColorize.Parser() |
|
262 | _parser = PyColorize.Parser() | |
262 |
|
263 | |||
263 | def _formatTracebackLines(lnum, index, lines, Colors, lvals=None,scheme=None): |
|
264 | def _formatTracebackLines(lnum, index, lines, Colors, lvals=None,scheme=None): | |
264 | numbers_width = INDENT_SIZE - 1 |
|
265 | numbers_width = INDENT_SIZE - 1 | |
265 | res = [] |
|
266 | res = [] | |
266 | i = lnum - index |
|
267 | i = lnum - index | |
267 |
|
268 | |||
268 | # This lets us get fully syntax-highlighted tracebacks. |
|
269 | # This lets us get fully syntax-highlighted tracebacks. | |
269 | if scheme is None: |
|
270 | if scheme is None: | |
270 | try: |
|
271 | try: | |
271 | # Again, reference to a global __IPYTHON__ that doesn't exist. |
|
272 | # Again, reference to a global __IPYTHON__ that doesn't exist. | |
272 | # XXX |
|
273 | # XXX | |
273 | scheme = __IPYTHON__.rc.colors |
|
274 | scheme = __IPYTHON__.rc.colors | |
274 | except: |
|
275 | except: | |
275 | scheme = DEFAULT_SCHEME |
|
276 | scheme = DEFAULT_SCHEME | |
276 | _line_format = _parser.format2 |
|
277 | _line_format = _parser.format2 | |
277 |
|
278 | |||
278 | for line in lines: |
|
279 | for line in lines: | |
279 | new_line, err = _line_format(line,'str',scheme) |
|
280 | new_line, err = _line_format(line,'str',scheme) | |
280 | if not err: line = new_line |
|
281 | if not err: line = new_line | |
281 |
|
282 | |||
282 | if i == lnum: |
|
283 | if i == lnum: | |
283 | # This is the line with the error |
|
284 | # This is the line with the error | |
284 | pad = numbers_width - len(str(i)) |
|
285 | pad = numbers_width - len(str(i)) | |
285 | if pad >= 3: |
|
286 | if pad >= 3: | |
286 | marker = '-'*(pad-3) + '-> ' |
|
287 | marker = '-'*(pad-3) + '-> ' | |
287 | elif pad == 2: |
|
288 | elif pad == 2: | |
288 | marker = '> ' |
|
289 | marker = '> ' | |
289 | elif pad == 1: |
|
290 | elif pad == 1: | |
290 | marker = '>' |
|
291 | marker = '>' | |
291 | else: |
|
292 | else: | |
292 | marker = '' |
|
293 | marker = '' | |
293 | num = marker + str(i) |
|
294 | num = marker + str(i) | |
294 | line = '%s%s%s %s%s' %(Colors.linenoEm, num, |
|
295 | line = '%s%s%s %s%s' %(Colors.linenoEm, num, | |
295 | Colors.line, line, Colors.Normal) |
|
296 | Colors.line, line, Colors.Normal) | |
296 | else: |
|
297 | else: | |
297 | num = '%*s' % (numbers_width,i) |
|
298 | num = '%*s' % (numbers_width,i) | |
298 | line = '%s%s%s %s' %(Colors.lineno, num, |
|
299 | line = '%s%s%s %s' %(Colors.lineno, num, | |
299 | Colors.Normal, line) |
|
300 | Colors.Normal, line) | |
300 |
|
301 | |||
301 | res.append(line) |
|
302 | res.append(line) | |
302 | if lvals and i == lnum: |
|
303 | if lvals and i == lnum: | |
303 | res.append(lvals + '\n') |
|
304 | res.append(lvals + '\n') | |
304 | i = i + 1 |
|
305 | i = i + 1 | |
305 | return res |
|
306 | return res | |
306 |
|
307 | |||
307 |
|
308 | |||
308 | #--------------------------------------------------------------------------- |
|
309 | #--------------------------------------------------------------------------- | |
309 | # Module classes |
|
310 | # Module classes | |
310 | class TBTools: |
|
311 | class TBTools: | |
311 | """Basic tools used by all traceback printer classes.""" |
|
312 | """Basic tools used by all traceback printer classes.""" | |
312 |
|
313 | |||
313 | def __init__(self,color_scheme = 'NoColor',call_pdb=False): |
|
314 | def __init__(self,color_scheme = 'NoColor',call_pdb=False): | |
314 | # Whether to call the interactive pdb debugger after printing |
|
315 | # Whether to call the interactive pdb debugger after printing | |
315 | # tracebacks or not |
|
316 | # tracebacks or not | |
316 | self.call_pdb = call_pdb |
|
317 | self.call_pdb = call_pdb | |
317 |
|
318 | |||
318 | # Create color table |
|
319 | # Create color table | |
319 | self.color_scheme_table = exception_colors() |
|
320 | self.color_scheme_table = exception_colors() | |
320 |
|
321 | |||
321 | self.set_colors(color_scheme) |
|
322 | self.set_colors(color_scheme) | |
322 | self.old_scheme = color_scheme # save initial value for toggles |
|
323 | self.old_scheme = color_scheme # save initial value for toggles | |
323 |
|
324 | |||
324 | if call_pdb: |
|
325 | if call_pdb: | |
325 |
self.pdb = |
|
326 | self.pdb = debugger.Pdb(self.color_scheme_table.active_scheme_name) | |
326 | else: |
|
327 | else: | |
327 | self.pdb = None |
|
328 | self.pdb = None | |
328 |
|
329 | |||
329 | def set_colors(self,*args,**kw): |
|
330 | def set_colors(self,*args,**kw): | |
330 | """Shorthand access to the color table scheme selector method.""" |
|
331 | """Shorthand access to the color table scheme selector method.""" | |
331 |
|
332 | |||
332 | # Set own color table |
|
333 | # Set own color table | |
333 | self.color_scheme_table.set_active_scheme(*args,**kw) |
|
334 | self.color_scheme_table.set_active_scheme(*args,**kw) | |
334 | # for convenience, set Colors to the active scheme |
|
335 | # for convenience, set Colors to the active scheme | |
335 | self.Colors = self.color_scheme_table.active_colors |
|
336 | self.Colors = self.color_scheme_table.active_colors | |
336 | # Also set colors of debugger |
|
337 | # Also set colors of debugger | |
337 | if hasattr(self,'pdb') and self.pdb is not None: |
|
338 | if hasattr(self,'pdb') and self.pdb is not None: | |
338 | self.pdb.set_colors(*args,**kw) |
|
339 | self.pdb.set_colors(*args,**kw) | |
339 |
|
340 | |||
340 | def color_toggle(self): |
|
341 | def color_toggle(self): | |
341 | """Toggle between the currently active color scheme and NoColor.""" |
|
342 | """Toggle between the currently active color scheme and NoColor.""" | |
342 |
|
343 | |||
343 | if self.color_scheme_table.active_scheme_name == 'NoColor': |
|
344 | if self.color_scheme_table.active_scheme_name == 'NoColor': | |
344 | self.color_scheme_table.set_active_scheme(self.old_scheme) |
|
345 | self.color_scheme_table.set_active_scheme(self.old_scheme) | |
345 | self.Colors = self.color_scheme_table.active_colors |
|
346 | self.Colors = self.color_scheme_table.active_colors | |
346 | else: |
|
347 | else: | |
347 | self.old_scheme = self.color_scheme_table.active_scheme_name |
|
348 | self.old_scheme = self.color_scheme_table.active_scheme_name | |
348 | self.color_scheme_table.set_active_scheme('NoColor') |
|
349 | self.color_scheme_table.set_active_scheme('NoColor') | |
349 | self.Colors = self.color_scheme_table.active_colors |
|
350 | self.Colors = self.color_scheme_table.active_colors | |
350 |
|
351 | |||
351 | #--------------------------------------------------------------------------- |
|
352 | #--------------------------------------------------------------------------- | |
352 | class ListTB(TBTools): |
|
353 | class ListTB(TBTools): | |
353 | """Print traceback information from a traceback list, with optional color. |
|
354 | """Print traceback information from a traceback list, with optional color. | |
354 |
|
355 | |||
355 | Calling: requires 3 arguments: |
|
356 | Calling: requires 3 arguments: | |
356 | (etype, evalue, elist) |
|
357 | (etype, evalue, elist) | |
357 | as would be obtained by: |
|
358 | as would be obtained by: | |
358 | etype, evalue, tb = sys.exc_info() |
|
359 | etype, evalue, tb = sys.exc_info() | |
359 | if tb: |
|
360 | if tb: | |
360 | elist = traceback.extract_tb(tb) |
|
361 | elist = traceback.extract_tb(tb) | |
361 | else: |
|
362 | else: | |
362 | elist = None |
|
363 | elist = None | |
363 |
|
364 | |||
364 | It can thus be used by programs which need to process the traceback before |
|
365 | It can thus be used by programs which need to process the traceback before | |
365 | printing (such as console replacements based on the code module from the |
|
366 | printing (such as console replacements based on the code module from the | |
366 | standard library). |
|
367 | standard library). | |
367 |
|
368 | |||
368 | Because they are meant to be called without a full traceback (only a |
|
369 | Because they are meant to be called without a full traceback (only a | |
369 | list), instances of this class can't call the interactive pdb debugger.""" |
|
370 | list), instances of this class can't call the interactive pdb debugger.""" | |
370 |
|
371 | |||
371 | def __init__(self,color_scheme = 'NoColor'): |
|
372 | def __init__(self,color_scheme = 'NoColor'): | |
372 | TBTools.__init__(self,color_scheme = color_scheme,call_pdb=0) |
|
373 | TBTools.__init__(self,color_scheme = color_scheme,call_pdb=0) | |
373 |
|
374 | |||
374 | def __call__(self, etype, value, elist): |
|
375 | def __call__(self, etype, value, elist): | |
375 | Term.cout.flush() |
|
376 | Term.cout.flush() | |
376 | print >> Term.cerr, self.text(etype,value,elist) |
|
377 | print >> Term.cerr, self.text(etype,value,elist) | |
377 | Term.cerr.flush() |
|
378 | Term.cerr.flush() | |
378 |
|
379 | |||
379 | def text(self,etype, value, elist,context=5): |
|
380 | def text(self,etype, value, elist,context=5): | |
380 | """Return a color formatted string with the traceback info.""" |
|
381 | """Return a color formatted string with the traceback info.""" | |
381 |
|
382 | |||
382 | Colors = self.Colors |
|
383 | Colors = self.Colors | |
383 | out_string = ['%s%s%s\n' % (Colors.topline,'-'*60,Colors.Normal)] |
|
384 | out_string = ['%s%s%s\n' % (Colors.topline,'-'*60,Colors.Normal)] | |
384 | if elist: |
|
385 | if elist: | |
385 | out_string.append('Traceback %s(most recent call last)%s:' % \ |
|
386 | out_string.append('Traceback %s(most recent call last)%s:' % \ | |
386 | (Colors.normalEm, Colors.Normal) + '\n') |
|
387 | (Colors.normalEm, Colors.Normal) + '\n') | |
387 | out_string.extend(self._format_list(elist)) |
|
388 | out_string.extend(self._format_list(elist)) | |
388 | lines = self._format_exception_only(etype, value) |
|
389 | lines = self._format_exception_only(etype, value) | |
389 | for line in lines[:-1]: |
|
390 | for line in lines[:-1]: | |
390 | out_string.append(" "+line) |
|
391 | out_string.append(" "+line) | |
391 | out_string.append(lines[-1]) |
|
392 | out_string.append(lines[-1]) | |
392 | return ''.join(out_string) |
|
393 | return ''.join(out_string) | |
393 |
|
394 | |||
394 | def _format_list(self, extracted_list): |
|
395 | def _format_list(self, extracted_list): | |
395 | """Format a list of traceback entry tuples for printing. |
|
396 | """Format a list of traceback entry tuples for printing. | |
396 |
|
397 | |||
397 | Given a list of tuples as returned by extract_tb() or |
|
398 | Given a list of tuples as returned by extract_tb() or | |
398 | extract_stack(), return a list of strings ready for printing. |
|
399 | extract_stack(), return a list of strings ready for printing. | |
399 | Each string in the resulting list corresponds to the item with the |
|
400 | Each string in the resulting list corresponds to the item with the | |
400 | same index in the argument list. Each string ends in a newline; |
|
401 | same index in the argument list. Each string ends in a newline; | |
401 | the strings may contain internal newlines as well, for those items |
|
402 | the strings may contain internal newlines as well, for those items | |
402 | whose source text line is not None. |
|
403 | whose source text line is not None. | |
403 |
|
404 | |||
404 | Lifted almost verbatim from traceback.py |
|
405 | Lifted almost verbatim from traceback.py | |
405 | """ |
|
406 | """ | |
406 |
|
407 | |||
407 | Colors = self.Colors |
|
408 | Colors = self.Colors | |
408 | list = [] |
|
409 | list = [] | |
409 | for filename, lineno, name, line in extracted_list[:-1]: |
|
410 | for filename, lineno, name, line in extracted_list[:-1]: | |
410 | item = ' File %s"%s"%s, line %s%d%s, in %s%s%s\n' % \ |
|
411 | item = ' File %s"%s"%s, line %s%d%s, in %s%s%s\n' % \ | |
411 | (Colors.filename, filename, Colors.Normal, |
|
412 | (Colors.filename, filename, Colors.Normal, | |
412 | Colors.lineno, lineno, Colors.Normal, |
|
413 | Colors.lineno, lineno, Colors.Normal, | |
413 | Colors.name, name, Colors.Normal) |
|
414 | Colors.name, name, Colors.Normal) | |
414 | if line: |
|
415 | if line: | |
415 | item = item + ' %s\n' % line.strip() |
|
416 | item = item + ' %s\n' % line.strip() | |
416 | list.append(item) |
|
417 | list.append(item) | |
417 | # Emphasize the last entry |
|
418 | # Emphasize the last entry | |
418 | filename, lineno, name, line = extracted_list[-1] |
|
419 | filename, lineno, name, line = extracted_list[-1] | |
419 | item = '%s File %s"%s"%s, line %s%d%s, in %s%s%s%s\n' % \ |
|
420 | item = '%s File %s"%s"%s, line %s%d%s, in %s%s%s%s\n' % \ | |
420 | (Colors.normalEm, |
|
421 | (Colors.normalEm, | |
421 | Colors.filenameEm, filename, Colors.normalEm, |
|
422 | Colors.filenameEm, filename, Colors.normalEm, | |
422 | Colors.linenoEm, lineno, Colors.normalEm, |
|
423 | Colors.linenoEm, lineno, Colors.normalEm, | |
423 | Colors.nameEm, name, Colors.normalEm, |
|
424 | Colors.nameEm, name, Colors.normalEm, | |
424 | Colors.Normal) |
|
425 | Colors.Normal) | |
425 | if line: |
|
426 | if line: | |
426 | item = item + '%s %s%s\n' % (Colors.line, line.strip(), |
|
427 | item = item + '%s %s%s\n' % (Colors.line, line.strip(), | |
427 | Colors.Normal) |
|
428 | Colors.Normal) | |
428 | list.append(item) |
|
429 | list.append(item) | |
429 | return list |
|
430 | return list | |
430 |
|
431 | |||
431 | def _format_exception_only(self, etype, value): |
|
432 | def _format_exception_only(self, etype, value): | |
432 | """Format the exception part of a traceback. |
|
433 | """Format the exception part of a traceback. | |
433 |
|
434 | |||
434 | The arguments are the exception type and value such as given by |
|
435 | The arguments are the exception type and value such as given by | |
435 | sys.exc_info()[:2]. The return value is a list of strings, each ending |
|
436 | sys.exc_info()[:2]. The return value is a list of strings, each ending | |
436 | in a newline. Normally, the list contains a single string; however, |
|
437 | in a newline. Normally, the list contains a single string; however, | |
437 | for SyntaxError exceptions, it contains several lines that (when |
|
438 | for SyntaxError exceptions, it contains several lines that (when | |
438 | printed) display detailed information about where the syntax error |
|
439 | printed) display detailed information about where the syntax error | |
439 | occurred. The message indicating which exception occurred is the |
|
440 | occurred. The message indicating which exception occurred is the | |
440 | always last string in the list. |
|
441 | always last string in the list. | |
441 |
|
442 | |||
442 | Also lifted nearly verbatim from traceback.py |
|
443 | Also lifted nearly verbatim from traceback.py | |
443 | """ |
|
444 | """ | |
444 |
|
445 | |||
445 | have_filedata = False |
|
446 | have_filedata = False | |
446 | Colors = self.Colors |
|
447 | Colors = self.Colors | |
447 | list = [] |
|
448 | list = [] | |
448 | try: |
|
449 | try: | |
449 | stype = Colors.excName + etype.__name__ + Colors.Normal |
|
450 | stype = Colors.excName + etype.__name__ + Colors.Normal | |
450 | except AttributeError: |
|
451 | except AttributeError: | |
451 | stype = etype # String exceptions don't get special coloring |
|
452 | stype = etype # String exceptions don't get special coloring | |
452 | if value is None: |
|
453 | if value is None: | |
453 | list.append( str(stype) + '\n') |
|
454 | list.append( str(stype) + '\n') | |
454 | else: |
|
455 | else: | |
455 | if etype is SyntaxError: |
|
456 | if etype is SyntaxError: | |
456 | try: |
|
457 | try: | |
457 | msg, (filename, lineno, offset, line) = value |
|
458 | msg, (filename, lineno, offset, line) = value | |
458 | except: |
|
459 | except: | |
459 | have_filedata = False |
|
460 | have_filedata = False | |
460 | else: |
|
461 | else: | |
461 | have_filedata = True |
|
462 | have_filedata = True | |
462 | #print 'filename is',filename # dbg |
|
463 | #print 'filename is',filename # dbg | |
463 | if not filename: filename = "<string>" |
|
464 | if not filename: filename = "<string>" | |
464 | list.append('%s File %s"%s"%s, line %s%d%s\n' % \ |
|
465 | list.append('%s File %s"%s"%s, line %s%d%s\n' % \ | |
465 | (Colors.normalEm, |
|
466 | (Colors.normalEm, | |
466 | Colors.filenameEm, filename, Colors.normalEm, |
|
467 | Colors.filenameEm, filename, Colors.normalEm, | |
467 | Colors.linenoEm, lineno, Colors.Normal )) |
|
468 | Colors.linenoEm, lineno, Colors.Normal )) | |
468 | if line is not None: |
|
469 | if line is not None: | |
469 | i = 0 |
|
470 | i = 0 | |
470 | while i < len(line) and line[i].isspace(): |
|
471 | while i < len(line) and line[i].isspace(): | |
471 | i = i+1 |
|
472 | i = i+1 | |
472 | list.append('%s %s%s\n' % (Colors.line, |
|
473 | list.append('%s %s%s\n' % (Colors.line, | |
473 | line.strip(), |
|
474 | line.strip(), | |
474 | Colors.Normal)) |
|
475 | Colors.Normal)) | |
475 | if offset is not None: |
|
476 | if offset is not None: | |
476 | s = ' ' |
|
477 | s = ' ' | |
477 | for c in line[i:offset-1]: |
|
478 | for c in line[i:offset-1]: | |
478 | if c.isspace(): |
|
479 | if c.isspace(): | |
479 | s = s + c |
|
480 | s = s + c | |
480 | else: |
|
481 | else: | |
481 | s = s + ' ' |
|
482 | s = s + ' ' | |
482 | list.append('%s%s^%s\n' % (Colors.caret, s, |
|
483 | list.append('%s%s^%s\n' % (Colors.caret, s, | |
483 | Colors.Normal) ) |
|
484 | Colors.Normal) ) | |
484 | value = msg |
|
485 | value = msg | |
485 | s = self._some_str(value) |
|
486 | s = self._some_str(value) | |
486 | if s: |
|
487 | if s: | |
487 | list.append('%s%s:%s %s\n' % (str(stype), Colors.excName, |
|
488 | list.append('%s%s:%s %s\n' % (str(stype), Colors.excName, | |
488 | Colors.Normal, s)) |
|
489 | Colors.Normal, s)) | |
489 | else: |
|
490 | else: | |
490 | list.append('%s\n' % str(stype)) |
|
491 | list.append('%s\n' % str(stype)) | |
491 |
|
492 | |||
492 | # This is being commented out for now as the __IPYTHON__ variable |
|
493 | # This is being commented out for now as the __IPYTHON__ variable | |
493 | # referenced here is not resolved and causes massive test failures |
|
494 | # referenced here is not resolved and causes massive test failures | |
494 | # and errors. B. Granger, 04/2009. XXX |
|
495 | # and errors. B. Granger, 04/2009. XXX | |
495 | # See https://bugs.launchpad.net/bugs/362137 |
|
496 | # See https://bugs.launchpad.net/bugs/362137 | |
496 | # # vds:>> |
|
497 | # # vds:>> | |
497 | # if have_filedata: |
|
498 | # if have_filedata: | |
498 | # __IPYTHON__.hooks.synchronize_with_editor(filename, lineno, 0) |
|
499 | # __IPYTHON__.hooks.synchronize_with_editor(filename, lineno, 0) | |
499 | # # vds:<< |
|
500 | # # vds:<< | |
500 |
|
501 | |||
501 | return list |
|
502 | return list | |
502 |
|
503 | |||
503 | def _some_str(self, value): |
|
504 | def _some_str(self, value): | |
504 | # Lifted from traceback.py |
|
505 | # Lifted from traceback.py | |
505 | try: |
|
506 | try: | |
506 | return str(value) |
|
507 | return str(value) | |
507 | except: |
|
508 | except: | |
508 | return '<unprintable %s object>' % type(value).__name__ |
|
509 | return '<unprintable %s object>' % type(value).__name__ | |
509 |
|
510 | |||
510 | #---------------------------------------------------------------------------- |
|
511 | #---------------------------------------------------------------------------- | |
511 | class VerboseTB(TBTools): |
|
512 | class VerboseTB(TBTools): | |
512 | """A port of Ka-Ping Yee's cgitb.py module that outputs color text instead |
|
513 | """A port of Ka-Ping Yee's cgitb.py module that outputs color text instead | |
513 | of HTML. Requires inspect and pydoc. Crazy, man. |
|
514 | of HTML. Requires inspect and pydoc. Crazy, man. | |
514 |
|
515 | |||
515 | Modified version which optionally strips the topmost entries from the |
|
516 | Modified version which optionally strips the topmost entries from the | |
516 | traceback, to be used with alternate interpreters (because their own code |
|
517 | traceback, to be used with alternate interpreters (because their own code | |
517 | would appear in the traceback).""" |
|
518 | would appear in the traceback).""" | |
518 |
|
519 | |||
519 | def __init__(self,color_scheme = 'Linux',tb_offset=0,long_header=0, |
|
520 | def __init__(self,color_scheme = 'Linux',tb_offset=0,long_header=0, | |
520 | call_pdb = 0, include_vars=1): |
|
521 | call_pdb = 0, include_vars=1): | |
521 | """Specify traceback offset, headers and color scheme. |
|
522 | """Specify traceback offset, headers and color scheme. | |
522 |
|
523 | |||
523 | Define how many frames to drop from the tracebacks. Calling it with |
|
524 | Define how many frames to drop from the tracebacks. Calling it with | |
524 | tb_offset=1 allows use of this handler in interpreters which will have |
|
525 | tb_offset=1 allows use of this handler in interpreters which will have | |
525 | their own code at the top of the traceback (VerboseTB will first |
|
526 | their own code at the top of the traceback (VerboseTB will first | |
526 | remove that frame before printing the traceback info).""" |
|
527 | remove that frame before printing the traceback info).""" | |
527 | TBTools.__init__(self,color_scheme=color_scheme,call_pdb=call_pdb) |
|
528 | TBTools.__init__(self,color_scheme=color_scheme,call_pdb=call_pdb) | |
528 | self.tb_offset = tb_offset |
|
529 | self.tb_offset = tb_offset | |
529 | self.long_header = long_header |
|
530 | self.long_header = long_header | |
530 | self.include_vars = include_vars |
|
531 | self.include_vars = include_vars | |
531 |
|
532 | |||
532 | def text(self, etype, evalue, etb, context=5): |
|
533 | def text(self, etype, evalue, etb, context=5): | |
533 | """Return a nice text document describing the traceback.""" |
|
534 | """Return a nice text document describing the traceback.""" | |
534 |
|
535 | |||
535 | # some locals |
|
536 | # some locals | |
536 | try: |
|
537 | try: | |
537 | etype = etype.__name__ |
|
538 | etype = etype.__name__ | |
538 | except AttributeError: |
|
539 | except AttributeError: | |
539 | pass |
|
540 | pass | |
540 | Colors = self.Colors # just a shorthand + quicker name lookup |
|
541 | Colors = self.Colors # just a shorthand + quicker name lookup | |
541 | ColorsNormal = Colors.Normal # used a lot |
|
542 | ColorsNormal = Colors.Normal # used a lot | |
542 | col_scheme = self.color_scheme_table.active_scheme_name |
|
543 | col_scheme = self.color_scheme_table.active_scheme_name | |
543 | indent = ' '*INDENT_SIZE |
|
544 | indent = ' '*INDENT_SIZE | |
544 | em_normal = '%s\n%s%s' % (Colors.valEm, indent,ColorsNormal) |
|
545 | em_normal = '%s\n%s%s' % (Colors.valEm, indent,ColorsNormal) | |
545 | undefined = '%sundefined%s' % (Colors.em, ColorsNormal) |
|
546 | undefined = '%sundefined%s' % (Colors.em, ColorsNormal) | |
546 | exc = '%s%s%s' % (Colors.excName,etype,ColorsNormal) |
|
547 | exc = '%s%s%s' % (Colors.excName,etype,ColorsNormal) | |
547 |
|
548 | |||
548 | # some internal-use functions |
|
549 | # some internal-use functions | |
549 | def text_repr(value): |
|
550 | def text_repr(value): | |
550 | """Hopefully pretty robust repr equivalent.""" |
|
551 | """Hopefully pretty robust repr equivalent.""" | |
551 | # this is pretty horrible but should always return *something* |
|
552 | # this is pretty horrible but should always return *something* | |
552 | try: |
|
553 | try: | |
553 | return pydoc.text.repr(value) |
|
554 | return pydoc.text.repr(value) | |
554 | except KeyboardInterrupt: |
|
555 | except KeyboardInterrupt: | |
555 | raise |
|
556 | raise | |
556 | except: |
|
557 | except: | |
557 | try: |
|
558 | try: | |
558 | return repr(value) |
|
559 | return repr(value) | |
559 | except KeyboardInterrupt: |
|
560 | except KeyboardInterrupt: | |
560 | raise |
|
561 | raise | |
561 | except: |
|
562 | except: | |
562 | try: |
|
563 | try: | |
563 | # all still in an except block so we catch |
|
564 | # all still in an except block so we catch | |
564 | # getattr raising |
|
565 | # getattr raising | |
565 | name = getattr(value, '__name__', None) |
|
566 | name = getattr(value, '__name__', None) | |
566 | if name: |
|
567 | if name: | |
567 | # ick, recursion |
|
568 | # ick, recursion | |
568 | return text_repr(name) |
|
569 | return text_repr(name) | |
569 | klass = getattr(value, '__class__', None) |
|
570 | klass = getattr(value, '__class__', None) | |
570 | if klass: |
|
571 | if klass: | |
571 | return '%s instance' % text_repr(klass) |
|
572 | return '%s instance' % text_repr(klass) | |
572 | except KeyboardInterrupt: |
|
573 | except KeyboardInterrupt: | |
573 | raise |
|
574 | raise | |
574 | except: |
|
575 | except: | |
575 | return 'UNRECOVERABLE REPR FAILURE' |
|
576 | return 'UNRECOVERABLE REPR FAILURE' | |
576 | def eqrepr(value, repr=text_repr): return '=%s' % repr(value) |
|
577 | def eqrepr(value, repr=text_repr): return '=%s' % repr(value) | |
577 | def nullrepr(value, repr=text_repr): return '' |
|
578 | def nullrepr(value, repr=text_repr): return '' | |
578 |
|
579 | |||
579 | # meat of the code begins |
|
580 | # meat of the code begins | |
580 | try: |
|
581 | try: | |
581 | etype = etype.__name__ |
|
582 | etype = etype.__name__ | |
582 | except AttributeError: |
|
583 | except AttributeError: | |
583 | pass |
|
584 | pass | |
584 |
|
585 | |||
585 | if self.long_header: |
|
586 | if self.long_header: | |
586 | # Header with the exception type, python version, and date |
|
587 | # Header with the exception type, python version, and date | |
587 | pyver = 'Python ' + string.split(sys.version)[0] + ': ' + sys.executable |
|
588 | pyver = 'Python ' + string.split(sys.version)[0] + ': ' + sys.executable | |
588 | date = time.ctime(time.time()) |
|
589 | date = time.ctime(time.time()) | |
589 |
|
590 | |||
590 | head = '%s%s%s\n%s%s%s\n%s' % (Colors.topline, '-'*75, ColorsNormal, |
|
591 | head = '%s%s%s\n%s%s%s\n%s' % (Colors.topline, '-'*75, ColorsNormal, | |
591 | exc, ' '*(75-len(str(etype))-len(pyver)), |
|
592 | exc, ' '*(75-len(str(etype))-len(pyver)), | |
592 | pyver, string.rjust(date, 75) ) |
|
593 | pyver, string.rjust(date, 75) ) | |
593 | head += "\nA problem occured executing Python code. Here is the sequence of function"\ |
|
594 | head += "\nA problem occured executing Python code. Here is the sequence of function"\ | |
594 | "\ncalls leading up to the error, with the most recent (innermost) call last." |
|
595 | "\ncalls leading up to the error, with the most recent (innermost) call last." | |
595 | else: |
|
596 | else: | |
596 | # Simplified header |
|
597 | # Simplified header | |
597 | head = '%s%s%s\n%s%s' % (Colors.topline, '-'*75, ColorsNormal,exc, |
|
598 | head = '%s%s%s\n%s%s' % (Colors.topline, '-'*75, ColorsNormal,exc, | |
598 | string.rjust('Traceback (most recent call last)', |
|
599 | string.rjust('Traceback (most recent call last)', | |
599 | 75 - len(str(etype)) ) ) |
|
600 | 75 - len(str(etype)) ) ) | |
600 | frames = [] |
|
601 | frames = [] | |
601 | # Flush cache before calling inspect. This helps alleviate some of the |
|
602 | # Flush cache before calling inspect. This helps alleviate some of the | |
602 | # problems with python 2.3's inspect.py. |
|
603 | # problems with python 2.3's inspect.py. | |
603 | linecache.checkcache() |
|
604 | linecache.checkcache() | |
604 | # Drop topmost frames if requested |
|
605 | # Drop topmost frames if requested | |
605 | try: |
|
606 | try: | |
606 | # Try the default getinnerframes and Alex's: Alex's fixes some |
|
607 | # Try the default getinnerframes and Alex's: Alex's fixes some | |
607 | # problems, but it generates empty tracebacks for console errors |
|
608 | # problems, but it generates empty tracebacks for console errors | |
608 | # (5 blanks lines) where none should be returned. |
|
609 | # (5 blanks lines) where none should be returned. | |
609 | #records = inspect.getinnerframes(etb, context)[self.tb_offset:] |
|
610 | #records = inspect.getinnerframes(etb, context)[self.tb_offset:] | |
610 | #print 'python records:', records # dbg |
|
611 | #print 'python records:', records # dbg | |
611 | records = _fixed_getinnerframes(etb, context,self.tb_offset) |
|
612 | records = _fixed_getinnerframes(etb, context,self.tb_offset) | |
612 | #print 'alex records:', records # dbg |
|
613 | #print 'alex records:', records # dbg | |
613 | except: |
|
614 | except: | |
614 |
|
615 | |||
615 | # FIXME: I've been getting many crash reports from python 2.3 |
|
616 | # FIXME: I've been getting many crash reports from python 2.3 | |
616 | # users, traceable to inspect.py. If I can find a small test-case |
|
617 | # users, traceable to inspect.py. If I can find a small test-case | |
617 | # to reproduce this, I should either write a better workaround or |
|
618 | # to reproduce this, I should either write a better workaround or | |
618 | # file a bug report against inspect (if that's the real problem). |
|
619 | # file a bug report against inspect (if that's the real problem). | |
619 | # So far, I haven't been able to find an isolated example to |
|
620 | # So far, I haven't been able to find an isolated example to | |
620 | # reproduce the problem. |
|
621 | # reproduce the problem. | |
621 | inspect_error() |
|
622 | inspect_error() | |
622 | traceback.print_exc(file=Term.cerr) |
|
623 | traceback.print_exc(file=Term.cerr) | |
623 | info('\nUnfortunately, your original traceback can not be constructed.\n') |
|
624 | info('\nUnfortunately, your original traceback can not be constructed.\n') | |
624 | return '' |
|
625 | return '' | |
625 |
|
626 | |||
626 | # build some color string templates outside these nested loops |
|
627 | # build some color string templates outside these nested loops | |
627 | tpl_link = '%s%%s%s' % (Colors.filenameEm,ColorsNormal) |
|
628 | tpl_link = '%s%%s%s' % (Colors.filenameEm,ColorsNormal) | |
628 | tpl_call = 'in %s%%s%s%%s%s' % (Colors.vName, Colors.valEm, |
|
629 | tpl_call = 'in %s%%s%s%%s%s' % (Colors.vName, Colors.valEm, | |
629 | ColorsNormal) |
|
630 | ColorsNormal) | |
630 | tpl_call_fail = 'in %s%%s%s(***failed resolving arguments***)%s' % \ |
|
631 | tpl_call_fail = 'in %s%%s%s(***failed resolving arguments***)%s' % \ | |
631 | (Colors.vName, Colors.valEm, ColorsNormal) |
|
632 | (Colors.vName, Colors.valEm, ColorsNormal) | |
632 | tpl_local_var = '%s%%s%s' % (Colors.vName, ColorsNormal) |
|
633 | tpl_local_var = '%s%%s%s' % (Colors.vName, ColorsNormal) | |
633 | tpl_global_var = '%sglobal%s %s%%s%s' % (Colors.em, ColorsNormal, |
|
634 | tpl_global_var = '%sglobal%s %s%%s%s' % (Colors.em, ColorsNormal, | |
634 | Colors.vName, ColorsNormal) |
|
635 | Colors.vName, ColorsNormal) | |
635 | tpl_name_val = '%%s %s= %%s%s' % (Colors.valEm, ColorsNormal) |
|
636 | tpl_name_val = '%%s %s= %%s%s' % (Colors.valEm, ColorsNormal) | |
636 | tpl_line = '%s%%s%s %%s' % (Colors.lineno, ColorsNormal) |
|
637 | tpl_line = '%s%%s%s %%s' % (Colors.lineno, ColorsNormal) | |
637 | tpl_line_em = '%s%%s%s %%s%s' % (Colors.linenoEm,Colors.line, |
|
638 | tpl_line_em = '%s%%s%s %%s%s' % (Colors.linenoEm,Colors.line, | |
638 | ColorsNormal) |
|
639 | ColorsNormal) | |
639 |
|
640 | |||
640 | # now, loop over all records printing context and info |
|
641 | # now, loop over all records printing context and info | |
641 | abspath = os.path.abspath |
|
642 | abspath = os.path.abspath | |
642 | for frame, file, lnum, func, lines, index in records: |
|
643 | for frame, file, lnum, func, lines, index in records: | |
643 | #print '*** record:',file,lnum,func,lines,index # dbg |
|
644 | #print '*** record:',file,lnum,func,lines,index # dbg | |
644 | try: |
|
645 | try: | |
645 | file = file and abspath(file) or '?' |
|
646 | file = file and abspath(file) or '?' | |
646 | except OSError: |
|
647 | except OSError: | |
647 | # if file is '<console>' or something not in the filesystem, |
|
648 | # if file is '<console>' or something not in the filesystem, | |
648 | # the abspath call will throw an OSError. Just ignore it and |
|
649 | # the abspath call will throw an OSError. Just ignore it and | |
649 | # keep the original file string. |
|
650 | # keep the original file string. | |
650 | pass |
|
651 | pass | |
651 | link = tpl_link % file |
|
652 | link = tpl_link % file | |
652 | try: |
|
653 | try: | |
653 | args, varargs, varkw, locals = inspect.getargvalues(frame) |
|
654 | args, varargs, varkw, locals = inspect.getargvalues(frame) | |
654 | except: |
|
655 | except: | |
655 | # This can happen due to a bug in python2.3. We should be |
|
656 | # This can happen due to a bug in python2.3. We should be | |
656 | # able to remove this try/except when 2.4 becomes a |
|
657 | # able to remove this try/except when 2.4 becomes a | |
657 | # requirement. Bug details at http://python.org/sf/1005466 |
|
658 | # requirement. Bug details at http://python.org/sf/1005466 | |
658 | inspect_error() |
|
659 | inspect_error() | |
659 | traceback.print_exc(file=Term.cerr) |
|
660 | traceback.print_exc(file=Term.cerr) | |
660 | info("\nIPython's exception reporting continues...\n") |
|
661 | info("\nIPython's exception reporting continues...\n") | |
661 |
|
662 | |||
662 | if func == '?': |
|
663 | if func == '?': | |
663 | call = '' |
|
664 | call = '' | |
664 | else: |
|
665 | else: | |
665 | # Decide whether to include variable details or not |
|
666 | # Decide whether to include variable details or not | |
666 | var_repr = self.include_vars and eqrepr or nullrepr |
|
667 | var_repr = self.include_vars and eqrepr or nullrepr | |
667 | try: |
|
668 | try: | |
668 | call = tpl_call % (func,inspect.formatargvalues(args, |
|
669 | call = tpl_call % (func,inspect.formatargvalues(args, | |
669 | varargs, varkw, |
|
670 | varargs, varkw, | |
670 | locals,formatvalue=var_repr)) |
|
671 | locals,formatvalue=var_repr)) | |
671 | except KeyError: |
|
672 | except KeyError: | |
672 | # Very odd crash from inspect.formatargvalues(). The |
|
673 | # Very odd crash from inspect.formatargvalues(). The | |
673 | # scenario under which it appeared was a call to |
|
674 | # scenario under which it appeared was a call to | |
674 | # view(array,scale) in NumTut.view.view(), where scale had |
|
675 | # view(array,scale) in NumTut.view.view(), where scale had | |
675 | # been defined as a scalar (it should be a tuple). Somehow |
|
676 | # been defined as a scalar (it should be a tuple). Somehow | |
676 | # inspect messes up resolving the argument list of view() |
|
677 | # inspect messes up resolving the argument list of view() | |
677 | # and barfs out. At some point I should dig into this one |
|
678 | # and barfs out. At some point I should dig into this one | |
678 | # and file a bug report about it. |
|
679 | # and file a bug report about it. | |
679 | inspect_error() |
|
680 | inspect_error() | |
680 | traceback.print_exc(file=Term.cerr) |
|
681 | traceback.print_exc(file=Term.cerr) | |
681 | info("\nIPython's exception reporting continues...\n") |
|
682 | info("\nIPython's exception reporting continues...\n") | |
682 | call = tpl_call_fail % func |
|
683 | call = tpl_call_fail % func | |
683 |
|
684 | |||
684 | # Initialize a list of names on the current line, which the |
|
685 | # Initialize a list of names on the current line, which the | |
685 | # tokenizer below will populate. |
|
686 | # tokenizer below will populate. | |
686 | names = [] |
|
687 | names = [] | |
687 |
|
688 | |||
688 | def tokeneater(token_type, token, start, end, line): |
|
689 | def tokeneater(token_type, token, start, end, line): | |
689 | """Stateful tokeneater which builds dotted names. |
|
690 | """Stateful tokeneater which builds dotted names. | |
690 |
|
691 | |||
691 | The list of names it appends to (from the enclosing scope) can |
|
692 | The list of names it appends to (from the enclosing scope) can | |
692 | contain repeated composite names. This is unavoidable, since |
|
693 | contain repeated composite names. This is unavoidable, since | |
693 | there is no way to disambguate partial dotted structures until |
|
694 | there is no way to disambguate partial dotted structures until | |
694 | the full list is known. The caller is responsible for pruning |
|
695 | the full list is known. The caller is responsible for pruning | |
695 | the final list of duplicates before using it.""" |
|
696 | the final list of duplicates before using it.""" | |
696 |
|
697 | |||
697 | # build composite names |
|
698 | # build composite names | |
698 | if token == '.': |
|
699 | if token == '.': | |
699 | try: |
|
700 | try: | |
700 | names[-1] += '.' |
|
701 | names[-1] += '.' | |
701 | # store state so the next token is added for x.y.z names |
|
702 | # store state so the next token is added for x.y.z names | |
702 | tokeneater.name_cont = True |
|
703 | tokeneater.name_cont = True | |
703 | return |
|
704 | return | |
704 | except IndexError: |
|
705 | except IndexError: | |
705 | pass |
|
706 | pass | |
706 | if token_type == tokenize.NAME and token not in keyword.kwlist: |
|
707 | if token_type == tokenize.NAME and token not in keyword.kwlist: | |
707 | if tokeneater.name_cont: |
|
708 | if tokeneater.name_cont: | |
708 | # Dotted names |
|
709 | # Dotted names | |
709 | names[-1] += token |
|
710 | names[-1] += token | |
710 | tokeneater.name_cont = False |
|
711 | tokeneater.name_cont = False | |
711 | else: |
|
712 | else: | |
712 | # Regular new names. We append everything, the caller |
|
713 | # Regular new names. We append everything, the caller | |
713 | # will be responsible for pruning the list later. It's |
|
714 | # will be responsible for pruning the list later. It's | |
714 | # very tricky to try to prune as we go, b/c composite |
|
715 | # very tricky to try to prune as we go, b/c composite | |
715 | # names can fool us. The pruning at the end is easy |
|
716 | # names can fool us. The pruning at the end is easy | |
716 | # to do (or the caller can print a list with repeated |
|
717 | # to do (or the caller can print a list with repeated | |
717 | # names if so desired. |
|
718 | # names if so desired. | |
718 | names.append(token) |
|
719 | names.append(token) | |
719 | elif token_type == tokenize.NEWLINE: |
|
720 | elif token_type == tokenize.NEWLINE: | |
720 | raise IndexError |
|
721 | raise IndexError | |
721 | # we need to store a bit of state in the tokenizer to build |
|
722 | # we need to store a bit of state in the tokenizer to build | |
722 | # dotted names |
|
723 | # dotted names | |
723 | tokeneater.name_cont = False |
|
724 | tokeneater.name_cont = False | |
724 |
|
725 | |||
725 | def linereader(file=file, lnum=[lnum], getline=linecache.getline): |
|
726 | def linereader(file=file, lnum=[lnum], getline=linecache.getline): | |
726 | line = getline(file, lnum[0]) |
|
727 | line = getline(file, lnum[0]) | |
727 | lnum[0] += 1 |
|
728 | lnum[0] += 1 | |
728 | return line |
|
729 | return line | |
729 |
|
730 | |||
730 | # Build the list of names on this line of code where the exception |
|
731 | # Build the list of names on this line of code where the exception | |
731 | # occurred. |
|
732 | # occurred. | |
732 | try: |
|
733 | try: | |
733 | # This builds the names list in-place by capturing it from the |
|
734 | # This builds the names list in-place by capturing it from the | |
734 | # enclosing scope. |
|
735 | # enclosing scope. | |
735 | tokenize.tokenize(linereader, tokeneater) |
|
736 | tokenize.tokenize(linereader, tokeneater) | |
736 | except IndexError: |
|
737 | except IndexError: | |
737 | # signals exit of tokenizer |
|
738 | # signals exit of tokenizer | |
738 | pass |
|
739 | pass | |
739 | except tokenize.TokenError,msg: |
|
740 | except tokenize.TokenError,msg: | |
740 | _m = ("An unexpected error occurred while tokenizing input\n" |
|
741 | _m = ("An unexpected error occurred while tokenizing input\n" | |
741 | "The following traceback may be corrupted or invalid\n" |
|
742 | "The following traceback may be corrupted or invalid\n" | |
742 | "The error message is: %s\n" % msg) |
|
743 | "The error message is: %s\n" % msg) | |
743 | error(_m) |
|
744 | error(_m) | |
744 |
|
745 | |||
745 | # prune names list of duplicates, but keep the right order |
|
746 | # prune names list of duplicates, but keep the right order | |
746 | unique_names = uniq_stable(names) |
|
747 | unique_names = uniq_stable(names) | |
747 |
|
748 | |||
748 | # Start loop over vars |
|
749 | # Start loop over vars | |
749 | lvals = [] |
|
750 | lvals = [] | |
750 | if self.include_vars: |
|
751 | if self.include_vars: | |
751 | for name_full in unique_names: |
|
752 | for name_full in unique_names: | |
752 | name_base = name_full.split('.',1)[0] |
|
753 | name_base = name_full.split('.',1)[0] | |
753 | if name_base in frame.f_code.co_varnames: |
|
754 | if name_base in frame.f_code.co_varnames: | |
754 | if locals.has_key(name_base): |
|
755 | if locals.has_key(name_base): | |
755 | try: |
|
756 | try: | |
756 | value = repr(eval(name_full,locals)) |
|
757 | value = repr(eval(name_full,locals)) | |
757 | except: |
|
758 | except: | |
758 | value = undefined |
|
759 | value = undefined | |
759 | else: |
|
760 | else: | |
760 | value = undefined |
|
761 | value = undefined | |
761 | name = tpl_local_var % name_full |
|
762 | name = tpl_local_var % name_full | |
762 | else: |
|
763 | else: | |
763 | if frame.f_globals.has_key(name_base): |
|
764 | if frame.f_globals.has_key(name_base): | |
764 | try: |
|
765 | try: | |
765 | value = repr(eval(name_full,frame.f_globals)) |
|
766 | value = repr(eval(name_full,frame.f_globals)) | |
766 | except: |
|
767 | except: | |
767 | value = undefined |
|
768 | value = undefined | |
768 | else: |
|
769 | else: | |
769 | value = undefined |
|
770 | value = undefined | |
770 | name = tpl_global_var % name_full |
|
771 | name = tpl_global_var % name_full | |
771 | lvals.append(tpl_name_val % (name,value)) |
|
772 | lvals.append(tpl_name_val % (name,value)) | |
772 | if lvals: |
|
773 | if lvals: | |
773 | lvals = '%s%s' % (indent,em_normal.join(lvals)) |
|
774 | lvals = '%s%s' % (indent,em_normal.join(lvals)) | |
774 | else: |
|
775 | else: | |
775 | lvals = '' |
|
776 | lvals = '' | |
776 |
|
777 | |||
777 | level = '%s %s\n' % (link,call) |
|
778 | level = '%s %s\n' % (link,call) | |
778 |
|
779 | |||
779 | if index is None: |
|
780 | if index is None: | |
780 | frames.append(level) |
|
781 | frames.append(level) | |
781 | else: |
|
782 | else: | |
782 | frames.append('%s%s' % (level,''.join( |
|
783 | frames.append('%s%s' % (level,''.join( | |
783 | _formatTracebackLines(lnum,index,lines,Colors,lvals, |
|
784 | _formatTracebackLines(lnum,index,lines,Colors,lvals, | |
784 | col_scheme)))) |
|
785 | col_scheme)))) | |
785 |
|
786 | |||
786 | # Get (safely) a string form of the exception info |
|
787 | # Get (safely) a string form of the exception info | |
787 | try: |
|
788 | try: | |
788 | etype_str,evalue_str = map(str,(etype,evalue)) |
|
789 | etype_str,evalue_str = map(str,(etype,evalue)) | |
789 | except: |
|
790 | except: | |
790 | # User exception is improperly defined. |
|
791 | # User exception is improperly defined. | |
791 | etype,evalue = str,sys.exc_info()[:2] |
|
792 | etype,evalue = str,sys.exc_info()[:2] | |
792 | etype_str,evalue_str = map(str,(etype,evalue)) |
|
793 | etype_str,evalue_str = map(str,(etype,evalue)) | |
793 | # ... and format it |
|
794 | # ... and format it | |
794 | exception = ['%s%s%s: %s' % (Colors.excName, etype_str, |
|
795 | exception = ['%s%s%s: %s' % (Colors.excName, etype_str, | |
795 | ColorsNormal, evalue_str)] |
|
796 | ColorsNormal, evalue_str)] | |
796 | if type(evalue) is types.InstanceType: |
|
797 | if type(evalue) is types.InstanceType: | |
797 | try: |
|
798 | try: | |
798 | names = [w for w in dir(evalue) if isinstance(w, basestring)] |
|
799 | names = [w for w in dir(evalue) if isinstance(w, basestring)] | |
799 | except: |
|
800 | except: | |
800 | # Every now and then, an object with funny inernals blows up |
|
801 | # Every now and then, an object with funny inernals blows up | |
801 | # when dir() is called on it. We do the best we can to report |
|
802 | # when dir() is called on it. We do the best we can to report | |
802 | # the problem and continue |
|
803 | # the problem and continue | |
803 | _m = '%sException reporting error (object with broken dir())%s:' |
|
804 | _m = '%sException reporting error (object with broken dir())%s:' | |
804 | exception.append(_m % (Colors.excName,ColorsNormal)) |
|
805 | exception.append(_m % (Colors.excName,ColorsNormal)) | |
805 | etype_str,evalue_str = map(str,sys.exc_info()[:2]) |
|
806 | etype_str,evalue_str = map(str,sys.exc_info()[:2]) | |
806 | exception.append('%s%s%s: %s' % (Colors.excName,etype_str, |
|
807 | exception.append('%s%s%s: %s' % (Colors.excName,etype_str, | |
807 | ColorsNormal, evalue_str)) |
|
808 | ColorsNormal, evalue_str)) | |
808 | names = [] |
|
809 | names = [] | |
809 | for name in names: |
|
810 | for name in names: | |
810 | value = text_repr(getattr(evalue, name)) |
|
811 | value = text_repr(getattr(evalue, name)) | |
811 | exception.append('\n%s%s = %s' % (indent, name, value)) |
|
812 | exception.append('\n%s%s = %s' % (indent, name, value)) | |
812 |
|
813 | |||
813 | # This is being commented out for now as the __IPYTHON__ variable |
|
814 | # This is being commented out for now as the __IPYTHON__ variable | |
814 | # referenced here is not resolved and causes massive test failures |
|
815 | # referenced here is not resolved and causes massive test failures | |
815 | # and errors. B. Granger, 04/2009. XXX |
|
816 | # and errors. B. Granger, 04/2009. XXX | |
816 | # See https://bugs.launchpad.net/bugs/362137 |
|
817 | # See https://bugs.launchpad.net/bugs/362137 | |
817 | # # vds: >> |
|
818 | # # vds: >> | |
818 | # if records: |
|
819 | # if records: | |
819 | # filepath, lnum = records[-1][1:3] |
|
820 | # filepath, lnum = records[-1][1:3] | |
820 | # #print "file:", str(file), "linenb", str(lnum) # dbg |
|
821 | # #print "file:", str(file), "linenb", str(lnum) # dbg | |
821 | # filepath = os.path.abspath(filepath) |
|
822 | # filepath = os.path.abspath(filepath) | |
822 | # __IPYTHON__.hooks.synchronize_with_editor(filepath, lnum, 0) |
|
823 | # __IPYTHON__.hooks.synchronize_with_editor(filepath, lnum, 0) | |
823 | # # vds: << |
|
824 | # # vds: << | |
824 |
|
825 | |||
825 | # return all our info assembled as a single string |
|
826 | # return all our info assembled as a single string | |
826 | return '%s\n\n%s\n%s' % (head,'\n'.join(frames),''.join(exception[0]) ) |
|
827 | return '%s\n\n%s\n%s' % (head,'\n'.join(frames),''.join(exception[0]) ) | |
827 |
|
828 | |||
828 | def debugger(self,force=False): |
|
829 | def debugger(self,force=False): | |
829 | """Call up the pdb debugger if desired, always clean up the tb |
|
830 | """Call up the pdb debugger if desired, always clean up the tb | |
830 | reference. |
|
831 | reference. | |
831 |
|
832 | |||
832 | Keywords: |
|
833 | Keywords: | |
833 |
|
834 | |||
834 | - force(False): by default, this routine checks the instance call_pdb |
|
835 | - force(False): by default, this routine checks the instance call_pdb | |
835 | flag and does not actually invoke the debugger if the flag is false. |
|
836 | flag and does not actually invoke the debugger if the flag is false. | |
836 | The 'force' option forces the debugger to activate even if the flag |
|
837 | The 'force' option forces the debugger to activate even if the flag | |
837 | is false. |
|
838 | is false. | |
838 |
|
839 | |||
839 | If the call_pdb flag is set, the pdb interactive debugger is |
|
840 | If the call_pdb flag is set, the pdb interactive debugger is | |
840 | invoked. In all cases, the self.tb reference to the current traceback |
|
841 | invoked. In all cases, the self.tb reference to the current traceback | |
841 | is deleted to prevent lingering references which hamper memory |
|
842 | is deleted to prevent lingering references which hamper memory | |
842 | management. |
|
843 | management. | |
843 |
|
844 | |||
844 | Note that each call to pdb() does an 'import readline', so if your app |
|
845 | Note that each call to pdb() does an 'import readline', so if your app | |
845 | requires a special setup for the readline completers, you'll have to |
|
846 | requires a special setup for the readline completers, you'll have to | |
846 | fix that by hand after invoking the exception handler.""" |
|
847 | fix that by hand after invoking the exception handler.""" | |
847 |
|
848 | |||
848 | if force or self.call_pdb: |
|
849 | if force or self.call_pdb: | |
849 | if self.pdb is None: |
|
850 | if self.pdb is None: | |
850 |
self.pdb = |
|
851 | self.pdb = debugger.Pdb( | |
851 | self.color_scheme_table.active_scheme_name) |
|
852 | self.color_scheme_table.active_scheme_name) | |
852 | # the system displayhook may have changed, restore the original |
|
853 | # the system displayhook may have changed, restore the original | |
853 | # for pdb |
|
854 | # for pdb | |
854 | dhook = sys.displayhook |
|
855 | dhook = sys.displayhook | |
855 | sys.displayhook = sys.__displayhook__ |
|
856 | sys.displayhook = sys.__displayhook__ | |
856 | self.pdb.reset() |
|
857 | self.pdb.reset() | |
857 | # Find the right frame so we don't pop up inside ipython itself |
|
858 | # Find the right frame so we don't pop up inside ipython itself | |
858 | if hasattr(self,'tb'): |
|
859 | if hasattr(self,'tb'): | |
859 | etb = self.tb |
|
860 | etb = self.tb | |
860 | else: |
|
861 | else: | |
861 | etb = self.tb = sys.last_traceback |
|
862 | etb = self.tb = sys.last_traceback | |
862 | while self.tb.tb_next is not None: |
|
863 | while self.tb.tb_next is not None: | |
863 | self.tb = self.tb.tb_next |
|
864 | self.tb = self.tb.tb_next | |
864 | try: |
|
865 | try: | |
865 | if etb and etb.tb_next: |
|
866 | if etb and etb.tb_next: | |
866 | etb = etb.tb_next |
|
867 | etb = etb.tb_next | |
867 | self.pdb.botframe = etb.tb_frame |
|
868 | self.pdb.botframe = etb.tb_frame | |
868 | self.pdb.interaction(self.tb.tb_frame, self.tb) |
|
869 | self.pdb.interaction(self.tb.tb_frame, self.tb) | |
869 | finally: |
|
870 | finally: | |
870 | sys.displayhook = dhook |
|
871 | sys.displayhook = dhook | |
871 |
|
872 | |||
872 | if hasattr(self,'tb'): |
|
873 | if hasattr(self,'tb'): | |
873 | del self.tb |
|
874 | del self.tb | |
874 |
|
875 | |||
875 | def handler(self, info=None): |
|
876 | def handler(self, info=None): | |
876 | (etype, evalue, etb) = info or sys.exc_info() |
|
877 | (etype, evalue, etb) = info or sys.exc_info() | |
877 | self.tb = etb |
|
878 | self.tb = etb | |
878 | Term.cout.flush() |
|
879 | Term.cout.flush() | |
879 | print >> Term.cerr, self.text(etype, evalue, etb) |
|
880 | print >> Term.cerr, self.text(etype, evalue, etb) | |
880 | Term.cerr.flush() |
|
881 | Term.cerr.flush() | |
881 |
|
882 | |||
882 | # Changed so an instance can just be called as VerboseTB_inst() and print |
|
883 | # Changed so an instance can just be called as VerboseTB_inst() and print | |
883 | # out the right info on its own. |
|
884 | # out the right info on its own. | |
884 | def __call__(self, etype=None, evalue=None, etb=None): |
|
885 | def __call__(self, etype=None, evalue=None, etb=None): | |
885 | """This hook can replace sys.excepthook (for Python 2.1 or higher).""" |
|
886 | """This hook can replace sys.excepthook (for Python 2.1 or higher).""" | |
886 | if etb is None: |
|
887 | if etb is None: | |
887 | self.handler() |
|
888 | self.handler() | |
888 | else: |
|
889 | else: | |
889 | self.handler((etype, evalue, etb)) |
|
890 | self.handler((etype, evalue, etb)) | |
890 | try: |
|
891 | try: | |
891 | self.debugger() |
|
892 | self.debugger() | |
892 | except KeyboardInterrupt: |
|
893 | except KeyboardInterrupt: | |
893 | print "\nKeyboardInterrupt" |
|
894 | print "\nKeyboardInterrupt" | |
894 |
|
895 | |||
895 | #---------------------------------------------------------------------------- |
|
896 | #---------------------------------------------------------------------------- | |
896 | class FormattedTB(VerboseTB,ListTB): |
|
897 | class FormattedTB(VerboseTB,ListTB): | |
897 | """Subclass ListTB but allow calling with a traceback. |
|
898 | """Subclass ListTB but allow calling with a traceback. | |
898 |
|
899 | |||
899 | It can thus be used as a sys.excepthook for Python > 2.1. |
|
900 | It can thus be used as a sys.excepthook for Python > 2.1. | |
900 |
|
901 | |||
901 | Also adds 'Context' and 'Verbose' modes, not available in ListTB. |
|
902 | Also adds 'Context' and 'Verbose' modes, not available in ListTB. | |
902 |
|
903 | |||
903 | Allows a tb_offset to be specified. This is useful for situations where |
|
904 | Allows a tb_offset to be specified. This is useful for situations where | |
904 | one needs to remove a number of topmost frames from the traceback (such as |
|
905 | one needs to remove a number of topmost frames from the traceback (such as | |
905 | occurs with python programs that themselves execute other python code, |
|
906 | occurs with python programs that themselves execute other python code, | |
906 | like Python shells). """ |
|
907 | like Python shells). """ | |
907 |
|
908 | |||
908 | def __init__(self, mode = 'Plain', color_scheme='Linux', |
|
909 | def __init__(self, mode = 'Plain', color_scheme='Linux', | |
909 | tb_offset = 0,long_header=0,call_pdb=0,include_vars=0): |
|
910 | tb_offset = 0,long_header=0,call_pdb=0,include_vars=0): | |
910 |
|
911 | |||
911 | # NEVER change the order of this list. Put new modes at the end: |
|
912 | # NEVER change the order of this list. Put new modes at the end: | |
912 | self.valid_modes = ['Plain','Context','Verbose'] |
|
913 | self.valid_modes = ['Plain','Context','Verbose'] | |
913 | self.verbose_modes = self.valid_modes[1:3] |
|
914 | self.verbose_modes = self.valid_modes[1:3] | |
914 |
|
915 | |||
915 | VerboseTB.__init__(self,color_scheme,tb_offset,long_header, |
|
916 | VerboseTB.__init__(self,color_scheme,tb_offset,long_header, | |
916 | call_pdb=call_pdb,include_vars=include_vars) |
|
917 | call_pdb=call_pdb,include_vars=include_vars) | |
917 | self.set_mode(mode) |
|
918 | self.set_mode(mode) | |
918 |
|
919 | |||
919 | def _extract_tb(self,tb): |
|
920 | def _extract_tb(self,tb): | |
920 | if tb: |
|
921 | if tb: | |
921 | return traceback.extract_tb(tb) |
|
922 | return traceback.extract_tb(tb) | |
922 | else: |
|
923 | else: | |
923 | return None |
|
924 | return None | |
924 |
|
925 | |||
925 | def text(self, etype, value, tb,context=5,mode=None): |
|
926 | def text(self, etype, value, tb,context=5,mode=None): | |
926 | """Return formatted traceback. |
|
927 | """Return formatted traceback. | |
927 |
|
928 | |||
928 | If the optional mode parameter is given, it overrides the current |
|
929 | If the optional mode parameter is given, it overrides the current | |
929 | mode.""" |
|
930 | mode.""" | |
930 |
|
931 | |||
931 | if mode is None: |
|
932 | if mode is None: | |
932 | mode = self.mode |
|
933 | mode = self.mode | |
933 | if mode in self.verbose_modes: |
|
934 | if mode in self.verbose_modes: | |
934 | # verbose modes need a full traceback |
|
935 | # verbose modes need a full traceback | |
935 | return VerboseTB.text(self,etype, value, tb,context=5) |
|
936 | return VerboseTB.text(self,etype, value, tb,context=5) | |
936 | else: |
|
937 | else: | |
937 | # We must check the source cache because otherwise we can print |
|
938 | # We must check the source cache because otherwise we can print | |
938 | # out-of-date source code. |
|
939 | # out-of-date source code. | |
939 | linecache.checkcache() |
|
940 | linecache.checkcache() | |
940 | # Now we can extract and format the exception |
|
941 | # Now we can extract and format the exception | |
941 | elist = self._extract_tb(tb) |
|
942 | elist = self._extract_tb(tb) | |
942 | if len(elist) > self.tb_offset: |
|
943 | if len(elist) > self.tb_offset: | |
943 | del elist[:self.tb_offset] |
|
944 | del elist[:self.tb_offset] | |
944 | return ListTB.text(self,etype,value,elist) |
|
945 | return ListTB.text(self,etype,value,elist) | |
945 |
|
946 | |||
946 | def set_mode(self,mode=None): |
|
947 | def set_mode(self,mode=None): | |
947 | """Switch to the desired mode. |
|
948 | """Switch to the desired mode. | |
948 |
|
949 | |||
949 | If mode is not specified, cycles through the available modes.""" |
|
950 | If mode is not specified, cycles through the available modes.""" | |
950 |
|
951 | |||
951 | if not mode: |
|
952 | if not mode: | |
952 | new_idx = ( self.valid_modes.index(self.mode) + 1 ) % \ |
|
953 | new_idx = ( self.valid_modes.index(self.mode) + 1 ) % \ | |
953 | len(self.valid_modes) |
|
954 | len(self.valid_modes) | |
954 | self.mode = self.valid_modes[new_idx] |
|
955 | self.mode = self.valid_modes[new_idx] | |
955 | elif mode not in self.valid_modes: |
|
956 | elif mode not in self.valid_modes: | |
956 | raise ValueError, 'Unrecognized mode in FormattedTB: <'+mode+'>\n'\ |
|
957 | raise ValueError, 'Unrecognized mode in FormattedTB: <'+mode+'>\n'\ | |
957 | 'Valid modes: '+str(self.valid_modes) |
|
958 | 'Valid modes: '+str(self.valid_modes) | |
958 | else: |
|
959 | else: | |
959 | self.mode = mode |
|
960 | self.mode = mode | |
960 | # include variable details only in 'Verbose' mode |
|
961 | # include variable details only in 'Verbose' mode | |
961 | self.include_vars = (self.mode == self.valid_modes[2]) |
|
962 | self.include_vars = (self.mode == self.valid_modes[2]) | |
962 |
|
963 | |||
963 | # some convenient shorcuts |
|
964 | # some convenient shorcuts | |
964 | def plain(self): |
|
965 | def plain(self): | |
965 | self.set_mode(self.valid_modes[0]) |
|
966 | self.set_mode(self.valid_modes[0]) | |
966 |
|
967 | |||
967 | def context(self): |
|
968 | def context(self): | |
968 | self.set_mode(self.valid_modes[1]) |
|
969 | self.set_mode(self.valid_modes[1]) | |
969 |
|
970 | |||
970 | def verbose(self): |
|
971 | def verbose(self): | |
971 | self.set_mode(self.valid_modes[2]) |
|
972 | self.set_mode(self.valid_modes[2]) | |
972 |
|
973 | |||
973 | #---------------------------------------------------------------------------- |
|
974 | #---------------------------------------------------------------------------- | |
974 | class AutoFormattedTB(FormattedTB): |
|
975 | class AutoFormattedTB(FormattedTB): | |
975 | """A traceback printer which can be called on the fly. |
|
976 | """A traceback printer which can be called on the fly. | |
976 |
|
977 | |||
977 | It will find out about exceptions by itself. |
|
978 | It will find out about exceptions by itself. | |
978 |
|
979 | |||
979 | A brief example: |
|
980 | A brief example: | |
980 |
|
981 | |||
981 | AutoTB = AutoFormattedTB(mode = 'Verbose',color_scheme='Linux') |
|
982 | AutoTB = AutoFormattedTB(mode = 'Verbose',color_scheme='Linux') | |
982 | try: |
|
983 | try: | |
983 | ... |
|
984 | ... | |
984 | except: |
|
985 | except: | |
985 | AutoTB() # or AutoTB(out=logfile) where logfile is an open file object |
|
986 | AutoTB() # or AutoTB(out=logfile) where logfile is an open file object | |
986 | """ |
|
987 | """ | |
987 | def __call__(self,etype=None,evalue=None,etb=None, |
|
988 | def __call__(self,etype=None,evalue=None,etb=None, | |
988 | out=None,tb_offset=None): |
|
989 | out=None,tb_offset=None): | |
989 | """Print out a formatted exception traceback. |
|
990 | """Print out a formatted exception traceback. | |
990 |
|
991 | |||
991 | Optional arguments: |
|
992 | Optional arguments: | |
992 | - out: an open file-like object to direct output to. |
|
993 | - out: an open file-like object to direct output to. | |
993 |
|
994 | |||
994 | - tb_offset: the number of frames to skip over in the stack, on a |
|
995 | - tb_offset: the number of frames to skip over in the stack, on a | |
995 | per-call basis (this overrides temporarily the instance's tb_offset |
|
996 | per-call basis (this overrides temporarily the instance's tb_offset | |
996 | given at initialization time. """ |
|
997 | given at initialization time. """ | |
997 |
|
998 | |||
998 | if out is None: |
|
999 | if out is None: | |
999 | out = Term.cerr |
|
1000 | out = Term.cerr | |
1000 | Term.cout.flush() |
|
1001 | Term.cout.flush() | |
1001 | if tb_offset is not None: |
|
1002 | if tb_offset is not None: | |
1002 | tb_offset, self.tb_offset = self.tb_offset, tb_offset |
|
1003 | tb_offset, self.tb_offset = self.tb_offset, tb_offset | |
1003 | print >> out, self.text(etype, evalue, etb) |
|
1004 | print >> out, self.text(etype, evalue, etb) | |
1004 | self.tb_offset = tb_offset |
|
1005 | self.tb_offset = tb_offset | |
1005 | else: |
|
1006 | else: | |
1006 | print >> out, self.text(etype, evalue, etb) |
|
1007 | print >> out, self.text(etype, evalue, etb) | |
1007 | out.flush() |
|
1008 | out.flush() | |
1008 | try: |
|
1009 | try: | |
1009 | self.debugger() |
|
1010 | self.debugger() | |
1010 | except KeyboardInterrupt: |
|
1011 | except KeyboardInterrupt: | |
1011 | print "\nKeyboardInterrupt" |
|
1012 | print "\nKeyboardInterrupt" | |
1012 |
|
1013 | |||
1013 | def text(self,etype=None,value=None,tb=None,context=5,mode=None): |
|
1014 | def text(self,etype=None,value=None,tb=None,context=5,mode=None): | |
1014 | if etype is None: |
|
1015 | if etype is None: | |
1015 | etype,value,tb = sys.exc_info() |
|
1016 | etype,value,tb = sys.exc_info() | |
1016 | self.tb = tb |
|
1017 | self.tb = tb | |
1017 | return FormattedTB.text(self,etype,value,tb,context=5,mode=mode) |
|
1018 | return FormattedTB.text(self,etype,value,tb,context=5,mode=mode) | |
1018 |
|
1019 | |||
1019 | #--------------------------------------------------------------------------- |
|
1020 | #--------------------------------------------------------------------------- | |
1020 | # A simple class to preserve Nathan's original functionality. |
|
1021 | # A simple class to preserve Nathan's original functionality. | |
1021 | class ColorTB(FormattedTB): |
|
1022 | class ColorTB(FormattedTB): | |
1022 | """Shorthand to initialize a FormattedTB in Linux colors mode.""" |
|
1023 | """Shorthand to initialize a FormattedTB in Linux colors mode.""" | |
1023 | def __init__(self,color_scheme='Linux',call_pdb=0): |
|
1024 | def __init__(self,color_scheme='Linux',call_pdb=0): | |
1024 | FormattedTB.__init__(self,color_scheme=color_scheme, |
|
1025 | FormattedTB.__init__(self,color_scheme=color_scheme, | |
1025 | call_pdb=call_pdb) |
|
1026 | call_pdb=call_pdb) | |
1026 |
|
1027 | |||
1027 | #---------------------------------------------------------------------------- |
|
1028 | #---------------------------------------------------------------------------- | |
1028 | # module testing (minimal) |
|
1029 | # module testing (minimal) | |
1029 | if __name__ == "__main__": |
|
1030 | if __name__ == "__main__": | |
1030 | def spam(c, (d, e)): |
|
1031 | def spam(c, (d, e)): | |
1031 | x = c + d |
|
1032 | x = c + d | |
1032 | y = c * d |
|
1033 | y = c * d | |
1033 | foo(x, y) |
|
1034 | foo(x, y) | |
1034 |
|
1035 | |||
1035 | def foo(a, b, bar=1): |
|
1036 | def foo(a, b, bar=1): | |
1036 | eggs(a, b + bar) |
|
1037 | eggs(a, b + bar) | |
1037 |
|
1038 | |||
1038 | def eggs(f, g, z=globals()): |
|
1039 | def eggs(f, g, z=globals()): | |
1039 | h = f + g |
|
1040 | h = f + g | |
1040 | i = f - g |
|
1041 | i = f - g | |
1041 | return h / i |
|
1042 | return h / i | |
1042 |
|
1043 | |||
1043 | print '' |
|
1044 | print '' | |
1044 | print '*** Before ***' |
|
1045 | print '*** Before ***' | |
1045 | try: |
|
1046 | try: | |
1046 | print spam(1, (2, 3)) |
|
1047 | print spam(1, (2, 3)) | |
1047 | except: |
|
1048 | except: | |
1048 | traceback.print_exc() |
|
1049 | traceback.print_exc() | |
1049 | print '' |
|
1050 | print '' | |
1050 |
|
1051 | |||
1051 | handler = ColorTB() |
|
1052 | handler = ColorTB() | |
1052 | print '*** ColorTB ***' |
|
1053 | print '*** ColorTB ***' | |
1053 | try: |
|
1054 | try: | |
1054 | print spam(1, (2, 3)) |
|
1055 | print spam(1, (2, 3)) | |
1055 | except: |
|
1056 | except: | |
1056 | apply(handler, sys.exc_info() ) |
|
1057 | apply(handler, sys.exc_info() ) | |
1057 | print '' |
|
1058 | print '' | |
1058 |
|
1059 | |||
1059 | handler = VerboseTB() |
|
1060 | handler = VerboseTB() | |
1060 | print '*** VerboseTB ***' |
|
1061 | print '*** VerboseTB ***' | |
1061 | try: |
|
1062 | try: | |
1062 | print spam(1, (2, 3)) |
|
1063 | print spam(1, (2, 3)) | |
1063 | except: |
|
1064 | except: | |
1064 | apply(handler, sys.exc_info() ) |
|
1065 | apply(handler, sys.exc_info() ) | |
1065 | print '' |
|
1066 | print '' | |
1066 |
|
1067 |
@@ -1,300 +1,300 | |||||
1 | # -*- coding: utf-8 -*- |
|
1 | # -*- coding: utf-8 -*- | |
2 | """IPython Test Suite Runner. |
|
2 | """IPython Test Suite Runner. | |
3 |
|
3 | |||
4 | This module provides a main entry point to a user script to test IPython |
|
4 | This module provides a main entry point to a user script to test IPython | |
5 | itself from the command line. There are two ways of running this script: |
|
5 | itself from the command line. There are two ways of running this script: | |
6 |
|
6 | |||
7 | 1. With the syntax `iptest all`. This runs our entire test suite by |
|
7 | 1. With the syntax `iptest all`. This runs our entire test suite by | |
8 | calling this script (with different arguments) or trial recursively. This |
|
8 | calling this script (with different arguments) or trial recursively. This | |
9 | causes modules and package to be tested in different processes, using nose |
|
9 | causes modules and package to be tested in different processes, using nose | |
10 | or trial where appropriate. |
|
10 | or trial where appropriate. | |
11 | 2. With the regular nose syntax, like `iptest -vvs IPython`. In this form |
|
11 | 2. With the regular nose syntax, like `iptest -vvs IPython`. In this form | |
12 | the script simply calls nose, but with special command line flags and |
|
12 | the script simply calls nose, but with special command line flags and | |
13 | plugins loaded. |
|
13 | plugins loaded. | |
14 |
|
14 | |||
15 | For now, this script requires that both nose and twisted are installed. This |
|
15 | For now, this script requires that both nose and twisted are installed. This | |
16 | will change in the future. |
|
16 | will change in the future. | |
17 | """ |
|
17 | """ | |
18 |
|
18 | |||
19 | #----------------------------------------------------------------------------- |
|
19 | #----------------------------------------------------------------------------- | |
20 | # Module imports |
|
20 | # Module imports | |
21 | #----------------------------------------------------------------------------- |
|
21 | #----------------------------------------------------------------------------- | |
22 |
|
22 | |||
23 | import os |
|
23 | import os | |
24 | import os.path as path |
|
24 | import os.path as path | |
25 | import sys |
|
25 | import sys | |
26 | import subprocess |
|
26 | import subprocess | |
27 | import time |
|
27 | import time | |
28 | import warnings |
|
28 | import warnings | |
29 |
|
29 | |||
30 | import nose.plugins.builtin |
|
30 | import nose.plugins.builtin | |
31 | from nose.core import TestProgram |
|
31 | from nose.core import TestProgram | |
32 |
|
32 | |||
33 | from IPython.platutils import find_cmd |
|
33 | from IPython.platutils import find_cmd | |
34 | from IPython.testing.plugin.ipdoctest import IPythonDoctest |
|
34 | from IPython.testing.plugin.ipdoctest import IPythonDoctest | |
35 |
|
35 | |||
36 | pjoin = path.join |
|
36 | pjoin = path.join | |
37 |
|
37 | |||
38 | #----------------------------------------------------------------------------- |
|
38 | #----------------------------------------------------------------------------- | |
39 | # Logic for skipping doctests |
|
39 | # Logic for skipping doctests | |
40 | #----------------------------------------------------------------------------- |
|
40 | #----------------------------------------------------------------------------- | |
41 |
|
41 | |||
42 | def test_for(mod): |
|
42 | def test_for(mod): | |
43 | """Test to see if mod is importable.""" |
|
43 | """Test to see if mod is importable.""" | |
44 | try: |
|
44 | try: | |
45 | __import__(mod) |
|
45 | __import__(mod) | |
46 | except ImportError: |
|
46 | except ImportError: | |
47 | return False |
|
47 | return False | |
48 | else: |
|
48 | else: | |
49 | return True |
|
49 | return True | |
50 |
|
50 | |||
51 | have_curses = test_for('_curses') |
|
51 | have_curses = test_for('_curses') | |
52 | have_wx = test_for('wx') |
|
52 | have_wx = test_for('wx') | |
53 | have_zi = test_for('zope.interface') |
|
53 | have_zi = test_for('zope.interface') | |
54 | have_twisted = test_for('twisted') |
|
54 | have_twisted = test_for('twisted') | |
55 | have_foolscap = test_for('foolscap') |
|
55 | have_foolscap = test_for('foolscap') | |
56 | have_objc = test_for('objc') |
|
56 | have_objc = test_for('objc') | |
57 | have_pexpect = test_for('pexpect') |
|
57 | have_pexpect = test_for('pexpect') | |
58 |
|
58 | |||
59 | # For the IPythonDoctest plugin, we need to exclude certain patterns that cause |
|
59 | # For the IPythonDoctest plugin, we need to exclude certain patterns that cause | |
60 | # testing problems. We should strive to minimize the number of skipped |
|
60 | # testing problems. We should strive to minimize the number of skipped | |
61 | # modules, since this means untested code. As the testing machinery |
|
61 | # modules, since this means untested code. As the testing machinery | |
62 | # solidifies, this list should eventually become empty. |
|
62 | # solidifies, this list should eventually become empty. | |
63 | EXCLUDE = [pjoin('IPython', 'external'), |
|
63 | EXCLUDE = [pjoin('IPython', 'external'), | |
64 | pjoin('IPython', 'frontend', 'process', 'winprocess.py'), |
|
64 | pjoin('IPython', 'frontend', 'process', 'winprocess.py'), | |
65 | pjoin('IPython_doctest_plugin'), |
|
65 | pjoin('IPython_doctest_plugin'), | |
66 | pjoin('IPython', 'Gnuplot'), |
|
66 | pjoin('IPython', 'Gnuplot'), | |
67 | pjoin('IPython', 'Extensions', 'ipy_'), |
|
67 | pjoin('IPython', 'Extensions', 'ipy_'), | |
68 | pjoin('IPython', 'Extensions', 'clearcmd'), |
|
68 | pjoin('IPython', 'Extensions', 'clearcmd'), | |
69 | pjoin('IPython', 'Extensions', 'PhysicalQInteractive'), |
|
69 | pjoin('IPython', 'Extensions', 'PhysicalQInteractive'), | |
70 | pjoin('IPython', 'Extensions', 'scitedirector'), |
|
70 | pjoin('IPython', 'Extensions', 'scitedirector'), | |
71 | pjoin('IPython', 'Extensions', 'numeric_formats'), |
|
71 | pjoin('IPython', 'Extensions', 'numeric_formats'), | |
72 | pjoin('IPython', 'testing', 'attic'), |
|
72 | pjoin('IPython', 'testing', 'attic'), | |
73 | pjoin('IPython', 'testing', 'tutils'), |
|
73 | pjoin('IPython', 'testing', 'tutils'), | |
74 | pjoin('IPython', 'testing', 'tools'), |
|
74 | pjoin('IPython', 'testing', 'tools'), | |
75 | pjoin('IPython', 'testing', 'mkdoctests') |
|
75 | pjoin('IPython', 'testing', 'mkdoctests') | |
76 | ] |
|
76 | ] | |
77 |
|
77 | |||
78 | if not have_wx: |
|
78 | if not have_wx: | |
79 | EXCLUDE.append(pjoin('IPython', 'Extensions', 'igrid')) |
|
79 | EXCLUDE.append(pjoin('IPython', 'Extensions', 'igrid')) | |
80 | EXCLUDE.append(pjoin('IPython', 'gui')) |
|
80 | EXCLUDE.append(pjoin('IPython', 'gui')) | |
81 | EXCLUDE.append(pjoin('IPython', 'frontend', 'wx')) |
|
81 | EXCLUDE.append(pjoin('IPython', 'frontend', 'wx')) | |
82 |
|
82 | |||
83 | if not have_objc: |
|
83 | if not have_objc: | |
84 | EXCLUDE.append(pjoin('IPython', 'frontend', 'cocoa')) |
|
84 | EXCLUDE.append(pjoin('IPython', 'frontend', 'cocoa')) | |
85 |
|
85 | |||
86 | if not have_curses: |
|
86 | if not have_curses: | |
87 | EXCLUDE.append(pjoin('IPython', 'Extensions', 'ibrowse')) |
|
87 | EXCLUDE.append(pjoin('IPython', 'Extensions', 'ibrowse')) | |
88 |
|
88 | |||
89 | if not sys.platform == 'win32': |
|
89 | if not sys.platform == 'win32': | |
90 | EXCLUDE.append(pjoin('IPython', 'platutils_win32')) |
|
90 | EXCLUDE.append(pjoin('IPython', 'platutils_win32')) | |
91 |
|
91 | |||
92 | # These have to be skipped on win32 because the use echo, rm, cd, etc. |
|
92 | # These have to be skipped on win32 because the use echo, rm, cd, etc. | |
93 | # See ticket https://bugs.launchpad.net/bugs/366982 |
|
93 | # See ticket https://bugs.launchpad.net/bugs/366982 | |
94 | if sys.platform == 'win32': |
|
94 | if sys.platform == 'win32': | |
95 | EXCLUDE.append(pjoin('IPython', 'testing', 'plugin', 'test_exampleip')) |
|
95 | EXCLUDE.append(pjoin('IPython', 'testing', 'plugin', 'test_exampleip')) | |
96 | EXCLUDE.append(pjoin('IPython', 'testing', 'plugin', 'dtexample')) |
|
96 | EXCLUDE.append(pjoin('IPython', 'testing', 'plugin', 'dtexample')) | |
97 |
|
97 | |||
98 | if not os.name == 'posix': |
|
98 | if not os.name == 'posix': | |
99 | EXCLUDE.append(pjoin('IPython', 'platutils_posix')) |
|
99 | EXCLUDE.append(pjoin('IPython', 'platutils_posix')) | |
100 |
|
100 | |||
101 | if not have_pexpect: |
|
101 | if not have_pexpect: | |
102 | EXCLUDE.append(pjoin('IPython', 'irunner')) |
|
102 | EXCLUDE.append(pjoin('IPython', 'irunner')) | |
103 |
|
103 | |||
104 | # This is needed for the reg-exp to match on win32 in the ipdoctest plugin. |
|
104 | # This is needed for the reg-exp to match on win32 in the ipdoctest plugin. | |
105 | if sys.platform == 'win32': |
|
105 | if sys.platform == 'win32': | |
106 | EXCLUDE = [s.replace('\\','\\\\') for s in EXCLUDE] |
|
106 | EXCLUDE = [s.replace('\\','\\\\') for s in EXCLUDE] | |
107 |
|
107 | |||
108 |
|
108 | |||
109 | #----------------------------------------------------------------------------- |
|
109 | #----------------------------------------------------------------------------- | |
110 | # Functions and classes |
|
110 | # Functions and classes | |
111 | #----------------------------------------------------------------------------- |
|
111 | #----------------------------------------------------------------------------- | |
112 |
|
112 | |||
113 | def run_iptest(): |
|
113 | def run_iptest(): | |
114 | """Run the IPython test suite using nose. |
|
114 | """Run the IPython test suite using nose. | |
115 |
|
115 | |||
116 | This function is called when this script is **not** called with the form |
|
116 | This function is called when this script is **not** called with the form | |
117 | `iptest all`. It simply calls nose with appropriate command line flags |
|
117 | `iptest all`. It simply calls nose with appropriate command line flags | |
118 | and accepts all of the standard nose arguments. |
|
118 | and accepts all of the standard nose arguments. | |
119 | """ |
|
119 | """ | |
120 |
|
120 | |||
121 | warnings.filterwarnings('ignore', |
|
121 | warnings.filterwarnings('ignore', | |
122 | 'This will be removed soon. Use IPython.testing.util instead') |
|
122 | 'This will be removed soon. Use IPython.testing.util instead') | |
123 |
|
123 | |||
124 | argv = sys.argv + [ |
|
124 | argv = sys.argv + [ | |
125 | # Loading ipdoctest causes problems with Twisted. |
|
125 | # Loading ipdoctest causes problems with Twisted. | |
126 | # I am removing this as a temporary fix to get the |
|
126 | # I am removing this as a temporary fix to get the | |
127 | # test suite back into working shape. Our nose |
|
127 | # test suite back into working shape. Our nose | |
128 | # plugin needs to be gone through with a fine |
|
128 | # plugin needs to be gone through with a fine | |
129 | # toothed comb to find what is causing the problem. |
|
129 | # toothed comb to find what is causing the problem. | |
130 | '--with-ipdoctest', |
|
130 | '--with-ipdoctest', | |
131 | '--ipdoctest-tests','--ipdoctest-extension=txt', |
|
131 | '--ipdoctest-tests','--ipdoctest-extension=txt', | |
132 | '--detailed-errors', |
|
132 | '--detailed-errors', | |
133 |
|
133 | |||
134 | # We add --exe because of setuptools' imbecility (it |
|
134 | # We add --exe because of setuptools' imbecility (it | |
135 | # blindly does chmod +x on ALL files). Nose does the |
|
135 | # blindly does chmod +x on ALL files). Nose does the | |
136 | # right thing and it tries to avoid executables, |
|
136 | # right thing and it tries to avoid executables, | |
137 | # setuptools unfortunately forces our hand here. This |
|
137 | # setuptools unfortunately forces our hand here. This | |
138 | # has been discussed on the distutils list and the |
|
138 | # has been discussed on the distutils list and the | |
139 | # setuptools devs refuse to fix this problem! |
|
139 | # setuptools devs refuse to fix this problem! | |
140 | '--exe', |
|
140 | '--exe', | |
141 | ] |
|
141 | ] | |
142 |
|
142 | |||
143 | # Detect if any tests were required by explicitly calling an IPython |
|
143 | # Detect if any tests were required by explicitly calling an IPython | |
144 | # submodule or giving a specific path |
|
144 | # submodule or giving a specific path | |
145 | has_tests = False |
|
145 | has_tests = False | |
146 | for arg in sys.argv: |
|
146 | for arg in sys.argv: | |
147 | if 'IPython' in arg or arg.endswith('.py') or \ |
|
147 | if 'IPython' in arg or arg.endswith('.py') or \ | |
148 | (':' in arg and '.py' in arg): |
|
148 | (':' in arg and '.py' in arg): | |
149 | has_tests = True |
|
149 | has_tests = True | |
150 | break |
|
150 | break | |
151 |
|
151 | |||
152 | # If nothing was specifically requested, test full IPython |
|
152 | # If nothing was specifically requested, test full IPython | |
153 | if not has_tests: |
|
153 | if not has_tests: | |
154 | argv.append('IPython') |
|
154 | argv.append('IPython') | |
155 |
|
155 | |||
156 | # Construct list of plugins, omitting the existing doctest plugin, which |
|
156 | # Construct list of plugins, omitting the existing doctest plugin, which | |
157 | # ours replaces (and extends). |
|
157 | # ours replaces (and extends). | |
158 | plugins = [IPythonDoctest(EXCLUDE)] |
|
158 | plugins = [IPythonDoctest(EXCLUDE)] | |
159 | for p in nose.plugins.builtin.plugins: |
|
159 | for p in nose.plugins.builtin.plugins: | |
160 | plug = p() |
|
160 | plug = p() | |
161 | if plug.name == 'doctest': |
|
161 | if plug.name == 'doctest': | |
162 | continue |
|
162 | continue | |
163 |
|
163 | |||
164 | #print '*** adding plugin:',plug.name # dbg |
|
164 | #print '*** adding plugin:',plug.name # dbg | |
165 | plugins.append(plug) |
|
165 | plugins.append(plug) | |
166 |
|
166 | |||
167 | TestProgram(argv=argv,plugins=plugins) |
|
167 | TestProgram(argv=argv,plugins=plugins) | |
168 |
|
168 | |||
169 |
|
169 | |||
170 | class IPTester(object): |
|
170 | class IPTester(object): | |
171 | """Call that calls iptest or trial in a subprocess. |
|
171 | """Call that calls iptest or trial in a subprocess. | |
172 | """ |
|
172 | """ | |
173 | def __init__(self,runner='iptest',params=None): |
|
173 | def __init__(self,runner='iptest',params=None): | |
174 | """ """ |
|
174 | """ """ | |
175 | if runner == 'iptest': |
|
175 | if runner == 'iptest': | |
176 | self.runner = ['iptest','-v'] |
|
176 | self.runner = ['iptest','-v'] | |
177 | else: |
|
177 | else: | |
178 | self.runner = [find_cmd('trial')] |
|
178 | self.runner = [find_cmd('trial')] | |
179 | if params is None: |
|
179 | if params is None: | |
180 | params = [] |
|
180 | params = [] | |
181 | if isinstance(params,str): |
|
181 | if isinstance(params,str): | |
182 | params = [params] |
|
182 | params = [params] | |
183 | self.params = params |
|
183 | self.params = params | |
184 |
|
184 | |||
185 | # Assemble call |
|
185 | # Assemble call | |
186 | self.call_args = self.runner+self.params |
|
186 | self.call_args = self.runner+self.params | |
187 |
|
187 | |||
188 | def run(self): |
|
188 | def run(self): | |
189 | """Run the stored commands""" |
|
189 | """Run the stored commands""" | |
190 | return subprocess.call(self.call_args) |
|
190 | return subprocess.call(self.call_args) | |
191 |
|
191 | |||
192 |
|
192 | |||
193 | def make_runners(): |
|
193 | def make_runners(): | |
194 | """Define the modules and packages that need to be tested. |
|
194 | """Define the modules and packages that need to be tested. | |
195 | """ |
|
195 | """ | |
196 |
|
196 | |||
197 | # This omits additional top-level modules that should not be doctested. |
|
197 | # This omits additional top-level modules that should not be doctested. | |
198 | # XXX: Shell.py is also ommited because of a bug in the skip_doctest |
|
198 | # XXX: Shell.py is also ommited because of a bug in the skip_doctest | |
199 | # decorator. See ticket https://bugs.launchpad.net/bugs/366209 |
|
199 | # decorator. See ticket https://bugs.launchpad.net/bugs/366209 | |
200 | top_mod = \ |
|
200 | top_mod = \ | |
201 | ['backgroundjobs.py', 'coloransi.py', 'completer.py', 'configloader.py', |
|
201 | ['backgroundjobs.py', 'coloransi.py', 'completer.py', 'configloader.py', | |
202 |
'crashhandler.py', ' |
|
202 | 'crashhandler.py', 'debugger.py', 'deep_reload.py', 'demo.py', | |
203 | 'DPyGetOpt.py', 'dtutils.py', 'excolors.py', 'FakeModule.py', |
|
203 | 'DPyGetOpt.py', 'dtutils.py', 'excolors.py', 'FakeModule.py', | |
204 | 'generics.py', 'genutils.py', 'history.py', 'hooks.py', 'ipapi.py', |
|
204 | 'generics.py', 'genutils.py', 'history.py', 'hooks.py', 'ipapi.py', | |
205 | 'iplib.py', 'ipmaker.py', 'ipstruct.py', 'Itpl.py', |
|
205 | 'iplib.py', 'ipmaker.py', 'ipstruct.py', 'Itpl.py', | |
206 | 'Logger.py', 'macro.py', 'Magic.py', 'OInspect.py', |
|
206 | 'Logger.py', 'macro.py', 'Magic.py', 'OInspect.py', | |
207 | 'OutputTrap.py', 'platutils.py', 'prefilter.py', 'Prompts.py', |
|
207 | 'OutputTrap.py', 'platutils.py', 'prefilter.py', 'Prompts.py', | |
208 | 'PyColorize.py', 'Release.py', 'rlineimpl.py', 'shadowns.py', |
|
208 | 'PyColorize.py', 'Release.py', 'rlineimpl.py', 'shadowns.py', | |
209 | 'shellglobals.py', 'strdispatch.py', 'twshell.py', |
|
209 | 'shellglobals.py', 'strdispatch.py', 'twshell.py', | |
210 | 'ultraTB.py', 'upgrade_dir.py', 'usage.py', 'wildcard.py', |
|
210 | 'ultraTB.py', 'upgrade_dir.py', 'usage.py', 'wildcard.py', | |
211 | # See note above for why this is skipped |
|
211 | # See note above for why this is skipped | |
212 | # 'Shell.py', |
|
212 | # 'Shell.py', | |
213 | 'winconsole.py'] |
|
213 | 'winconsole.py'] | |
214 |
|
214 | |||
215 | if have_pexpect: |
|
215 | if have_pexpect: | |
216 | top_mod.append('irunner.py') |
|
216 | top_mod.append('irunner.py') | |
217 |
|
217 | |||
218 | if sys.platform == 'win32': |
|
218 | if sys.platform == 'win32': | |
219 | top_mod.append('platutils_win32.py') |
|
219 | top_mod.append('platutils_win32.py') | |
220 | elif os.name == 'posix': |
|
220 | elif os.name == 'posix': | |
221 | top_mod.append('platutils_posix.py') |
|
221 | top_mod.append('platutils_posix.py') | |
222 | else: |
|
222 | else: | |
223 | top_mod.append('platutils_dummy.py') |
|
223 | top_mod.append('platutils_dummy.py') | |
224 |
|
224 | |||
225 | # These are tested by nose, so skip IPython.kernel |
|
225 | # These are tested by nose, so skip IPython.kernel | |
226 | top_pack = ['config','Extensions','frontend', |
|
226 | top_pack = ['config','Extensions','frontend', | |
227 | 'testing','tests','tools','UserConfig'] |
|
227 | 'testing','tests','tools','UserConfig'] | |
228 |
|
228 | |||
229 | if have_wx: |
|
229 | if have_wx: | |
230 | top_pack.append('gui') |
|
230 | top_pack.append('gui') | |
231 |
|
231 | |||
232 | modules = ['IPython.%s' % m[:-3] for m in top_mod ] |
|
232 | modules = ['IPython.%s' % m[:-3] for m in top_mod ] | |
233 | packages = ['IPython.%s' % m for m in top_pack ] |
|
233 | packages = ['IPython.%s' % m for m in top_pack ] | |
234 |
|
234 | |||
235 | # Make runners |
|
235 | # Make runners | |
236 | runners = dict(zip(top_pack, [IPTester(params=v) for v in packages])) |
|
236 | runners = dict(zip(top_pack, [IPTester(params=v) for v in packages])) | |
237 |
|
237 | |||
238 | # Test IPython.kernel using trial if twisted is installed |
|
238 | # Test IPython.kernel using trial if twisted is installed | |
239 | if have_zi and have_twisted and have_foolscap: |
|
239 | if have_zi and have_twisted and have_foolscap: | |
240 | runners['trial'] = IPTester('trial',['IPython']) |
|
240 | runners['trial'] = IPTester('trial',['IPython']) | |
241 |
|
241 | |||
242 | runners['modules'] = IPTester(params=modules) |
|
242 | runners['modules'] = IPTester(params=modules) | |
243 |
|
243 | |||
244 | return runners |
|
244 | return runners | |
245 |
|
245 | |||
246 |
|
246 | |||
247 | def run_iptestall(): |
|
247 | def run_iptestall(): | |
248 | """Run the entire IPython test suite by calling nose and trial. |
|
248 | """Run the entire IPython test suite by calling nose and trial. | |
249 |
|
249 | |||
250 | This function constructs :class:`IPTester` instances for all IPython |
|
250 | This function constructs :class:`IPTester` instances for all IPython | |
251 | modules and package and then runs each of them. This causes the modules |
|
251 | modules and package and then runs each of them. This causes the modules | |
252 | and packages of IPython to be tested each in their own subprocess using |
|
252 | and packages of IPython to be tested each in their own subprocess using | |
253 | nose or twisted.trial appropriately. |
|
253 | nose or twisted.trial appropriately. | |
254 | """ |
|
254 | """ | |
255 | runners = make_runners() |
|
255 | runners = make_runners() | |
256 | # Run all test runners, tracking execution time |
|
256 | # Run all test runners, tracking execution time | |
257 | failed = {} |
|
257 | failed = {} | |
258 | t_start = time.time() |
|
258 | t_start = time.time() | |
259 | for name,runner in runners.iteritems(): |
|
259 | for name,runner in runners.iteritems(): | |
260 | print '*'*77 |
|
260 | print '*'*77 | |
261 | print 'IPython test set:',name |
|
261 | print 'IPython test set:',name | |
262 | res = runner.run() |
|
262 | res = runner.run() | |
263 | if res: |
|
263 | if res: | |
264 | failed[name] = res |
|
264 | failed[name] = res | |
265 | t_end = time.time() |
|
265 | t_end = time.time() | |
266 | t_tests = t_end - t_start |
|
266 | t_tests = t_end - t_start | |
267 | nrunners = len(runners) |
|
267 | nrunners = len(runners) | |
268 | nfail = len(failed) |
|
268 | nfail = len(failed) | |
269 | # summarize results |
|
269 | # summarize results | |
270 |
|
270 | |||
271 | print '*'*77 |
|
271 | print '*'*77 | |
272 | print 'Ran %s test sets in %.3fs' % (nrunners, t_tests) |
|
272 | print 'Ran %s test sets in %.3fs' % (nrunners, t_tests) | |
273 |
|
273 | |||
274 | if not failed: |
|
274 | if not failed: | |
275 | print 'OK' |
|
275 | print 'OK' | |
276 | else: |
|
276 | else: | |
277 | # If anything went wrong, point out what command to rerun manually to |
|
277 | # If anything went wrong, point out what command to rerun manually to | |
278 | # see the actual errors and individual summary |
|
278 | # see the actual errors and individual summary | |
279 | print 'ERROR - %s out of %s test sets failed.' % (nfail, nrunners) |
|
279 | print 'ERROR - %s out of %s test sets failed.' % (nfail, nrunners) | |
280 | for name in failed: |
|
280 | for name in failed: | |
281 | failed_runner = runners[name] |
|
281 | failed_runner = runners[name] | |
282 | print '-'*40 |
|
282 | print '-'*40 | |
283 | print 'Runner failed:',name |
|
283 | print 'Runner failed:',name | |
284 | print 'You may wish to rerun this one individually, with:' |
|
284 | print 'You may wish to rerun this one individually, with:' | |
285 | print ' '.join(failed_runner.call_args) |
|
285 | print ' '.join(failed_runner.call_args) | |
286 |
|
286 | |||
287 |
|
287 | |||
288 |
|
288 | |||
289 | def main(): |
|
289 | def main(): | |
290 | if len(sys.argv) == 1: |
|
290 | if len(sys.argv) == 1: | |
291 | run_iptestall() |
|
291 | run_iptestall() | |
292 | else: |
|
292 | else: | |
293 | if sys.argv[1] == 'all': |
|
293 | if sys.argv[1] == 'all': | |
294 | run_iptestall() |
|
294 | run_iptestall() | |
295 | else: |
|
295 | else: | |
296 | run_iptest() |
|
296 | run_iptest() | |
297 |
|
297 | |||
298 |
|
298 | |||
299 | if __name__ == '__main__': |
|
299 | if __name__ == '__main__': | |
300 | main() No newline at end of file |
|
300 | main() |
@@ -1,1056 +1,1057 | |||||
1 | # -*- coding: utf-8 -*- |
|
1 | # -*- coding: utf-8 -*- | |
2 | """ |
|
2 | """ | |
3 | ultraTB.py -- Spice up your tracebacks! |
|
3 | ultraTB.py -- Spice up your tracebacks! | |
4 |
|
4 | |||
5 | * ColorTB |
|
5 | * ColorTB | |
6 | I've always found it a bit hard to visually parse tracebacks in Python. The |
|
6 | I've always found it a bit hard to visually parse tracebacks in Python. The | |
7 | ColorTB class is a solution to that problem. It colors the different parts of a |
|
7 | ColorTB class is a solution to that problem. It colors the different parts of a | |
8 | traceback in a manner similar to what you would expect from a syntax-highlighting |
|
8 | traceback in a manner similar to what you would expect from a syntax-highlighting | |
9 | text editor. |
|
9 | text editor. | |
10 |
|
10 | |||
11 | Installation instructions for ColorTB: |
|
11 | Installation instructions for ColorTB: | |
12 | import sys,ultraTB |
|
12 | import sys,ultraTB | |
13 | sys.excepthook = ultraTB.ColorTB() |
|
13 | sys.excepthook = ultraTB.ColorTB() | |
14 |
|
14 | |||
15 | * VerboseTB |
|
15 | * VerboseTB | |
16 | I've also included a port of Ka-Ping Yee's "cgitb.py" that produces all kinds |
|
16 | I've also included a port of Ka-Ping Yee's "cgitb.py" that produces all kinds | |
17 | of useful info when a traceback occurs. Ping originally had it spit out HTML |
|
17 | of useful info when a traceback occurs. Ping originally had it spit out HTML | |
18 | and intended it for CGI programmers, but why should they have all the fun? I |
|
18 | and intended it for CGI programmers, but why should they have all the fun? I | |
19 | altered it to spit out colored text to the terminal. It's a bit overwhelming, |
|
19 | altered it to spit out colored text to the terminal. It's a bit overwhelming, | |
20 | but kind of neat, and maybe useful for long-running programs that you believe |
|
20 | but kind of neat, and maybe useful for long-running programs that you believe | |
21 | are bug-free. If a crash *does* occur in that type of program you want details. |
|
21 | are bug-free. If a crash *does* occur in that type of program you want details. | |
22 | Give it a shot--you'll love it or you'll hate it. |
|
22 | Give it a shot--you'll love it or you'll hate it. | |
23 |
|
23 | |||
24 | Note: |
|
24 | Note: | |
25 |
|
25 | |||
26 | The Verbose mode prints the variables currently visible where the exception |
|
26 | The Verbose mode prints the variables currently visible where the exception | |
27 | happened (shortening their strings if too long). This can potentially be |
|
27 | happened (shortening their strings if too long). This can potentially be | |
28 | very slow, if you happen to have a huge data structure whose string |
|
28 | very slow, if you happen to have a huge data structure whose string | |
29 | representation is complex to compute. Your computer may appear to freeze for |
|
29 | representation is complex to compute. Your computer may appear to freeze for | |
30 | a while with cpu usage at 100%. If this occurs, you can cancel the traceback |
|
30 | a while with cpu usage at 100%. If this occurs, you can cancel the traceback | |
31 | with Ctrl-C (maybe hitting it more than once). |
|
31 | with Ctrl-C (maybe hitting it more than once). | |
32 |
|
32 | |||
33 | If you encounter this kind of situation often, you may want to use the |
|
33 | If you encounter this kind of situation often, you may want to use the | |
34 | Verbose_novars mode instead of the regular Verbose, which avoids formatting |
|
34 | Verbose_novars mode instead of the regular Verbose, which avoids formatting | |
35 | variables (but otherwise includes the information and context given by |
|
35 | variables (but otherwise includes the information and context given by | |
36 | Verbose). |
|
36 | Verbose). | |
37 |
|
37 | |||
38 |
|
38 | |||
39 | Installation instructions for ColorTB: |
|
39 | Installation instructions for ColorTB: | |
40 | import sys,ultraTB |
|
40 | import sys,ultraTB | |
41 | sys.excepthook = ultraTB.VerboseTB() |
|
41 | sys.excepthook = ultraTB.VerboseTB() | |
42 |
|
42 | |||
43 | Note: Much of the code in this module was lifted verbatim from the standard |
|
43 | Note: Much of the code in this module was lifted verbatim from the standard | |
44 | library module 'traceback.py' and Ka-Ping Yee's 'cgitb.py'. |
|
44 | library module 'traceback.py' and Ka-Ping Yee's 'cgitb.py'. | |
45 |
|
45 | |||
46 | * Color schemes |
|
46 | * Color schemes | |
47 | The colors are defined in the class TBTools through the use of the |
|
47 | The colors are defined in the class TBTools through the use of the | |
48 | ColorSchemeTable class. Currently the following exist: |
|
48 | ColorSchemeTable class. Currently the following exist: | |
49 |
|
49 | |||
50 | - NoColor: allows all of this module to be used in any terminal (the color |
|
50 | - NoColor: allows all of this module to be used in any terminal (the color | |
51 | escapes are just dummy blank strings). |
|
51 | escapes are just dummy blank strings). | |
52 |
|
52 | |||
53 | - Linux: is meant to look good in a terminal like the Linux console (black |
|
53 | - Linux: is meant to look good in a terminal like the Linux console (black | |
54 | or very dark background). |
|
54 | or very dark background). | |
55 |
|
55 | |||
56 | - LightBG: similar to Linux but swaps dark/light colors to be more readable |
|
56 | - LightBG: similar to Linux but swaps dark/light colors to be more readable | |
57 | in light background terminals. |
|
57 | in light background terminals. | |
58 |
|
58 | |||
59 | You can implement other color schemes easily, the syntax is fairly |
|
59 | You can implement other color schemes easily, the syntax is fairly | |
60 | self-explanatory. Please send back new schemes you develop to the author for |
|
60 | self-explanatory. Please send back new schemes you develop to the author for | |
61 | possible inclusion in future releases. |
|
61 | possible inclusion in future releases. | |
62 | """ |
|
62 | """ | |
63 |
|
63 | |||
64 | #***************************************************************************** |
|
64 | #***************************************************************************** | |
65 | # Copyright (C) 2001 Nathaniel Gray <n8gray@caltech.edu> |
|
65 | # Copyright (C) 2001 Nathaniel Gray <n8gray@caltech.edu> | |
66 | # Copyright (C) 2001-2004 Fernando Perez <fperez@colorado.edu> |
|
66 | # Copyright (C) 2001-2004 Fernando Perez <fperez@colorado.edu> | |
67 | # |
|
67 | # | |
68 | # Distributed under the terms of the BSD License. The full license is in |
|
68 | # Distributed under the terms of the BSD License. The full license is in | |
69 | # the file COPYING, distributed as part of this software. |
|
69 | # the file COPYING, distributed as part of this software. | |
70 | #***************************************************************************** |
|
70 | #***************************************************************************** | |
71 |
|
71 | |||
72 | # Required modules |
|
72 | # Required modules | |
73 | import inspect |
|
73 | import inspect | |
74 | import keyword |
|
74 | import keyword | |
75 | import linecache |
|
75 | import linecache | |
76 | import os |
|
76 | import os | |
77 | import pydoc |
|
77 | import pydoc | |
78 | import re |
|
78 | import re | |
79 | import string |
|
79 | import string | |
80 | import sys |
|
80 | import sys | |
81 | import time |
|
81 | import time | |
82 | import tokenize |
|
82 | import tokenize | |
83 | import traceback |
|
83 | import traceback | |
84 | import types |
|
84 | import types | |
85 |
|
85 | |||
86 | # For purposes of monkeypatching inspect to fix a bug in it. |
|
86 | # For purposes of monkeypatching inspect to fix a bug in it. | |
87 | from inspect import getsourcefile, getfile, getmodule,\ |
|
87 | from inspect import getsourcefile, getfile, getmodule,\ | |
88 | ismodule, isclass, ismethod, isfunction, istraceback, isframe, iscode |
|
88 | ismodule, isclass, ismethod, isfunction, istraceback, isframe, iscode | |
89 |
|
89 | |||
90 |
|
90 | |||
91 | # IPython's own modules |
|
91 | # IPython's own modules | |
92 | # Modified pdb which doesn't damage IPython's readline handling |
|
92 | # Modified pdb which doesn't damage IPython's readline handling | |
93 |
from IPython import |
|
93 | from IPython import PyColorize | |
|
94 | from IPython.core import debugger | |||
94 | from IPython.ipstruct import Struct |
|
95 | from IPython.ipstruct import Struct | |
95 | from IPython.excolors import exception_colors |
|
96 | from IPython.excolors import exception_colors | |
96 | from IPython.genutils import Term,uniq_stable,error,info |
|
97 | from IPython.genutils import Term,uniq_stable,error,info | |
97 |
|
98 | |||
98 | # Globals |
|
99 | # Globals | |
99 | # amount of space to put line numbers before verbose tracebacks |
|
100 | # amount of space to put line numbers before verbose tracebacks | |
100 | INDENT_SIZE = 8 |
|
101 | INDENT_SIZE = 8 | |
101 |
|
102 | |||
102 | # Default color scheme. This is used, for example, by the traceback |
|
103 | # Default color scheme. This is used, for example, by the traceback | |
103 | # formatter. When running in an actual IPython instance, the user's rc.colors |
|
104 | # formatter. When running in an actual IPython instance, the user's rc.colors | |
104 | # value is used, but havinga module global makes this functionality available |
|
105 | # value is used, but havinga module global makes this functionality available | |
105 | # to users of ultraTB who are NOT running inside ipython. |
|
106 | # to users of ultraTB who are NOT running inside ipython. | |
106 | DEFAULT_SCHEME = 'NoColor' |
|
107 | DEFAULT_SCHEME = 'NoColor' | |
107 |
|
108 | |||
108 | #--------------------------------------------------------------------------- |
|
109 | #--------------------------------------------------------------------------- | |
109 | # Code begins |
|
110 | # Code begins | |
110 |
|
111 | |||
111 | # Utility functions |
|
112 | # Utility functions | |
112 | def inspect_error(): |
|
113 | def inspect_error(): | |
113 | """Print a message about internal inspect errors. |
|
114 | """Print a message about internal inspect errors. | |
114 |
|
115 | |||
115 | These are unfortunately quite common.""" |
|
116 | These are unfortunately quite common.""" | |
116 |
|
117 | |||
117 | error('Internal Python error in the inspect module.\n' |
|
118 | error('Internal Python error in the inspect module.\n' | |
118 | 'Below is the traceback from this internal error.\n') |
|
119 | 'Below is the traceback from this internal error.\n') | |
119 |
|
120 | |||
120 |
|
121 | |||
121 | def findsource(object): |
|
122 | def findsource(object): | |
122 | """Return the entire source file and starting line number for an object. |
|
123 | """Return the entire source file and starting line number for an object. | |
123 |
|
124 | |||
124 | The argument may be a module, class, method, function, traceback, frame, |
|
125 | The argument may be a module, class, method, function, traceback, frame, | |
125 | or code object. The source code is returned as a list of all the lines |
|
126 | or code object. The source code is returned as a list of all the lines | |
126 | in the file and the line number indexes a line in that list. An IOError |
|
127 | in the file and the line number indexes a line in that list. An IOError | |
127 | is raised if the source code cannot be retrieved. |
|
128 | is raised if the source code cannot be retrieved. | |
128 |
|
129 | |||
129 | FIXED version with which we monkeypatch the stdlib to work around a bug.""" |
|
130 | FIXED version with which we monkeypatch the stdlib to work around a bug.""" | |
130 |
|
131 | |||
131 | file = getsourcefile(object) or getfile(object) |
|
132 | file = getsourcefile(object) or getfile(object) | |
132 | # If the object is a frame, then trying to get the globals dict from its |
|
133 | # If the object is a frame, then trying to get the globals dict from its | |
133 | # module won't work. Instead, the frame object itself has the globals |
|
134 | # module won't work. Instead, the frame object itself has the globals | |
134 | # dictionary. |
|
135 | # dictionary. | |
135 | globals_dict = None |
|
136 | globals_dict = None | |
136 | if inspect.isframe(object): |
|
137 | if inspect.isframe(object): | |
137 | # XXX: can this ever be false? |
|
138 | # XXX: can this ever be false? | |
138 | globals_dict = object.f_globals |
|
139 | globals_dict = object.f_globals | |
139 | else: |
|
140 | else: | |
140 | module = getmodule(object, file) |
|
141 | module = getmodule(object, file) | |
141 | if module: |
|
142 | if module: | |
142 | globals_dict = module.__dict__ |
|
143 | globals_dict = module.__dict__ | |
143 | lines = linecache.getlines(file, globals_dict) |
|
144 | lines = linecache.getlines(file, globals_dict) | |
144 | if not lines: |
|
145 | if not lines: | |
145 | raise IOError('could not get source code') |
|
146 | raise IOError('could not get source code') | |
146 |
|
147 | |||
147 | if ismodule(object): |
|
148 | if ismodule(object): | |
148 | return lines, 0 |
|
149 | return lines, 0 | |
149 |
|
150 | |||
150 | if isclass(object): |
|
151 | if isclass(object): | |
151 | name = object.__name__ |
|
152 | name = object.__name__ | |
152 | pat = re.compile(r'^(\s*)class\s*' + name + r'\b') |
|
153 | pat = re.compile(r'^(\s*)class\s*' + name + r'\b') | |
153 | # make some effort to find the best matching class definition: |
|
154 | # make some effort to find the best matching class definition: | |
154 | # use the one with the least indentation, which is the one |
|
155 | # use the one with the least indentation, which is the one | |
155 | # that's most probably not inside a function definition. |
|
156 | # that's most probably not inside a function definition. | |
156 | candidates = [] |
|
157 | candidates = [] | |
157 | for i in range(len(lines)): |
|
158 | for i in range(len(lines)): | |
158 | match = pat.match(lines[i]) |
|
159 | match = pat.match(lines[i]) | |
159 | if match: |
|
160 | if match: | |
160 | # if it's at toplevel, it's already the best one |
|
161 | # if it's at toplevel, it's already the best one | |
161 | if lines[i][0] == 'c': |
|
162 | if lines[i][0] == 'c': | |
162 | return lines, i |
|
163 | return lines, i | |
163 | # else add whitespace to candidate list |
|
164 | # else add whitespace to candidate list | |
164 | candidates.append((match.group(1), i)) |
|
165 | candidates.append((match.group(1), i)) | |
165 | if candidates: |
|
166 | if candidates: | |
166 | # this will sort by whitespace, and by line number, |
|
167 | # this will sort by whitespace, and by line number, | |
167 | # less whitespace first |
|
168 | # less whitespace first | |
168 | candidates.sort() |
|
169 | candidates.sort() | |
169 | return lines, candidates[0][1] |
|
170 | return lines, candidates[0][1] | |
170 | else: |
|
171 | else: | |
171 | raise IOError('could not find class definition') |
|
172 | raise IOError('could not find class definition') | |
172 |
|
173 | |||
173 | if ismethod(object): |
|
174 | if ismethod(object): | |
174 | object = object.im_func |
|
175 | object = object.im_func | |
175 | if isfunction(object): |
|
176 | if isfunction(object): | |
176 | object = object.func_code |
|
177 | object = object.func_code | |
177 | if istraceback(object): |
|
178 | if istraceback(object): | |
178 | object = object.tb_frame |
|
179 | object = object.tb_frame | |
179 | if isframe(object): |
|
180 | if isframe(object): | |
180 | object = object.f_code |
|
181 | object = object.f_code | |
181 | if iscode(object): |
|
182 | if iscode(object): | |
182 | if not hasattr(object, 'co_firstlineno'): |
|
183 | if not hasattr(object, 'co_firstlineno'): | |
183 | raise IOError('could not find function definition') |
|
184 | raise IOError('could not find function definition') | |
184 | pat = re.compile(r'^(\s*def\s)|(.*(?<!\w)lambda(:|\s))|^(\s*@)') |
|
185 | pat = re.compile(r'^(\s*def\s)|(.*(?<!\w)lambda(:|\s))|^(\s*@)') | |
185 | pmatch = pat.match |
|
186 | pmatch = pat.match | |
186 | # fperez - fix: sometimes, co_firstlineno can give a number larger than |
|
187 | # fperez - fix: sometimes, co_firstlineno can give a number larger than | |
187 | # the length of lines, which causes an error. Safeguard against that. |
|
188 | # the length of lines, which causes an error. Safeguard against that. | |
188 | lnum = min(object.co_firstlineno,len(lines))-1 |
|
189 | lnum = min(object.co_firstlineno,len(lines))-1 | |
189 | while lnum > 0: |
|
190 | while lnum > 0: | |
190 | if pmatch(lines[lnum]): break |
|
191 | if pmatch(lines[lnum]): break | |
191 | lnum -= 1 |
|
192 | lnum -= 1 | |
192 |
|
193 | |||
193 | return lines, lnum |
|
194 | return lines, lnum | |
194 | raise IOError('could not find code object') |
|
195 | raise IOError('could not find code object') | |
195 |
|
196 | |||
196 | # Monkeypatch inspect to apply our bugfix. This code only works with py25 |
|
197 | # Monkeypatch inspect to apply our bugfix. This code only works with py25 | |
197 | if sys.version_info[:2] >= (2,5): |
|
198 | if sys.version_info[:2] >= (2,5): | |
198 | inspect.findsource = findsource |
|
199 | inspect.findsource = findsource | |
199 |
|
200 | |||
200 | def fix_frame_records_filenames(records): |
|
201 | def fix_frame_records_filenames(records): | |
201 | """Try to fix the filenames in each record from inspect.getinnerframes(). |
|
202 | """Try to fix the filenames in each record from inspect.getinnerframes(). | |
202 |
|
203 | |||
203 | Particularly, modules loaded from within zip files have useless filenames |
|
204 | Particularly, modules loaded from within zip files have useless filenames | |
204 | attached to their code object, and inspect.getinnerframes() just uses it. |
|
205 | attached to their code object, and inspect.getinnerframes() just uses it. | |
205 | """ |
|
206 | """ | |
206 | fixed_records = [] |
|
207 | fixed_records = [] | |
207 | for frame, filename, line_no, func_name, lines, index in records: |
|
208 | for frame, filename, line_no, func_name, lines, index in records: | |
208 | # Look inside the frame's globals dictionary for __file__, which should |
|
209 | # Look inside the frame's globals dictionary for __file__, which should | |
209 | # be better. |
|
210 | # be better. | |
210 | better_fn = frame.f_globals.get('__file__', None) |
|
211 | better_fn = frame.f_globals.get('__file__', None) | |
211 | if isinstance(better_fn, str): |
|
212 | if isinstance(better_fn, str): | |
212 | # Check the type just in case someone did something weird with |
|
213 | # Check the type just in case someone did something weird with | |
213 | # __file__. It might also be None if the error occurred during |
|
214 | # __file__. It might also be None if the error occurred during | |
214 | # import. |
|
215 | # import. | |
215 | filename = better_fn |
|
216 | filename = better_fn | |
216 | fixed_records.append((frame, filename, line_no, func_name, lines, index)) |
|
217 | fixed_records.append((frame, filename, line_no, func_name, lines, index)) | |
217 | return fixed_records |
|
218 | return fixed_records | |
218 |
|
219 | |||
219 |
|
220 | |||
220 | def _fixed_getinnerframes(etb, context=1,tb_offset=0): |
|
221 | def _fixed_getinnerframes(etb, context=1,tb_offset=0): | |
221 | import linecache |
|
222 | import linecache | |
222 | LNUM_POS, LINES_POS, INDEX_POS = 2, 4, 5 |
|
223 | LNUM_POS, LINES_POS, INDEX_POS = 2, 4, 5 | |
223 |
|
224 | |||
224 | records = fix_frame_records_filenames(inspect.getinnerframes(etb, context)) |
|
225 | records = fix_frame_records_filenames(inspect.getinnerframes(etb, context)) | |
225 |
|
226 | |||
226 | # If the error is at the console, don't build any context, since it would |
|
227 | # If the error is at the console, don't build any context, since it would | |
227 | # otherwise produce 5 blank lines printed out (there is no file at the |
|
228 | # otherwise produce 5 blank lines printed out (there is no file at the | |
228 | # console) |
|
229 | # console) | |
229 | rec_check = records[tb_offset:] |
|
230 | rec_check = records[tb_offset:] | |
230 | try: |
|
231 | try: | |
231 | rname = rec_check[0][1] |
|
232 | rname = rec_check[0][1] | |
232 | if rname == '<ipython console>' or rname.endswith('<string>'): |
|
233 | if rname == '<ipython console>' or rname.endswith('<string>'): | |
233 | return rec_check |
|
234 | return rec_check | |
234 | except IndexError: |
|
235 | except IndexError: | |
235 | pass |
|
236 | pass | |
236 |
|
237 | |||
237 | aux = traceback.extract_tb(etb) |
|
238 | aux = traceback.extract_tb(etb) | |
238 | assert len(records) == len(aux) |
|
239 | assert len(records) == len(aux) | |
239 | for i, (file, lnum, _, _) in zip(range(len(records)), aux): |
|
240 | for i, (file, lnum, _, _) in zip(range(len(records)), aux): | |
240 | maybeStart = lnum-1 - context//2 |
|
241 | maybeStart = lnum-1 - context//2 | |
241 | start = max(maybeStart, 0) |
|
242 | start = max(maybeStart, 0) | |
242 | end = start + context |
|
243 | end = start + context | |
243 | lines = linecache.getlines(file)[start:end] |
|
244 | lines = linecache.getlines(file)[start:end] | |
244 | # pad with empty lines if necessary |
|
245 | # pad with empty lines if necessary | |
245 | if maybeStart < 0: |
|
246 | if maybeStart < 0: | |
246 | lines = (['\n'] * -maybeStart) + lines |
|
247 | lines = (['\n'] * -maybeStart) + lines | |
247 | if len(lines) < context: |
|
248 | if len(lines) < context: | |
248 | lines += ['\n'] * (context - len(lines)) |
|
249 | lines += ['\n'] * (context - len(lines)) | |
249 | buf = list(records[i]) |
|
250 | buf = list(records[i]) | |
250 | buf[LNUM_POS] = lnum |
|
251 | buf[LNUM_POS] = lnum | |
251 | buf[INDEX_POS] = lnum - 1 - start |
|
252 | buf[INDEX_POS] = lnum - 1 - start | |
252 | buf[LINES_POS] = lines |
|
253 | buf[LINES_POS] = lines | |
253 | records[i] = tuple(buf) |
|
254 | records[i] = tuple(buf) | |
254 | return records[tb_offset:] |
|
255 | return records[tb_offset:] | |
255 |
|
256 | |||
256 | # Helper function -- largely belongs to VerboseTB, but we need the same |
|
257 | # Helper function -- largely belongs to VerboseTB, but we need the same | |
257 | # functionality to produce a pseudo verbose TB for SyntaxErrors, so that they |
|
258 | # functionality to produce a pseudo verbose TB for SyntaxErrors, so that they | |
258 | # can be recognized properly by ipython.el's py-traceback-line-re |
|
259 | # can be recognized properly by ipython.el's py-traceback-line-re | |
259 | # (SyntaxErrors have to be treated specially because they have no traceback) |
|
260 | # (SyntaxErrors have to be treated specially because they have no traceback) | |
260 |
|
261 | |||
261 | _parser = PyColorize.Parser() |
|
262 | _parser = PyColorize.Parser() | |
262 |
|
263 | |||
263 | def _formatTracebackLines(lnum, index, lines, Colors, lvals=None,scheme=None): |
|
264 | def _formatTracebackLines(lnum, index, lines, Colors, lvals=None,scheme=None): | |
264 | numbers_width = INDENT_SIZE - 1 |
|
265 | numbers_width = INDENT_SIZE - 1 | |
265 | res = [] |
|
266 | res = [] | |
266 | i = lnum - index |
|
267 | i = lnum - index | |
267 |
|
268 | |||
268 | # This lets us get fully syntax-highlighted tracebacks. |
|
269 | # This lets us get fully syntax-highlighted tracebacks. | |
269 | if scheme is None: |
|
270 | if scheme is None: | |
270 | try: |
|
271 | try: | |
271 | scheme = __IPYTHON__.rc.colors |
|
272 | scheme = __IPYTHON__.rc.colors | |
272 | except: |
|
273 | except: | |
273 | scheme = DEFAULT_SCHEME |
|
274 | scheme = DEFAULT_SCHEME | |
274 | _line_format = _parser.format2 |
|
275 | _line_format = _parser.format2 | |
275 |
|
276 | |||
276 | for line in lines: |
|
277 | for line in lines: | |
277 | new_line, err = _line_format(line,'str',scheme) |
|
278 | new_line, err = _line_format(line,'str',scheme) | |
278 | if not err: line = new_line |
|
279 | if not err: line = new_line | |
279 |
|
280 | |||
280 | if i == lnum: |
|
281 | if i == lnum: | |
281 | # This is the line with the error |
|
282 | # This is the line with the error | |
282 | pad = numbers_width - len(str(i)) |
|
283 | pad = numbers_width - len(str(i)) | |
283 | if pad >= 3: |
|
284 | if pad >= 3: | |
284 | marker = '-'*(pad-3) + '-> ' |
|
285 | marker = '-'*(pad-3) + '-> ' | |
285 | elif pad == 2: |
|
286 | elif pad == 2: | |
286 | marker = '> ' |
|
287 | marker = '> ' | |
287 | elif pad == 1: |
|
288 | elif pad == 1: | |
288 | marker = '>' |
|
289 | marker = '>' | |
289 | else: |
|
290 | else: | |
290 | marker = '' |
|
291 | marker = '' | |
291 | num = marker + str(i) |
|
292 | num = marker + str(i) | |
292 | line = '%s%s%s %s%s' %(Colors.linenoEm, num, |
|
293 | line = '%s%s%s %s%s' %(Colors.linenoEm, num, | |
293 | Colors.line, line, Colors.Normal) |
|
294 | Colors.line, line, Colors.Normal) | |
294 | else: |
|
295 | else: | |
295 | num = '%*s' % (numbers_width,i) |
|
296 | num = '%*s' % (numbers_width,i) | |
296 | line = '%s%s%s %s' %(Colors.lineno, num, |
|
297 | line = '%s%s%s %s' %(Colors.lineno, num, | |
297 | Colors.Normal, line) |
|
298 | Colors.Normal, line) | |
298 |
|
299 | |||
299 | res.append(line) |
|
300 | res.append(line) | |
300 | if lvals and i == lnum: |
|
301 | if lvals and i == lnum: | |
301 | res.append(lvals + '\n') |
|
302 | res.append(lvals + '\n') | |
302 | i = i + 1 |
|
303 | i = i + 1 | |
303 | return res |
|
304 | return res | |
304 |
|
305 | |||
305 |
|
306 | |||
306 | #--------------------------------------------------------------------------- |
|
307 | #--------------------------------------------------------------------------- | |
307 | # Module classes |
|
308 | # Module classes | |
308 | class TBTools: |
|
309 | class TBTools: | |
309 | """Basic tools used by all traceback printer classes.""" |
|
310 | """Basic tools used by all traceback printer classes.""" | |
310 |
|
311 | |||
311 | def __init__(self,color_scheme = 'NoColor',call_pdb=False): |
|
312 | def __init__(self,color_scheme = 'NoColor',call_pdb=False): | |
312 | # Whether to call the interactive pdb debugger after printing |
|
313 | # Whether to call the interactive pdb debugger after printing | |
313 | # tracebacks or not |
|
314 | # tracebacks or not | |
314 | self.call_pdb = call_pdb |
|
315 | self.call_pdb = call_pdb | |
315 |
|
316 | |||
316 | # Create color table |
|
317 | # Create color table | |
317 | self.color_scheme_table = exception_colors() |
|
318 | self.color_scheme_table = exception_colors() | |
318 |
|
319 | |||
319 | self.set_colors(color_scheme) |
|
320 | self.set_colors(color_scheme) | |
320 | self.old_scheme = color_scheme # save initial value for toggles |
|
321 | self.old_scheme = color_scheme # save initial value for toggles | |
321 |
|
322 | |||
322 | if call_pdb: |
|
323 | if call_pdb: | |
323 |
self.pdb = |
|
324 | self.pdb = debugger.Pdb(self.color_scheme_table.active_scheme_name) | |
324 | else: |
|
325 | else: | |
325 | self.pdb = None |
|
326 | self.pdb = None | |
326 |
|
327 | |||
327 | def set_colors(self,*args,**kw): |
|
328 | def set_colors(self,*args,**kw): | |
328 | """Shorthand access to the color table scheme selector method.""" |
|
329 | """Shorthand access to the color table scheme selector method.""" | |
329 |
|
330 | |||
330 | # Set own color table |
|
331 | # Set own color table | |
331 | self.color_scheme_table.set_active_scheme(*args,**kw) |
|
332 | self.color_scheme_table.set_active_scheme(*args,**kw) | |
332 | # for convenience, set Colors to the active scheme |
|
333 | # for convenience, set Colors to the active scheme | |
333 | self.Colors = self.color_scheme_table.active_colors |
|
334 | self.Colors = self.color_scheme_table.active_colors | |
334 | # Also set colors of debugger |
|
335 | # Also set colors of debugger | |
335 | if hasattr(self,'pdb') and self.pdb is not None: |
|
336 | if hasattr(self,'pdb') and self.pdb is not None: | |
336 | self.pdb.set_colors(*args,**kw) |
|
337 | self.pdb.set_colors(*args,**kw) | |
337 |
|
338 | |||
338 | def color_toggle(self): |
|
339 | def color_toggle(self): | |
339 | """Toggle between the currently active color scheme and NoColor.""" |
|
340 | """Toggle between the currently active color scheme and NoColor.""" | |
340 |
|
341 | |||
341 | if self.color_scheme_table.active_scheme_name == 'NoColor': |
|
342 | if self.color_scheme_table.active_scheme_name == 'NoColor': | |
342 | self.color_scheme_table.set_active_scheme(self.old_scheme) |
|
343 | self.color_scheme_table.set_active_scheme(self.old_scheme) | |
343 | self.Colors = self.color_scheme_table.active_colors |
|
344 | self.Colors = self.color_scheme_table.active_colors | |
344 | else: |
|
345 | else: | |
345 | self.old_scheme = self.color_scheme_table.active_scheme_name |
|
346 | self.old_scheme = self.color_scheme_table.active_scheme_name | |
346 | self.color_scheme_table.set_active_scheme('NoColor') |
|
347 | self.color_scheme_table.set_active_scheme('NoColor') | |
347 | self.Colors = self.color_scheme_table.active_colors |
|
348 | self.Colors = self.color_scheme_table.active_colors | |
348 |
|
349 | |||
349 | #--------------------------------------------------------------------------- |
|
350 | #--------------------------------------------------------------------------- | |
350 | class ListTB(TBTools): |
|
351 | class ListTB(TBTools): | |
351 | """Print traceback information from a traceback list, with optional color. |
|
352 | """Print traceback information from a traceback list, with optional color. | |
352 |
|
353 | |||
353 | Calling: requires 3 arguments: |
|
354 | Calling: requires 3 arguments: | |
354 | (etype, evalue, elist) |
|
355 | (etype, evalue, elist) | |
355 | as would be obtained by: |
|
356 | as would be obtained by: | |
356 | etype, evalue, tb = sys.exc_info() |
|
357 | etype, evalue, tb = sys.exc_info() | |
357 | if tb: |
|
358 | if tb: | |
358 | elist = traceback.extract_tb(tb) |
|
359 | elist = traceback.extract_tb(tb) | |
359 | else: |
|
360 | else: | |
360 | elist = None |
|
361 | elist = None | |
361 |
|
362 | |||
362 | It can thus be used by programs which need to process the traceback before |
|
363 | It can thus be used by programs which need to process the traceback before | |
363 | printing (such as console replacements based on the code module from the |
|
364 | printing (such as console replacements based on the code module from the | |
364 | standard library). |
|
365 | standard library). | |
365 |
|
366 | |||
366 | Because they are meant to be called without a full traceback (only a |
|
367 | Because they are meant to be called without a full traceback (only a | |
367 | list), instances of this class can't call the interactive pdb debugger.""" |
|
368 | list), instances of this class can't call the interactive pdb debugger.""" | |
368 |
|
369 | |||
369 | def __init__(self,color_scheme = 'NoColor'): |
|
370 | def __init__(self,color_scheme = 'NoColor'): | |
370 | TBTools.__init__(self,color_scheme = color_scheme,call_pdb=0) |
|
371 | TBTools.__init__(self,color_scheme = color_scheme,call_pdb=0) | |
371 |
|
372 | |||
372 | def __call__(self, etype, value, elist): |
|
373 | def __call__(self, etype, value, elist): | |
373 | Term.cout.flush() |
|
374 | Term.cout.flush() | |
374 | print >> Term.cerr, self.text(etype,value,elist) |
|
375 | print >> Term.cerr, self.text(etype,value,elist) | |
375 | Term.cerr.flush() |
|
376 | Term.cerr.flush() | |
376 |
|
377 | |||
377 | def text(self,etype, value, elist,context=5): |
|
378 | def text(self,etype, value, elist,context=5): | |
378 | """Return a color formatted string with the traceback info.""" |
|
379 | """Return a color formatted string with the traceback info.""" | |
379 |
|
380 | |||
380 | Colors = self.Colors |
|
381 | Colors = self.Colors | |
381 | out_string = ['%s%s%s\n' % (Colors.topline,'-'*60,Colors.Normal)] |
|
382 | out_string = ['%s%s%s\n' % (Colors.topline,'-'*60,Colors.Normal)] | |
382 | if elist: |
|
383 | if elist: | |
383 | out_string.append('Traceback %s(most recent call last)%s:' % \ |
|
384 | out_string.append('Traceback %s(most recent call last)%s:' % \ | |
384 | (Colors.normalEm, Colors.Normal) + '\n') |
|
385 | (Colors.normalEm, Colors.Normal) + '\n') | |
385 | out_string.extend(self._format_list(elist)) |
|
386 | out_string.extend(self._format_list(elist)) | |
386 | lines = self._format_exception_only(etype, value) |
|
387 | lines = self._format_exception_only(etype, value) | |
387 | for line in lines[:-1]: |
|
388 | for line in lines[:-1]: | |
388 | out_string.append(" "+line) |
|
389 | out_string.append(" "+line) | |
389 | out_string.append(lines[-1]) |
|
390 | out_string.append(lines[-1]) | |
390 | return ''.join(out_string) |
|
391 | return ''.join(out_string) | |
391 |
|
392 | |||
392 | def _format_list(self, extracted_list): |
|
393 | def _format_list(self, extracted_list): | |
393 | """Format a list of traceback entry tuples for printing. |
|
394 | """Format a list of traceback entry tuples for printing. | |
394 |
|
395 | |||
395 | Given a list of tuples as returned by extract_tb() or |
|
396 | Given a list of tuples as returned by extract_tb() or | |
396 | extract_stack(), return a list of strings ready for printing. |
|
397 | extract_stack(), return a list of strings ready for printing. | |
397 | Each string in the resulting list corresponds to the item with the |
|
398 | Each string in the resulting list corresponds to the item with the | |
398 | same index in the argument list. Each string ends in a newline; |
|
399 | same index in the argument list. Each string ends in a newline; | |
399 | the strings may contain internal newlines as well, for those items |
|
400 | the strings may contain internal newlines as well, for those items | |
400 | whose source text line is not None. |
|
401 | whose source text line is not None. | |
401 |
|
402 | |||
402 | Lifted almost verbatim from traceback.py |
|
403 | Lifted almost verbatim from traceback.py | |
403 | """ |
|
404 | """ | |
404 |
|
405 | |||
405 | Colors = self.Colors |
|
406 | Colors = self.Colors | |
406 | list = [] |
|
407 | list = [] | |
407 | for filename, lineno, name, line in extracted_list[:-1]: |
|
408 | for filename, lineno, name, line in extracted_list[:-1]: | |
408 | item = ' File %s"%s"%s, line %s%d%s, in %s%s%s\n' % \ |
|
409 | item = ' File %s"%s"%s, line %s%d%s, in %s%s%s\n' % \ | |
409 | (Colors.filename, filename, Colors.Normal, |
|
410 | (Colors.filename, filename, Colors.Normal, | |
410 | Colors.lineno, lineno, Colors.Normal, |
|
411 | Colors.lineno, lineno, Colors.Normal, | |
411 | Colors.name, name, Colors.Normal) |
|
412 | Colors.name, name, Colors.Normal) | |
412 | if line: |
|
413 | if line: | |
413 | item = item + ' %s\n' % line.strip() |
|
414 | item = item + ' %s\n' % line.strip() | |
414 | list.append(item) |
|
415 | list.append(item) | |
415 | # Emphasize the last entry |
|
416 | # Emphasize the last entry | |
416 | filename, lineno, name, line = extracted_list[-1] |
|
417 | filename, lineno, name, line = extracted_list[-1] | |
417 | item = '%s File %s"%s"%s, line %s%d%s, in %s%s%s%s\n' % \ |
|
418 | item = '%s File %s"%s"%s, line %s%d%s, in %s%s%s%s\n' % \ | |
418 | (Colors.normalEm, |
|
419 | (Colors.normalEm, | |
419 | Colors.filenameEm, filename, Colors.normalEm, |
|
420 | Colors.filenameEm, filename, Colors.normalEm, | |
420 | Colors.linenoEm, lineno, Colors.normalEm, |
|
421 | Colors.linenoEm, lineno, Colors.normalEm, | |
421 | Colors.nameEm, name, Colors.normalEm, |
|
422 | Colors.nameEm, name, Colors.normalEm, | |
422 | Colors.Normal) |
|
423 | Colors.Normal) | |
423 | if line: |
|
424 | if line: | |
424 | item = item + '%s %s%s\n' % (Colors.line, line.strip(), |
|
425 | item = item + '%s %s%s\n' % (Colors.line, line.strip(), | |
425 | Colors.Normal) |
|
426 | Colors.Normal) | |
426 | list.append(item) |
|
427 | list.append(item) | |
427 | return list |
|
428 | return list | |
428 |
|
429 | |||
429 | def _format_exception_only(self, etype, value): |
|
430 | def _format_exception_only(self, etype, value): | |
430 | """Format the exception part of a traceback. |
|
431 | """Format the exception part of a traceback. | |
431 |
|
432 | |||
432 | The arguments are the exception type and value such as given by |
|
433 | The arguments are the exception type and value such as given by | |
433 | sys.exc_info()[:2]. The return value is a list of strings, each ending |
|
434 | sys.exc_info()[:2]. The return value is a list of strings, each ending | |
434 | in a newline. Normally, the list contains a single string; however, |
|
435 | in a newline. Normally, the list contains a single string; however, | |
435 | for SyntaxError exceptions, it contains several lines that (when |
|
436 | for SyntaxError exceptions, it contains several lines that (when | |
436 | printed) display detailed information about where the syntax error |
|
437 | printed) display detailed information about where the syntax error | |
437 | occurred. The message indicating which exception occurred is the |
|
438 | occurred. The message indicating which exception occurred is the | |
438 | always last string in the list. |
|
439 | always last string in the list. | |
439 |
|
440 | |||
440 | Also lifted nearly verbatim from traceback.py |
|
441 | Also lifted nearly verbatim from traceback.py | |
441 | """ |
|
442 | """ | |
442 |
|
443 | |||
443 | have_filedata = False |
|
444 | have_filedata = False | |
444 | Colors = self.Colors |
|
445 | Colors = self.Colors | |
445 | list = [] |
|
446 | list = [] | |
446 | try: |
|
447 | try: | |
447 | stype = Colors.excName + etype.__name__ + Colors.Normal |
|
448 | stype = Colors.excName + etype.__name__ + Colors.Normal | |
448 | except AttributeError: |
|
449 | except AttributeError: | |
449 | stype = etype # String exceptions don't get special coloring |
|
450 | stype = etype # String exceptions don't get special coloring | |
450 | if value is None: |
|
451 | if value is None: | |
451 | list.append( str(stype) + '\n') |
|
452 | list.append( str(stype) + '\n') | |
452 | else: |
|
453 | else: | |
453 | if etype is SyntaxError: |
|
454 | if etype is SyntaxError: | |
454 | try: |
|
455 | try: | |
455 | msg, (filename, lineno, offset, line) = value |
|
456 | msg, (filename, lineno, offset, line) = value | |
456 | except: |
|
457 | except: | |
457 | have_filedata = False |
|
458 | have_filedata = False | |
458 | else: |
|
459 | else: | |
459 | have_filedata = True |
|
460 | have_filedata = True | |
460 | #print 'filename is',filename # dbg |
|
461 | #print 'filename is',filename # dbg | |
461 | if not filename: filename = "<string>" |
|
462 | if not filename: filename = "<string>" | |
462 | list.append('%s File %s"%s"%s, line %s%d%s\n' % \ |
|
463 | list.append('%s File %s"%s"%s, line %s%d%s\n' % \ | |
463 | (Colors.normalEm, |
|
464 | (Colors.normalEm, | |
464 | Colors.filenameEm, filename, Colors.normalEm, |
|
465 | Colors.filenameEm, filename, Colors.normalEm, | |
465 | Colors.linenoEm, lineno, Colors.Normal )) |
|
466 | Colors.linenoEm, lineno, Colors.Normal )) | |
466 | if line is not None: |
|
467 | if line is not None: | |
467 | i = 0 |
|
468 | i = 0 | |
468 | while i < len(line) and line[i].isspace(): |
|
469 | while i < len(line) and line[i].isspace(): | |
469 | i = i+1 |
|
470 | i = i+1 | |
470 | list.append('%s %s%s\n' % (Colors.line, |
|
471 | list.append('%s %s%s\n' % (Colors.line, | |
471 | line.strip(), |
|
472 | line.strip(), | |
472 | Colors.Normal)) |
|
473 | Colors.Normal)) | |
473 | if offset is not None: |
|
474 | if offset is not None: | |
474 | s = ' ' |
|
475 | s = ' ' | |
475 | for c in line[i:offset-1]: |
|
476 | for c in line[i:offset-1]: | |
476 | if c.isspace(): |
|
477 | if c.isspace(): | |
477 | s = s + c |
|
478 | s = s + c | |
478 | else: |
|
479 | else: | |
479 | s = s + ' ' |
|
480 | s = s + ' ' | |
480 | list.append('%s%s^%s\n' % (Colors.caret, s, |
|
481 | list.append('%s%s^%s\n' % (Colors.caret, s, | |
481 | Colors.Normal) ) |
|
482 | Colors.Normal) ) | |
482 | value = msg |
|
483 | value = msg | |
483 | s = self._some_str(value) |
|
484 | s = self._some_str(value) | |
484 | if s: |
|
485 | if s: | |
485 | list.append('%s%s:%s %s\n' % (str(stype), Colors.excName, |
|
486 | list.append('%s%s:%s %s\n' % (str(stype), Colors.excName, | |
486 | Colors.Normal, s)) |
|
487 | Colors.Normal, s)) | |
487 | else: |
|
488 | else: | |
488 | list.append('%s\n' % str(stype)) |
|
489 | list.append('%s\n' % str(stype)) | |
489 |
|
490 | |||
490 | # vds:>> |
|
491 | # vds:>> | |
491 | if have_filedata: |
|
492 | if have_filedata: | |
492 | __IPYTHON__.hooks.synchronize_with_editor(filename, lineno, 0) |
|
493 | __IPYTHON__.hooks.synchronize_with_editor(filename, lineno, 0) | |
493 | # vds:<< |
|
494 | # vds:<< | |
494 |
|
495 | |||
495 | return list |
|
496 | return list | |
496 |
|
497 | |||
497 | def _some_str(self, value): |
|
498 | def _some_str(self, value): | |
498 | # Lifted from traceback.py |
|
499 | # Lifted from traceback.py | |
499 | try: |
|
500 | try: | |
500 | return str(value) |
|
501 | return str(value) | |
501 | except: |
|
502 | except: | |
502 | return '<unprintable %s object>' % type(value).__name__ |
|
503 | return '<unprintable %s object>' % type(value).__name__ | |
503 |
|
504 | |||
504 | #---------------------------------------------------------------------------- |
|
505 | #---------------------------------------------------------------------------- | |
505 | class VerboseTB(TBTools): |
|
506 | class VerboseTB(TBTools): | |
506 | """A port of Ka-Ping Yee's cgitb.py module that outputs color text instead |
|
507 | """A port of Ka-Ping Yee's cgitb.py module that outputs color text instead | |
507 | of HTML. Requires inspect and pydoc. Crazy, man. |
|
508 | of HTML. Requires inspect and pydoc. Crazy, man. | |
508 |
|
509 | |||
509 | Modified version which optionally strips the topmost entries from the |
|
510 | Modified version which optionally strips the topmost entries from the | |
510 | traceback, to be used with alternate interpreters (because their own code |
|
511 | traceback, to be used with alternate interpreters (because their own code | |
511 | would appear in the traceback).""" |
|
512 | would appear in the traceback).""" | |
512 |
|
513 | |||
513 | def __init__(self,color_scheme = 'Linux',tb_offset=0,long_header=0, |
|
514 | def __init__(self,color_scheme = 'Linux',tb_offset=0,long_header=0, | |
514 | call_pdb = 0, include_vars=1): |
|
515 | call_pdb = 0, include_vars=1): | |
515 | """Specify traceback offset, headers and color scheme. |
|
516 | """Specify traceback offset, headers and color scheme. | |
516 |
|
517 | |||
517 | Define how many frames to drop from the tracebacks. Calling it with |
|
518 | Define how many frames to drop from the tracebacks. Calling it with | |
518 | tb_offset=1 allows use of this handler in interpreters which will have |
|
519 | tb_offset=1 allows use of this handler in interpreters which will have | |
519 | their own code at the top of the traceback (VerboseTB will first |
|
520 | their own code at the top of the traceback (VerboseTB will first | |
520 | remove that frame before printing the traceback info).""" |
|
521 | remove that frame before printing the traceback info).""" | |
521 | TBTools.__init__(self,color_scheme=color_scheme,call_pdb=call_pdb) |
|
522 | TBTools.__init__(self,color_scheme=color_scheme,call_pdb=call_pdb) | |
522 | self.tb_offset = tb_offset |
|
523 | self.tb_offset = tb_offset | |
523 | self.long_header = long_header |
|
524 | self.long_header = long_header | |
524 | self.include_vars = include_vars |
|
525 | self.include_vars = include_vars | |
525 |
|
526 | |||
526 | def text(self, etype, evalue, etb, context=5): |
|
527 | def text(self, etype, evalue, etb, context=5): | |
527 | """Return a nice text document describing the traceback.""" |
|
528 | """Return a nice text document describing the traceback.""" | |
528 |
|
529 | |||
529 | # some locals |
|
530 | # some locals | |
530 | try: |
|
531 | try: | |
531 | etype = etype.__name__ |
|
532 | etype = etype.__name__ | |
532 | except AttributeError: |
|
533 | except AttributeError: | |
533 | pass |
|
534 | pass | |
534 | Colors = self.Colors # just a shorthand + quicker name lookup |
|
535 | Colors = self.Colors # just a shorthand + quicker name lookup | |
535 | ColorsNormal = Colors.Normal # used a lot |
|
536 | ColorsNormal = Colors.Normal # used a lot | |
536 | col_scheme = self.color_scheme_table.active_scheme_name |
|
537 | col_scheme = self.color_scheme_table.active_scheme_name | |
537 | indent = ' '*INDENT_SIZE |
|
538 | indent = ' '*INDENT_SIZE | |
538 | em_normal = '%s\n%s%s' % (Colors.valEm, indent,ColorsNormal) |
|
539 | em_normal = '%s\n%s%s' % (Colors.valEm, indent,ColorsNormal) | |
539 | undefined = '%sundefined%s' % (Colors.em, ColorsNormal) |
|
540 | undefined = '%sundefined%s' % (Colors.em, ColorsNormal) | |
540 | exc = '%s%s%s' % (Colors.excName,etype,ColorsNormal) |
|
541 | exc = '%s%s%s' % (Colors.excName,etype,ColorsNormal) | |
541 |
|
542 | |||
542 | # some internal-use functions |
|
543 | # some internal-use functions | |
543 | def text_repr(value): |
|
544 | def text_repr(value): | |
544 | """Hopefully pretty robust repr equivalent.""" |
|
545 | """Hopefully pretty robust repr equivalent.""" | |
545 | # this is pretty horrible but should always return *something* |
|
546 | # this is pretty horrible but should always return *something* | |
546 | try: |
|
547 | try: | |
547 | return pydoc.text.repr(value) |
|
548 | return pydoc.text.repr(value) | |
548 | except KeyboardInterrupt: |
|
549 | except KeyboardInterrupt: | |
549 | raise |
|
550 | raise | |
550 | except: |
|
551 | except: | |
551 | try: |
|
552 | try: | |
552 | return repr(value) |
|
553 | return repr(value) | |
553 | except KeyboardInterrupt: |
|
554 | except KeyboardInterrupt: | |
554 | raise |
|
555 | raise | |
555 | except: |
|
556 | except: | |
556 | try: |
|
557 | try: | |
557 | # all still in an except block so we catch |
|
558 | # all still in an except block so we catch | |
558 | # getattr raising |
|
559 | # getattr raising | |
559 | name = getattr(value, '__name__', None) |
|
560 | name = getattr(value, '__name__', None) | |
560 | if name: |
|
561 | if name: | |
561 | # ick, recursion |
|
562 | # ick, recursion | |
562 | return text_repr(name) |
|
563 | return text_repr(name) | |
563 | klass = getattr(value, '__class__', None) |
|
564 | klass = getattr(value, '__class__', None) | |
564 | if klass: |
|
565 | if klass: | |
565 | return '%s instance' % text_repr(klass) |
|
566 | return '%s instance' % text_repr(klass) | |
566 | except KeyboardInterrupt: |
|
567 | except KeyboardInterrupt: | |
567 | raise |
|
568 | raise | |
568 | except: |
|
569 | except: | |
569 | return 'UNRECOVERABLE REPR FAILURE' |
|
570 | return 'UNRECOVERABLE REPR FAILURE' | |
570 | def eqrepr(value, repr=text_repr): return '=%s' % repr(value) |
|
571 | def eqrepr(value, repr=text_repr): return '=%s' % repr(value) | |
571 | def nullrepr(value, repr=text_repr): return '' |
|
572 | def nullrepr(value, repr=text_repr): return '' | |
572 |
|
573 | |||
573 | # meat of the code begins |
|
574 | # meat of the code begins | |
574 | try: |
|
575 | try: | |
575 | etype = etype.__name__ |
|
576 | etype = etype.__name__ | |
576 | except AttributeError: |
|
577 | except AttributeError: | |
577 | pass |
|
578 | pass | |
578 |
|
579 | |||
579 | if self.long_header: |
|
580 | if self.long_header: | |
580 | # Header with the exception type, python version, and date |
|
581 | # Header with the exception type, python version, and date | |
581 | pyver = 'Python ' + string.split(sys.version)[0] + ': ' + sys.executable |
|
582 | pyver = 'Python ' + string.split(sys.version)[0] + ': ' + sys.executable | |
582 | date = time.ctime(time.time()) |
|
583 | date = time.ctime(time.time()) | |
583 |
|
584 | |||
584 | head = '%s%s%s\n%s%s%s\n%s' % (Colors.topline, '-'*75, ColorsNormal, |
|
585 | head = '%s%s%s\n%s%s%s\n%s' % (Colors.topline, '-'*75, ColorsNormal, | |
585 | exc, ' '*(75-len(str(etype))-len(pyver)), |
|
586 | exc, ' '*(75-len(str(etype))-len(pyver)), | |
586 | pyver, string.rjust(date, 75) ) |
|
587 | pyver, string.rjust(date, 75) ) | |
587 | head += "\nA problem occured executing Python code. Here is the sequence of function"\ |
|
588 | head += "\nA problem occured executing Python code. Here is the sequence of function"\ | |
588 | "\ncalls leading up to the error, with the most recent (innermost) call last." |
|
589 | "\ncalls leading up to the error, with the most recent (innermost) call last." | |
589 | else: |
|
590 | else: | |
590 | # Simplified header |
|
591 | # Simplified header | |
591 | head = '%s%s%s\n%s%s' % (Colors.topline, '-'*75, ColorsNormal,exc, |
|
592 | head = '%s%s%s\n%s%s' % (Colors.topline, '-'*75, ColorsNormal,exc, | |
592 | string.rjust('Traceback (most recent call last)', |
|
593 | string.rjust('Traceback (most recent call last)', | |
593 | 75 - len(str(etype)) ) ) |
|
594 | 75 - len(str(etype)) ) ) | |
594 | frames = [] |
|
595 | frames = [] | |
595 | # Flush cache before calling inspect. This helps alleviate some of the |
|
596 | # Flush cache before calling inspect. This helps alleviate some of the | |
596 | # problems with python 2.3's inspect.py. |
|
597 | # problems with python 2.3's inspect.py. | |
597 | linecache.checkcache() |
|
598 | linecache.checkcache() | |
598 | # Drop topmost frames if requested |
|
599 | # Drop topmost frames if requested | |
599 | try: |
|
600 | try: | |
600 | # Try the default getinnerframes and Alex's: Alex's fixes some |
|
601 | # Try the default getinnerframes and Alex's: Alex's fixes some | |
601 | # problems, but it generates empty tracebacks for console errors |
|
602 | # problems, but it generates empty tracebacks for console errors | |
602 | # (5 blanks lines) where none should be returned. |
|
603 | # (5 blanks lines) where none should be returned. | |
603 | #records = inspect.getinnerframes(etb, context)[self.tb_offset:] |
|
604 | #records = inspect.getinnerframes(etb, context)[self.tb_offset:] | |
604 | #print 'python records:', records # dbg |
|
605 | #print 'python records:', records # dbg | |
605 | records = _fixed_getinnerframes(etb, context,self.tb_offset) |
|
606 | records = _fixed_getinnerframes(etb, context,self.tb_offset) | |
606 | #print 'alex records:', records # dbg |
|
607 | #print 'alex records:', records # dbg | |
607 | except: |
|
608 | except: | |
608 |
|
609 | |||
609 | # FIXME: I've been getting many crash reports from python 2.3 |
|
610 | # FIXME: I've been getting many crash reports from python 2.3 | |
610 | # users, traceable to inspect.py. If I can find a small test-case |
|
611 | # users, traceable to inspect.py. If I can find a small test-case | |
611 | # to reproduce this, I should either write a better workaround or |
|
612 | # to reproduce this, I should either write a better workaround or | |
612 | # file a bug report against inspect (if that's the real problem). |
|
613 | # file a bug report against inspect (if that's the real problem). | |
613 | # So far, I haven't been able to find an isolated example to |
|
614 | # So far, I haven't been able to find an isolated example to | |
614 | # reproduce the problem. |
|
615 | # reproduce the problem. | |
615 | inspect_error() |
|
616 | inspect_error() | |
616 | traceback.print_exc(file=Term.cerr) |
|
617 | traceback.print_exc(file=Term.cerr) | |
617 | info('\nUnfortunately, your original traceback can not be constructed.\n') |
|
618 | info('\nUnfortunately, your original traceback can not be constructed.\n') | |
618 | return '' |
|
619 | return '' | |
619 |
|
620 | |||
620 | # build some color string templates outside these nested loops |
|
621 | # build some color string templates outside these nested loops | |
621 | tpl_link = '%s%%s%s' % (Colors.filenameEm,ColorsNormal) |
|
622 | tpl_link = '%s%%s%s' % (Colors.filenameEm,ColorsNormal) | |
622 | tpl_call = 'in %s%%s%s%%s%s' % (Colors.vName, Colors.valEm, |
|
623 | tpl_call = 'in %s%%s%s%%s%s' % (Colors.vName, Colors.valEm, | |
623 | ColorsNormal) |
|
624 | ColorsNormal) | |
624 | tpl_call_fail = 'in %s%%s%s(***failed resolving arguments***)%s' % \ |
|
625 | tpl_call_fail = 'in %s%%s%s(***failed resolving arguments***)%s' % \ | |
625 | (Colors.vName, Colors.valEm, ColorsNormal) |
|
626 | (Colors.vName, Colors.valEm, ColorsNormal) | |
626 | tpl_local_var = '%s%%s%s' % (Colors.vName, ColorsNormal) |
|
627 | tpl_local_var = '%s%%s%s' % (Colors.vName, ColorsNormal) | |
627 | tpl_global_var = '%sglobal%s %s%%s%s' % (Colors.em, ColorsNormal, |
|
628 | tpl_global_var = '%sglobal%s %s%%s%s' % (Colors.em, ColorsNormal, | |
628 | Colors.vName, ColorsNormal) |
|
629 | Colors.vName, ColorsNormal) | |
629 | tpl_name_val = '%%s %s= %%s%s' % (Colors.valEm, ColorsNormal) |
|
630 | tpl_name_val = '%%s %s= %%s%s' % (Colors.valEm, ColorsNormal) | |
630 | tpl_line = '%s%%s%s %%s' % (Colors.lineno, ColorsNormal) |
|
631 | tpl_line = '%s%%s%s %%s' % (Colors.lineno, ColorsNormal) | |
631 | tpl_line_em = '%s%%s%s %%s%s' % (Colors.linenoEm,Colors.line, |
|
632 | tpl_line_em = '%s%%s%s %%s%s' % (Colors.linenoEm,Colors.line, | |
632 | ColorsNormal) |
|
633 | ColorsNormal) | |
633 |
|
634 | |||
634 | # now, loop over all records printing context and info |
|
635 | # now, loop over all records printing context and info | |
635 | abspath = os.path.abspath |
|
636 | abspath = os.path.abspath | |
636 | for frame, file, lnum, func, lines, index in records: |
|
637 | for frame, file, lnum, func, lines, index in records: | |
637 | #print '*** record:',file,lnum,func,lines,index # dbg |
|
638 | #print '*** record:',file,lnum,func,lines,index # dbg | |
638 | try: |
|
639 | try: | |
639 | file = file and abspath(file) or '?' |
|
640 | file = file and abspath(file) or '?' | |
640 | except OSError: |
|
641 | except OSError: | |
641 | # if file is '<console>' or something not in the filesystem, |
|
642 | # if file is '<console>' or something not in the filesystem, | |
642 | # the abspath call will throw an OSError. Just ignore it and |
|
643 | # the abspath call will throw an OSError. Just ignore it and | |
643 | # keep the original file string. |
|
644 | # keep the original file string. | |
644 | pass |
|
645 | pass | |
645 | link = tpl_link % file |
|
646 | link = tpl_link % file | |
646 | try: |
|
647 | try: | |
647 | args, varargs, varkw, locals = inspect.getargvalues(frame) |
|
648 | args, varargs, varkw, locals = inspect.getargvalues(frame) | |
648 | except: |
|
649 | except: | |
649 | # This can happen due to a bug in python2.3. We should be |
|
650 | # This can happen due to a bug in python2.3. We should be | |
650 | # able to remove this try/except when 2.4 becomes a |
|
651 | # able to remove this try/except when 2.4 becomes a | |
651 | # requirement. Bug details at http://python.org/sf/1005466 |
|
652 | # requirement. Bug details at http://python.org/sf/1005466 | |
652 | inspect_error() |
|
653 | inspect_error() | |
653 | traceback.print_exc(file=Term.cerr) |
|
654 | traceback.print_exc(file=Term.cerr) | |
654 | info("\nIPython's exception reporting continues...\n") |
|
655 | info("\nIPython's exception reporting continues...\n") | |
655 |
|
656 | |||
656 | if func == '?': |
|
657 | if func == '?': | |
657 | call = '' |
|
658 | call = '' | |
658 | else: |
|
659 | else: | |
659 | # Decide whether to include variable details or not |
|
660 | # Decide whether to include variable details or not | |
660 | var_repr = self.include_vars and eqrepr or nullrepr |
|
661 | var_repr = self.include_vars and eqrepr or nullrepr | |
661 | try: |
|
662 | try: | |
662 | call = tpl_call % (func,inspect.formatargvalues(args, |
|
663 | call = tpl_call % (func,inspect.formatargvalues(args, | |
663 | varargs, varkw, |
|
664 | varargs, varkw, | |
664 | locals,formatvalue=var_repr)) |
|
665 | locals,formatvalue=var_repr)) | |
665 | except KeyError: |
|
666 | except KeyError: | |
666 | # Very odd crash from inspect.formatargvalues(). The |
|
667 | # Very odd crash from inspect.formatargvalues(). The | |
667 | # scenario under which it appeared was a call to |
|
668 | # scenario under which it appeared was a call to | |
668 | # view(array,scale) in NumTut.view.view(), where scale had |
|
669 | # view(array,scale) in NumTut.view.view(), where scale had | |
669 | # been defined as a scalar (it should be a tuple). Somehow |
|
670 | # been defined as a scalar (it should be a tuple). Somehow | |
670 | # inspect messes up resolving the argument list of view() |
|
671 | # inspect messes up resolving the argument list of view() | |
671 | # and barfs out. At some point I should dig into this one |
|
672 | # and barfs out. At some point I should dig into this one | |
672 | # and file a bug report about it. |
|
673 | # and file a bug report about it. | |
673 | inspect_error() |
|
674 | inspect_error() | |
674 | traceback.print_exc(file=Term.cerr) |
|
675 | traceback.print_exc(file=Term.cerr) | |
675 | info("\nIPython's exception reporting continues...\n") |
|
676 | info("\nIPython's exception reporting continues...\n") | |
676 | call = tpl_call_fail % func |
|
677 | call = tpl_call_fail % func | |
677 |
|
678 | |||
678 | # Initialize a list of names on the current line, which the |
|
679 | # Initialize a list of names on the current line, which the | |
679 | # tokenizer below will populate. |
|
680 | # tokenizer below will populate. | |
680 | names = [] |
|
681 | names = [] | |
681 |
|
682 | |||
682 | def tokeneater(token_type, token, start, end, line): |
|
683 | def tokeneater(token_type, token, start, end, line): | |
683 | """Stateful tokeneater which builds dotted names. |
|
684 | """Stateful tokeneater which builds dotted names. | |
684 |
|
685 | |||
685 | The list of names it appends to (from the enclosing scope) can |
|
686 | The list of names it appends to (from the enclosing scope) can | |
686 | contain repeated composite names. This is unavoidable, since |
|
687 | contain repeated composite names. This is unavoidable, since | |
687 | there is no way to disambguate partial dotted structures until |
|
688 | there is no way to disambguate partial dotted structures until | |
688 | the full list is known. The caller is responsible for pruning |
|
689 | the full list is known. The caller is responsible for pruning | |
689 | the final list of duplicates before using it.""" |
|
690 | the final list of duplicates before using it.""" | |
690 |
|
691 | |||
691 | # build composite names |
|
692 | # build composite names | |
692 | if token == '.': |
|
693 | if token == '.': | |
693 | try: |
|
694 | try: | |
694 | names[-1] += '.' |
|
695 | names[-1] += '.' | |
695 | # store state so the next token is added for x.y.z names |
|
696 | # store state so the next token is added for x.y.z names | |
696 | tokeneater.name_cont = True |
|
697 | tokeneater.name_cont = True | |
697 | return |
|
698 | return | |
698 | except IndexError: |
|
699 | except IndexError: | |
699 | pass |
|
700 | pass | |
700 | if token_type == tokenize.NAME and token not in keyword.kwlist: |
|
701 | if token_type == tokenize.NAME and token not in keyword.kwlist: | |
701 | if tokeneater.name_cont: |
|
702 | if tokeneater.name_cont: | |
702 | # Dotted names |
|
703 | # Dotted names | |
703 | names[-1] += token |
|
704 | names[-1] += token | |
704 | tokeneater.name_cont = False |
|
705 | tokeneater.name_cont = False | |
705 | else: |
|
706 | else: | |
706 | # Regular new names. We append everything, the caller |
|
707 | # Regular new names. We append everything, the caller | |
707 | # will be responsible for pruning the list later. It's |
|
708 | # will be responsible for pruning the list later. It's | |
708 | # very tricky to try to prune as we go, b/c composite |
|
709 | # very tricky to try to prune as we go, b/c composite | |
709 | # names can fool us. The pruning at the end is easy |
|
710 | # names can fool us. The pruning at the end is easy | |
710 | # to do (or the caller can print a list with repeated |
|
711 | # to do (or the caller can print a list with repeated | |
711 | # names if so desired. |
|
712 | # names if so desired. | |
712 | names.append(token) |
|
713 | names.append(token) | |
713 | elif token_type == tokenize.NEWLINE: |
|
714 | elif token_type == tokenize.NEWLINE: | |
714 | raise IndexError |
|
715 | raise IndexError | |
715 | # we need to store a bit of state in the tokenizer to build |
|
716 | # we need to store a bit of state in the tokenizer to build | |
716 | # dotted names |
|
717 | # dotted names | |
717 | tokeneater.name_cont = False |
|
718 | tokeneater.name_cont = False | |
718 |
|
719 | |||
719 | def linereader(file=file, lnum=[lnum], getline=linecache.getline): |
|
720 | def linereader(file=file, lnum=[lnum], getline=linecache.getline): | |
720 | line = getline(file, lnum[0]) |
|
721 | line = getline(file, lnum[0]) | |
721 | lnum[0] += 1 |
|
722 | lnum[0] += 1 | |
722 | return line |
|
723 | return line | |
723 |
|
724 | |||
724 | # Build the list of names on this line of code where the exception |
|
725 | # Build the list of names on this line of code where the exception | |
725 | # occurred. |
|
726 | # occurred. | |
726 | try: |
|
727 | try: | |
727 | # This builds the names list in-place by capturing it from the |
|
728 | # This builds the names list in-place by capturing it from the | |
728 | # enclosing scope. |
|
729 | # enclosing scope. | |
729 | tokenize.tokenize(linereader, tokeneater) |
|
730 | tokenize.tokenize(linereader, tokeneater) | |
730 | except IndexError: |
|
731 | except IndexError: | |
731 | # signals exit of tokenizer |
|
732 | # signals exit of tokenizer | |
732 | pass |
|
733 | pass | |
733 | except tokenize.TokenError,msg: |
|
734 | except tokenize.TokenError,msg: | |
734 | _m = ("An unexpected error occurred while tokenizing input\n" |
|
735 | _m = ("An unexpected error occurred while tokenizing input\n" | |
735 | "The following traceback may be corrupted or invalid\n" |
|
736 | "The following traceback may be corrupted or invalid\n" | |
736 | "The error message is: %s\n" % msg) |
|
737 | "The error message is: %s\n" % msg) | |
737 | error(_m) |
|
738 | error(_m) | |
738 |
|
739 | |||
739 | # prune names list of duplicates, but keep the right order |
|
740 | # prune names list of duplicates, but keep the right order | |
740 | unique_names = uniq_stable(names) |
|
741 | unique_names = uniq_stable(names) | |
741 |
|
742 | |||
742 | # Start loop over vars |
|
743 | # Start loop over vars | |
743 | lvals = [] |
|
744 | lvals = [] | |
744 | if self.include_vars: |
|
745 | if self.include_vars: | |
745 | for name_full in unique_names: |
|
746 | for name_full in unique_names: | |
746 | name_base = name_full.split('.',1)[0] |
|
747 | name_base = name_full.split('.',1)[0] | |
747 | if name_base in frame.f_code.co_varnames: |
|
748 | if name_base in frame.f_code.co_varnames: | |
748 | if locals.has_key(name_base): |
|
749 | if locals.has_key(name_base): | |
749 | try: |
|
750 | try: | |
750 | value = repr(eval(name_full,locals)) |
|
751 | value = repr(eval(name_full,locals)) | |
751 | except: |
|
752 | except: | |
752 | value = undefined |
|
753 | value = undefined | |
753 | else: |
|
754 | else: | |
754 | value = undefined |
|
755 | value = undefined | |
755 | name = tpl_local_var % name_full |
|
756 | name = tpl_local_var % name_full | |
756 | else: |
|
757 | else: | |
757 | if frame.f_globals.has_key(name_base): |
|
758 | if frame.f_globals.has_key(name_base): | |
758 | try: |
|
759 | try: | |
759 | value = repr(eval(name_full,frame.f_globals)) |
|
760 | value = repr(eval(name_full,frame.f_globals)) | |
760 | except: |
|
761 | except: | |
761 | value = undefined |
|
762 | value = undefined | |
762 | else: |
|
763 | else: | |
763 | value = undefined |
|
764 | value = undefined | |
764 | name = tpl_global_var % name_full |
|
765 | name = tpl_global_var % name_full | |
765 | lvals.append(tpl_name_val % (name,value)) |
|
766 | lvals.append(tpl_name_val % (name,value)) | |
766 | if lvals: |
|
767 | if lvals: | |
767 | lvals = '%s%s' % (indent,em_normal.join(lvals)) |
|
768 | lvals = '%s%s' % (indent,em_normal.join(lvals)) | |
768 | else: |
|
769 | else: | |
769 | lvals = '' |
|
770 | lvals = '' | |
770 |
|
771 | |||
771 | level = '%s %s\n' % (link,call) |
|
772 | level = '%s %s\n' % (link,call) | |
772 |
|
773 | |||
773 | if index is None: |
|
774 | if index is None: | |
774 | frames.append(level) |
|
775 | frames.append(level) | |
775 | else: |
|
776 | else: | |
776 | frames.append('%s%s' % (level,''.join( |
|
777 | frames.append('%s%s' % (level,''.join( | |
777 | _formatTracebackLines(lnum,index,lines,Colors,lvals, |
|
778 | _formatTracebackLines(lnum,index,lines,Colors,lvals, | |
778 | col_scheme)))) |
|
779 | col_scheme)))) | |
779 |
|
780 | |||
780 | # Get (safely) a string form of the exception info |
|
781 | # Get (safely) a string form of the exception info | |
781 | try: |
|
782 | try: | |
782 | etype_str,evalue_str = map(str,(etype,evalue)) |
|
783 | etype_str,evalue_str = map(str,(etype,evalue)) | |
783 | except: |
|
784 | except: | |
784 | # User exception is improperly defined. |
|
785 | # User exception is improperly defined. | |
785 | etype,evalue = str,sys.exc_info()[:2] |
|
786 | etype,evalue = str,sys.exc_info()[:2] | |
786 | etype_str,evalue_str = map(str,(etype,evalue)) |
|
787 | etype_str,evalue_str = map(str,(etype,evalue)) | |
787 | # ... and format it |
|
788 | # ... and format it | |
788 | exception = ['%s%s%s: %s' % (Colors.excName, etype_str, |
|
789 | exception = ['%s%s%s: %s' % (Colors.excName, etype_str, | |
789 | ColorsNormal, evalue_str)] |
|
790 | ColorsNormal, evalue_str)] | |
790 | if type(evalue) is types.InstanceType: |
|
791 | if type(evalue) is types.InstanceType: | |
791 | try: |
|
792 | try: | |
792 | names = [w for w in dir(evalue) if isinstance(w, basestring)] |
|
793 | names = [w for w in dir(evalue) if isinstance(w, basestring)] | |
793 | except: |
|
794 | except: | |
794 | # Every now and then, an object with funny inernals blows up |
|
795 | # Every now and then, an object with funny inernals blows up | |
795 | # when dir() is called on it. We do the best we can to report |
|
796 | # when dir() is called on it. We do the best we can to report | |
796 | # the problem and continue |
|
797 | # the problem and continue | |
797 | _m = '%sException reporting error (object with broken dir())%s:' |
|
798 | _m = '%sException reporting error (object with broken dir())%s:' | |
798 | exception.append(_m % (Colors.excName,ColorsNormal)) |
|
799 | exception.append(_m % (Colors.excName,ColorsNormal)) | |
799 | etype_str,evalue_str = map(str,sys.exc_info()[:2]) |
|
800 | etype_str,evalue_str = map(str,sys.exc_info()[:2]) | |
800 | exception.append('%s%s%s: %s' % (Colors.excName,etype_str, |
|
801 | exception.append('%s%s%s: %s' % (Colors.excName,etype_str, | |
801 | ColorsNormal, evalue_str)) |
|
802 | ColorsNormal, evalue_str)) | |
802 | names = [] |
|
803 | names = [] | |
803 | for name in names: |
|
804 | for name in names: | |
804 | value = text_repr(getattr(evalue, name)) |
|
805 | value = text_repr(getattr(evalue, name)) | |
805 | exception.append('\n%s%s = %s' % (indent, name, value)) |
|
806 | exception.append('\n%s%s = %s' % (indent, name, value)) | |
806 |
|
807 | |||
807 | # vds: >> |
|
808 | # vds: >> | |
808 | if records: |
|
809 | if records: | |
809 | filepath, lnum = records[-1][1:3] |
|
810 | filepath, lnum = records[-1][1:3] | |
810 | #print "file:", str(file), "linenb", str(lnum) # dbg |
|
811 | #print "file:", str(file), "linenb", str(lnum) # dbg | |
811 | filepath = os.path.abspath(filepath) |
|
812 | filepath = os.path.abspath(filepath) | |
812 | __IPYTHON__.hooks.synchronize_with_editor(filepath, lnum, 0) |
|
813 | __IPYTHON__.hooks.synchronize_with_editor(filepath, lnum, 0) | |
813 | # vds: << |
|
814 | # vds: << | |
814 |
|
815 | |||
815 | # return all our info assembled as a single string |
|
816 | # return all our info assembled as a single string | |
816 | return '%s\n\n%s\n%s' % (head,'\n'.join(frames),''.join(exception[0]) ) |
|
817 | return '%s\n\n%s\n%s' % (head,'\n'.join(frames),''.join(exception[0]) ) | |
817 |
|
818 | |||
818 | def debugger(self,force=False): |
|
819 | def debugger(self,force=False): | |
819 | """Call up the pdb debugger if desired, always clean up the tb |
|
820 | """Call up the pdb debugger if desired, always clean up the tb | |
820 | reference. |
|
821 | reference. | |
821 |
|
822 | |||
822 | Keywords: |
|
823 | Keywords: | |
823 |
|
824 | |||
824 | - force(False): by default, this routine checks the instance call_pdb |
|
825 | - force(False): by default, this routine checks the instance call_pdb | |
825 | flag and does not actually invoke the debugger if the flag is false. |
|
826 | flag and does not actually invoke the debugger if the flag is false. | |
826 | The 'force' option forces the debugger to activate even if the flag |
|
827 | The 'force' option forces the debugger to activate even if the flag | |
827 | is false. |
|
828 | is false. | |
828 |
|
829 | |||
829 | If the call_pdb flag is set, the pdb interactive debugger is |
|
830 | If the call_pdb flag is set, the pdb interactive debugger is | |
830 | invoked. In all cases, the self.tb reference to the current traceback |
|
831 | invoked. In all cases, the self.tb reference to the current traceback | |
831 | is deleted to prevent lingering references which hamper memory |
|
832 | is deleted to prevent lingering references which hamper memory | |
832 | management. |
|
833 | management. | |
833 |
|
834 | |||
834 | Note that each call to pdb() does an 'import readline', so if your app |
|
835 | Note that each call to pdb() does an 'import readline', so if your app | |
835 | requires a special setup for the readline completers, you'll have to |
|
836 | requires a special setup for the readline completers, you'll have to | |
836 | fix that by hand after invoking the exception handler.""" |
|
837 | fix that by hand after invoking the exception handler.""" | |
837 |
|
838 | |||
838 | if force or self.call_pdb: |
|
839 | if force or self.call_pdb: | |
839 | if self.pdb is None: |
|
840 | if self.pdb is None: | |
840 |
self.pdb = |
|
841 | self.pdb = debugger.Pdb( | |
841 | self.color_scheme_table.active_scheme_name) |
|
842 | self.color_scheme_table.active_scheme_name) | |
842 | # the system displayhook may have changed, restore the original |
|
843 | # the system displayhook may have changed, restore the original | |
843 | # for pdb |
|
844 | # for pdb | |
844 | dhook = sys.displayhook |
|
845 | dhook = sys.displayhook | |
845 | sys.displayhook = sys.__displayhook__ |
|
846 | sys.displayhook = sys.__displayhook__ | |
846 | self.pdb.reset() |
|
847 | self.pdb.reset() | |
847 | # Find the right frame so we don't pop up inside ipython itself |
|
848 | # Find the right frame so we don't pop up inside ipython itself | |
848 | if hasattr(self,'tb'): |
|
849 | if hasattr(self,'tb'): | |
849 | etb = self.tb |
|
850 | etb = self.tb | |
850 | else: |
|
851 | else: | |
851 | etb = self.tb = sys.last_traceback |
|
852 | etb = self.tb = sys.last_traceback | |
852 | while self.tb.tb_next is not None: |
|
853 | while self.tb.tb_next is not None: | |
853 | self.tb = self.tb.tb_next |
|
854 | self.tb = self.tb.tb_next | |
854 | try: |
|
855 | try: | |
855 | if etb and etb.tb_next: |
|
856 | if etb and etb.tb_next: | |
856 | etb = etb.tb_next |
|
857 | etb = etb.tb_next | |
857 | self.pdb.botframe = etb.tb_frame |
|
858 | self.pdb.botframe = etb.tb_frame | |
858 | self.pdb.interaction(self.tb.tb_frame, self.tb) |
|
859 | self.pdb.interaction(self.tb.tb_frame, self.tb) | |
859 | finally: |
|
860 | finally: | |
860 | sys.displayhook = dhook |
|
861 | sys.displayhook = dhook | |
861 |
|
862 | |||
862 | if hasattr(self,'tb'): |
|
863 | if hasattr(self,'tb'): | |
863 | del self.tb |
|
864 | del self.tb | |
864 |
|
865 | |||
865 | def handler(self, info=None): |
|
866 | def handler(self, info=None): | |
866 | (etype, evalue, etb) = info or sys.exc_info() |
|
867 | (etype, evalue, etb) = info or sys.exc_info() | |
867 | self.tb = etb |
|
868 | self.tb = etb | |
868 | Term.cout.flush() |
|
869 | Term.cout.flush() | |
869 | print >> Term.cerr, self.text(etype, evalue, etb) |
|
870 | print >> Term.cerr, self.text(etype, evalue, etb) | |
870 | Term.cerr.flush() |
|
871 | Term.cerr.flush() | |
871 |
|
872 | |||
872 | # Changed so an instance can just be called as VerboseTB_inst() and print |
|
873 | # Changed so an instance can just be called as VerboseTB_inst() and print | |
873 | # out the right info on its own. |
|
874 | # out the right info on its own. | |
874 | def __call__(self, etype=None, evalue=None, etb=None): |
|
875 | def __call__(self, etype=None, evalue=None, etb=None): | |
875 | """This hook can replace sys.excepthook (for Python 2.1 or higher).""" |
|
876 | """This hook can replace sys.excepthook (for Python 2.1 or higher).""" | |
876 | if etb is None: |
|
877 | if etb is None: | |
877 | self.handler() |
|
878 | self.handler() | |
878 | else: |
|
879 | else: | |
879 | self.handler((etype, evalue, etb)) |
|
880 | self.handler((etype, evalue, etb)) | |
880 | try: |
|
881 | try: | |
881 | self.debugger() |
|
882 | self.debugger() | |
882 | except KeyboardInterrupt: |
|
883 | except KeyboardInterrupt: | |
883 | print "\nKeyboardInterrupt" |
|
884 | print "\nKeyboardInterrupt" | |
884 |
|
885 | |||
885 | #---------------------------------------------------------------------------- |
|
886 | #---------------------------------------------------------------------------- | |
886 | class FormattedTB(VerboseTB,ListTB): |
|
887 | class FormattedTB(VerboseTB,ListTB): | |
887 | """Subclass ListTB but allow calling with a traceback. |
|
888 | """Subclass ListTB but allow calling with a traceback. | |
888 |
|
889 | |||
889 | It can thus be used as a sys.excepthook for Python > 2.1. |
|
890 | It can thus be used as a sys.excepthook for Python > 2.1. | |
890 |
|
891 | |||
891 | Also adds 'Context' and 'Verbose' modes, not available in ListTB. |
|
892 | Also adds 'Context' and 'Verbose' modes, not available in ListTB. | |
892 |
|
893 | |||
893 | Allows a tb_offset to be specified. This is useful for situations where |
|
894 | Allows a tb_offset to be specified. This is useful for situations where | |
894 | one needs to remove a number of topmost frames from the traceback (such as |
|
895 | one needs to remove a number of topmost frames from the traceback (such as | |
895 | occurs with python programs that themselves execute other python code, |
|
896 | occurs with python programs that themselves execute other python code, | |
896 | like Python shells). """ |
|
897 | like Python shells). """ | |
897 |
|
898 | |||
898 | def __init__(self, mode = 'Plain', color_scheme='Linux', |
|
899 | def __init__(self, mode = 'Plain', color_scheme='Linux', | |
899 | tb_offset = 0,long_header=0,call_pdb=0,include_vars=0): |
|
900 | tb_offset = 0,long_header=0,call_pdb=0,include_vars=0): | |
900 |
|
901 | |||
901 | # NEVER change the order of this list. Put new modes at the end: |
|
902 | # NEVER change the order of this list. Put new modes at the end: | |
902 | self.valid_modes = ['Plain','Context','Verbose'] |
|
903 | self.valid_modes = ['Plain','Context','Verbose'] | |
903 | self.verbose_modes = self.valid_modes[1:3] |
|
904 | self.verbose_modes = self.valid_modes[1:3] | |
904 |
|
905 | |||
905 | VerboseTB.__init__(self,color_scheme,tb_offset,long_header, |
|
906 | VerboseTB.__init__(self,color_scheme,tb_offset,long_header, | |
906 | call_pdb=call_pdb,include_vars=include_vars) |
|
907 | call_pdb=call_pdb,include_vars=include_vars) | |
907 | self.set_mode(mode) |
|
908 | self.set_mode(mode) | |
908 |
|
909 | |||
909 | def _extract_tb(self,tb): |
|
910 | def _extract_tb(self,tb): | |
910 | if tb: |
|
911 | if tb: | |
911 | return traceback.extract_tb(tb) |
|
912 | return traceback.extract_tb(tb) | |
912 | else: |
|
913 | else: | |
913 | return None |
|
914 | return None | |
914 |
|
915 | |||
915 | def text(self, etype, value, tb,context=5,mode=None): |
|
916 | def text(self, etype, value, tb,context=5,mode=None): | |
916 | """Return formatted traceback. |
|
917 | """Return formatted traceback. | |
917 |
|
918 | |||
918 | If the optional mode parameter is given, it overrides the current |
|
919 | If the optional mode parameter is given, it overrides the current | |
919 | mode.""" |
|
920 | mode.""" | |
920 |
|
921 | |||
921 | if mode is None: |
|
922 | if mode is None: | |
922 | mode = self.mode |
|
923 | mode = self.mode | |
923 | if mode in self.verbose_modes: |
|
924 | if mode in self.verbose_modes: | |
924 | # verbose modes need a full traceback |
|
925 | # verbose modes need a full traceback | |
925 | return VerboseTB.text(self,etype, value, tb,context=5) |
|
926 | return VerboseTB.text(self,etype, value, tb,context=5) | |
926 | else: |
|
927 | else: | |
927 | # We must check the source cache because otherwise we can print |
|
928 | # We must check the source cache because otherwise we can print | |
928 | # out-of-date source code. |
|
929 | # out-of-date source code. | |
929 | linecache.checkcache() |
|
930 | linecache.checkcache() | |
930 | # Now we can extract and format the exception |
|
931 | # Now we can extract and format the exception | |
931 | elist = self._extract_tb(tb) |
|
932 | elist = self._extract_tb(tb) | |
932 | if len(elist) > self.tb_offset: |
|
933 | if len(elist) > self.tb_offset: | |
933 | del elist[:self.tb_offset] |
|
934 | del elist[:self.tb_offset] | |
934 | return ListTB.text(self,etype,value,elist) |
|
935 | return ListTB.text(self,etype,value,elist) | |
935 |
|
936 | |||
936 | def set_mode(self,mode=None): |
|
937 | def set_mode(self,mode=None): | |
937 | """Switch to the desired mode. |
|
938 | """Switch to the desired mode. | |
938 |
|
939 | |||
939 | If mode is not specified, cycles through the available modes.""" |
|
940 | If mode is not specified, cycles through the available modes.""" | |
940 |
|
941 | |||
941 | if not mode: |
|
942 | if not mode: | |
942 | new_idx = ( self.valid_modes.index(self.mode) + 1 ) % \ |
|
943 | new_idx = ( self.valid_modes.index(self.mode) + 1 ) % \ | |
943 | len(self.valid_modes) |
|
944 | len(self.valid_modes) | |
944 | self.mode = self.valid_modes[new_idx] |
|
945 | self.mode = self.valid_modes[new_idx] | |
945 | elif mode not in self.valid_modes: |
|
946 | elif mode not in self.valid_modes: | |
946 | raise ValueError, 'Unrecognized mode in FormattedTB: <'+mode+'>\n'\ |
|
947 | raise ValueError, 'Unrecognized mode in FormattedTB: <'+mode+'>\n'\ | |
947 | 'Valid modes: '+str(self.valid_modes) |
|
948 | 'Valid modes: '+str(self.valid_modes) | |
948 | else: |
|
949 | else: | |
949 | self.mode = mode |
|
950 | self.mode = mode | |
950 | # include variable details only in 'Verbose' mode |
|
951 | # include variable details only in 'Verbose' mode | |
951 | self.include_vars = (self.mode == self.valid_modes[2]) |
|
952 | self.include_vars = (self.mode == self.valid_modes[2]) | |
952 |
|
953 | |||
953 | # some convenient shorcuts |
|
954 | # some convenient shorcuts | |
954 | def plain(self): |
|
955 | def plain(self): | |
955 | self.set_mode(self.valid_modes[0]) |
|
956 | self.set_mode(self.valid_modes[0]) | |
956 |
|
957 | |||
957 | def context(self): |
|
958 | def context(self): | |
958 | self.set_mode(self.valid_modes[1]) |
|
959 | self.set_mode(self.valid_modes[1]) | |
959 |
|
960 | |||
960 | def verbose(self): |
|
961 | def verbose(self): | |
961 | self.set_mode(self.valid_modes[2]) |
|
962 | self.set_mode(self.valid_modes[2]) | |
962 |
|
963 | |||
963 | #---------------------------------------------------------------------------- |
|
964 | #---------------------------------------------------------------------------- | |
964 | class AutoFormattedTB(FormattedTB): |
|
965 | class AutoFormattedTB(FormattedTB): | |
965 | """A traceback printer which can be called on the fly. |
|
966 | """A traceback printer which can be called on the fly. | |
966 |
|
967 | |||
967 | It will find out about exceptions by itself. |
|
968 | It will find out about exceptions by itself. | |
968 |
|
969 | |||
969 | A brief example: |
|
970 | A brief example: | |
970 |
|
971 | |||
971 | AutoTB = AutoFormattedTB(mode = 'Verbose',color_scheme='Linux') |
|
972 | AutoTB = AutoFormattedTB(mode = 'Verbose',color_scheme='Linux') | |
972 | try: |
|
973 | try: | |
973 | ... |
|
974 | ... | |
974 | except: |
|
975 | except: | |
975 | AutoTB() # or AutoTB(out=logfile) where logfile is an open file object |
|
976 | AutoTB() # or AutoTB(out=logfile) where logfile is an open file object | |
976 | """ |
|
977 | """ | |
977 | def __call__(self,etype=None,evalue=None,etb=None, |
|
978 | def __call__(self,etype=None,evalue=None,etb=None, | |
978 | out=None,tb_offset=None): |
|
979 | out=None,tb_offset=None): | |
979 | """Print out a formatted exception traceback. |
|
980 | """Print out a formatted exception traceback. | |
980 |
|
981 | |||
981 | Optional arguments: |
|
982 | Optional arguments: | |
982 | - out: an open file-like object to direct output to. |
|
983 | - out: an open file-like object to direct output to. | |
983 |
|
984 | |||
984 | - tb_offset: the number of frames to skip over in the stack, on a |
|
985 | - tb_offset: the number of frames to skip over in the stack, on a | |
985 | per-call basis (this overrides temporarily the instance's tb_offset |
|
986 | per-call basis (this overrides temporarily the instance's tb_offset | |
986 | given at initialization time. """ |
|
987 | given at initialization time. """ | |
987 |
|
988 | |||
988 | if out is None: |
|
989 | if out is None: | |
989 | out = Term.cerr |
|
990 | out = Term.cerr | |
990 | Term.cout.flush() |
|
991 | Term.cout.flush() | |
991 | if tb_offset is not None: |
|
992 | if tb_offset is not None: | |
992 | tb_offset, self.tb_offset = self.tb_offset, tb_offset |
|
993 | tb_offset, self.tb_offset = self.tb_offset, tb_offset | |
993 | print >> out, self.text(etype, evalue, etb) |
|
994 | print >> out, self.text(etype, evalue, etb) | |
994 | self.tb_offset = tb_offset |
|
995 | self.tb_offset = tb_offset | |
995 | else: |
|
996 | else: | |
996 | print >> out, self.text(etype, evalue, etb) |
|
997 | print >> out, self.text(etype, evalue, etb) | |
997 | out.flush() |
|
998 | out.flush() | |
998 | try: |
|
999 | try: | |
999 | self.debugger() |
|
1000 | self.debugger() | |
1000 | except KeyboardInterrupt: |
|
1001 | except KeyboardInterrupt: | |
1001 | print "\nKeyboardInterrupt" |
|
1002 | print "\nKeyboardInterrupt" | |
1002 |
|
1003 | |||
1003 | def text(self,etype=None,value=None,tb=None,context=5,mode=None): |
|
1004 | def text(self,etype=None,value=None,tb=None,context=5,mode=None): | |
1004 | if etype is None: |
|
1005 | if etype is None: | |
1005 | etype,value,tb = sys.exc_info() |
|
1006 | etype,value,tb = sys.exc_info() | |
1006 | self.tb = tb |
|
1007 | self.tb = tb | |
1007 | return FormattedTB.text(self,etype,value,tb,context=5,mode=mode) |
|
1008 | return FormattedTB.text(self,etype,value,tb,context=5,mode=mode) | |
1008 |
|
1009 | |||
1009 | #--------------------------------------------------------------------------- |
|
1010 | #--------------------------------------------------------------------------- | |
1010 | # A simple class to preserve Nathan's original functionality. |
|
1011 | # A simple class to preserve Nathan's original functionality. | |
1011 | class ColorTB(FormattedTB): |
|
1012 | class ColorTB(FormattedTB): | |
1012 | """Shorthand to initialize a FormattedTB in Linux colors mode.""" |
|
1013 | """Shorthand to initialize a FormattedTB in Linux colors mode.""" | |
1013 | def __init__(self,color_scheme='Linux',call_pdb=0): |
|
1014 | def __init__(self,color_scheme='Linux',call_pdb=0): | |
1014 | FormattedTB.__init__(self,color_scheme=color_scheme, |
|
1015 | FormattedTB.__init__(self,color_scheme=color_scheme, | |
1015 | call_pdb=call_pdb) |
|
1016 | call_pdb=call_pdb) | |
1016 |
|
1017 | |||
1017 | #---------------------------------------------------------------------------- |
|
1018 | #---------------------------------------------------------------------------- | |
1018 | # module testing (minimal) |
|
1019 | # module testing (minimal) | |
1019 | if __name__ == "__main__": |
|
1020 | if __name__ == "__main__": | |
1020 | def spam(c, (d, e)): |
|
1021 | def spam(c, (d, e)): | |
1021 | x = c + d |
|
1022 | x = c + d | |
1022 | y = c * d |
|
1023 | y = c * d | |
1023 | foo(x, y) |
|
1024 | foo(x, y) | |
1024 |
|
1025 | |||
1025 | def foo(a, b, bar=1): |
|
1026 | def foo(a, b, bar=1): | |
1026 | eggs(a, b + bar) |
|
1027 | eggs(a, b + bar) | |
1027 |
|
1028 | |||
1028 | def eggs(f, g, z=globals()): |
|
1029 | def eggs(f, g, z=globals()): | |
1029 | h = f + g |
|
1030 | h = f + g | |
1030 | i = f - g |
|
1031 | i = f - g | |
1031 | return h / i |
|
1032 | return h / i | |
1032 |
|
1033 | |||
1033 | print '' |
|
1034 | print '' | |
1034 | print '*** Before ***' |
|
1035 | print '*** Before ***' | |
1035 | try: |
|
1036 | try: | |
1036 | print spam(1, (2, 3)) |
|
1037 | print spam(1, (2, 3)) | |
1037 | except: |
|
1038 | except: | |
1038 | traceback.print_exc() |
|
1039 | traceback.print_exc() | |
1039 | print '' |
|
1040 | print '' | |
1040 |
|
1041 | |||
1041 | handler = ColorTB() |
|
1042 | handler = ColorTB() | |
1042 | print '*** ColorTB ***' |
|
1043 | print '*** ColorTB ***' | |
1043 | try: |
|
1044 | try: | |
1044 | print spam(1, (2, 3)) |
|
1045 | print spam(1, (2, 3)) | |
1045 | except: |
|
1046 | except: | |
1046 | apply(handler, sys.exc_info() ) |
|
1047 | apply(handler, sys.exc_info() ) | |
1047 | print '' |
|
1048 | print '' | |
1048 |
|
1049 | |||
1049 | handler = VerboseTB() |
|
1050 | handler = VerboseTB() | |
1050 | print '*** VerboseTB ***' |
|
1051 | print '*** VerboseTB ***' | |
1051 | try: |
|
1052 | try: | |
1052 | print spam(1, (2, 3)) |
|
1053 | print spam(1, (2, 3)) | |
1053 | except: |
|
1054 | except: | |
1054 | apply(handler, sys.exc_info() ) |
|
1055 | apply(handler, sys.exc_info() ) | |
1055 | print '' |
|
1056 | print '' | |
1056 |
|
1057 |
General Comments 0
You need to be logged in to leave comments.
Login now