diff --git a/IPython/shellglobals.py b/IPython/core/shellglobals.py similarity index 100% rename from IPython/shellglobals.py rename to IPython/core/shellglobals.py diff --git a/IPython/core/tests/test_imports.py b/IPython/core/tests/test_imports.py index 6ce9f11..14fd954 100644 --- a/IPython/core/tests/test_imports.py +++ b/IPython/core/tests/test_imports.py @@ -60,3 +60,6 @@ def test_import_shadowns(): def test_import_shell(): from IPython.core import shell + +def test_import_shellglobals(): + from IPython.core import shellglobals diff --git a/IPython/deathrow/twshell.py b/IPython/deathrow/twshell.py index 888001f..06fd047 100644 --- a/IPython/deathrow/twshell.py +++ b/IPython/deathrow/twshell.py @@ -12,7 +12,7 @@ from IPython.utils.ipstruct import Struct import Queue,thread,threading,signal from signal import signal, SIGINT from IPython.utils.genutils import Term,warn,error,flag_calls, ask_yes_no -import shellglobals +from IPython.core import shellglobals def install_gtk2(): """ Install gtk2 reactor, needs to be called bef """