##// END OF EJS Templates
Store _ip in user_ns now, instead of __builtin__. Closes #197 and probably zillion other bugs with embedded ipython instances
vivainio -
Show More
@@ -186,6 +186,7 b' class IPApi:'
186 self.set_custom_exc = ip.set_custom_exc
186 self.set_custom_exc = ip.set_custom_exc
187
187
188 self.user_ns = ip.user_ns
188 self.user_ns = ip.user_ns
189 self.user_ns['_ip'] = self
189
190
190 self.set_crash_handler = ip.set_crash_handler
191 self.set_crash_handler = ip.set_crash_handler
191
192
@@ -6,7 +6,7 b' Requires Python 2.3 or newer.'
6
6
7 This file contains all the classes and helper functions specific to IPython.
7 This file contains all the classes and helper functions specific to IPython.
8
8
9 $Id: iplib.py 2908 2007-12-30 21:07:46Z vivainio $
9 $Id: iplib.py 2910 2007-12-30 22:42:25Z vivainio $
10 """
10 """
11
11
12 #*****************************************************************************
12 #*****************************************************************************
@@ -728,15 +728,14 b' class InteractiveShell(object,Magic):'
728 Some parts of ipython operate via builtins injected here, which hold a
728 Some parts of ipython operate via builtins injected here, which hold a
729 reference to IPython itself."""
729 reference to IPython itself."""
730
730
731 # TODO: deprecate all except _ip; 'jobs' should be installed
731 # TODO: deprecate all of these, they are unsafe
732 # by an extension and the rest are under _ip, ipalias is redundant
733 builtins_new = dict(__IPYTHON__ = self,
732 builtins_new = dict(__IPYTHON__ = self,
734 ip_set_hook = self.set_hook,
733 ip_set_hook = self.set_hook,
735 jobs = self.jobs,
734 jobs = self.jobs,
736 ipmagic = wrap_deprecated(self.ipmagic,'_ip.magic()'),
735 ipmagic = wrap_deprecated(self.ipmagic,'_ip.magic()'),
737 ipalias = wrap_deprecated(self.ipalias),
736 ipalias = wrap_deprecated(self.ipalias),
738 ipsystem = wrap_deprecated(self.ipsystem,'_ip.system()'),
737 ipsystem = wrap_deprecated(self.ipsystem,'_ip.system()'),
739 _ip = self.api
738 #_ip = self.api
740 )
739 )
741 for biname,bival in builtins_new.items():
740 for biname,bival in builtins_new.items():
742 try:
741 try:
General Comments 0
You need to be logged in to leave comments. Login now