Show More
@@ -926,7 +926,7 b' class InteractiveShell(SingletonConfigurable, Magic):' | |||||
926 | self.ns_table = {'user':user_ns, |
|
926 | self.ns_table = {'user':user_ns, | |
927 | 'user_global':user_global_ns, |
|
927 | 'user_global':user_global_ns, | |
928 | 'internal':self.internal_ns, |
|
928 | 'internal':self.internal_ns, | |
929 |
'builtin': |
|
929 | 'builtin':builtin_mod.__dict__ | |
930 | } |
|
930 | } | |
931 |
|
931 | |||
932 | # Similarly, track all namespaces where references can be held and that |
|
932 | # Similarly, track all namespaces where references can be held and that | |
@@ -1050,7 +1050,7 b' class InteractiveShell(SingletonConfigurable, Magic):' | |||||
1050 |
|
1050 | |||
1051 | # For more details: |
|
1051 | # For more details: | |
1052 | # http://mail.python.org/pipermail/python-dev/2001-April/014068.html |
|
1052 | # http://mail.python.org/pipermail/python-dev/2001-April/014068.html | |
1053 |
ns = dict(__builtin__ = |
|
1053 | ns = dict(__builtin__ = builtin_mod) | |
1054 |
|
1054 | |||
1055 | # Put 'help' in the user namespace |
|
1055 | # Put 'help' in the user namespace | |
1056 | try: |
|
1056 | try: | |
@@ -1273,7 +1273,7 b' class InteractiveShell(SingletonConfigurable, Magic):' | |||||
1273 | # find things in the same order that Python finds them. |
|
1273 | # find things in the same order that Python finds them. | |
1274 | namespaces = [ ('Interactive', self.user_ns), |
|
1274 | namespaces = [ ('Interactive', self.user_ns), | |
1275 | ('IPython internal', self.internal_ns), |
|
1275 | ('IPython internal', self.internal_ns), | |
1276 |
('Python builtin', |
|
1276 | ('Python builtin', builtin_mod.__dict__), | |
1277 | ('Alias', self.alias_manager.alias_table), |
|
1277 | ('Alias', self.alias_manager.alias_table), | |
1278 | ] |
|
1278 | ] | |
1279 | alias_ns = self.alias_manager.alias_table |
|
1279 | alias_ns = self.alias_manager.alias_table |
@@ -31,5 +31,5 b' else:' | |||||
31 |
|
31 | |||
32 | # This next print statement is NOT debugging, we're making the check on a |
|
32 | # This next print statement is NOT debugging, we're making the check on a | |
33 | # completely separate process so we verify by capturing stdout: |
|
33 | # completely separate process so we verify by capturing stdout: | |
34 |
print |
|
34 | print('ARGV 1-:', sys.argv[1:]) | |
35 | sys.stdout.flush() |
|
35 | sys.stdout.flush() |
@@ -27,6 +27,7 b' from IPython.core.interactiveshell import InteractiveShell, InteractiveShellABC' | |||||
27 | from IPython.lib.inputhook import enable_gui |
|
27 | from IPython.lib.inputhook import enable_gui | |
28 | from IPython.lib.pylabtools import pylab_activate |
|
28 | from IPython.lib.pylabtools import pylab_activate | |
29 | from IPython.testing.skipdoctest import skip_doctest |
|
29 | from IPython.testing.skipdoctest import skip_doctest | |
|
30 | from IPython.utils import py3compat | |||
30 | from IPython.utils.terminal import toggle_set_term_title, set_term_title |
|
31 | from IPython.utils.terminal import toggle_set_term_title, set_term_title | |
31 | from IPython.utils.process import abbrev_cwd |
|
32 | from IPython.utils.process import abbrev_cwd | |
32 | from IPython.utils.warn import warn |
|
33 | from IPython.utils.warn import warn |
@@ -223,8 +223,8 b' def start_ipython():' | |||||
223 | # now return this without recursively calling here again. |
|
223 | # now return this without recursively calling here again. | |
224 | _ip = shell |
|
224 | _ip = shell | |
225 | get_ipython = _ip.get_ipython |
|
225 | get_ipython = _ip.get_ipython | |
226 |
|
|
226 | builtin_mod._ip = _ip | |
227 |
|
|
227 | builtin_mod.get_ipython = get_ipython | |
228 |
|
228 | |||
229 | # To avoid extra IPython messages during testing, suppress io.stdout/stderr |
|
229 | # To avoid extra IPython messages during testing, suppress io.stdout/stderr | |
230 | io.stdout = StreamProxy('stdout') |
|
230 | io.stdout = StreamProxy('stdout') |
@@ -46,6 +46,7 b' from zmq.eventloop.zmqstream import ZMQStream' | |||||
46 | from IPython.config.configurable import Configurable, LoggingConfigurable |
|
46 | from IPython.config.configurable import Configurable, LoggingConfigurable | |
47 | from IPython.utils.importstring import import_item |
|
47 | from IPython.utils.importstring import import_item | |
48 | from IPython.utils.jsonutil import extract_dates, squash_dates, date_default |
|
48 | from IPython.utils.jsonutil import extract_dates, squash_dates, date_default | |
|
49 | from IPython.utils.py3compat import str_to_bytes | |||
49 | from IPython.utils.traitlets import (CBytes, Unicode, Bool, Any, Instance, Set, |
|
50 | from IPython.utils.traitlets import (CBytes, Unicode, Bool, Any, Instance, Set, | |
50 | DottedObjectName) |
|
51 | DottedObjectName) | |
51 |
|
52 |
General Comments 0
You need to be logged in to leave comments.
Login now