Shell.py => core/shell.py and imports updated.

IPython/__init__.py

@@ -49,7 +49,7 b' sys.path.append(os.path.dirname(__file__) + "/Extensions")'
 
 # Define what gets imported with a 'from IPython import *'
 __all__ = ['IPython.core.ipapi','utils.generics','utils.ipstruct',
-    'core.release','Shell']
+    'core.release','core.shell']
 
 # Load __all__ in IPython namespace so that a simple 'import IPython' gives
 # access to them via IPython.<name>
@@ -58,7 +58,7 b' for name in __all__:'
     #print 'Importing: ',name # dbg
     __import__(name,glob,loc,[])
 
-import Shell
+from IPython.core import shell
 
 # Release data
 from IPython.core import release # do it explicitly so pydoc can see it - pydoc bug

IPython/core/ipapi.py

@@ -679,7 +679,7 b' def make_session(user_ns = None, shellclass = None):'
     
     WARNING: This should *not* be run when a session exists already."""
 
-    import IPython.Shell
+    import IPython.core.shell
     if shellclass is None:
-        return IPython.Shell.start(user_ns)
+        return IPython.core.shell.start(user_ns)
     return shellclass(user_ns = user_ns)

IPython/core/tests/test_imports.py

@@ -57,3 +57,6 b' def test_import_release():'
 
 def test_import_shadowns():
     from IPython.core import shadowns
+
+def test_import_shell():
+    from IPython.core import shell

IPython/gui/wx/ipshell_nonblocking.py

@@ -156,11 +156,11 b' class NonBlockingIPShell(object):'
         #Hack to save sys.displayhook, because ipython seems to overwrite it...
         self.sys_displayhook_ori = sys.displayhook
         
-        self._IP = IPython.Shell.make_IPython(
+        self._IP = IPython.shell.make_IPython(
                                     argv,user_ns=user_ns,
                                     user_global_ns=user_global_ns,
                                     embedded=True,
-                                    shell_class=IPython.Shell.InteractiveShell)
+                                    shell_class=IPython.shell.InteractiveShell)
 
         #we save ipython0 displayhook and we restore sys.displayhook
         self.displayhook = sys.displayhook
@@ -470,7 +470,7 b' class NonBlockingIPShell(object):'
         '''
 
         orig_stdout = sys.stdout
-        sys.stdout = IPython.Shell.Term.cout
+        sys.stdout = IPython.shell.Term.cout
         #self.sys_displayhook_ori = sys.displayhook
         #sys.displayhook = self.displayhook
         

IPython/kernel/magic.py

@@ -18,7 +18,7 b' __docformat__ = "restructuredtext en"'
 import new
 
 from IPython.core.iplib import InteractiveShell
-from IPython.Shell import MTInteractiveShell
+from IPython.core.shell import MTInteractiveShell
 
 from twisted.internet.defer import Deferred
 

IPython/testing/iptest.py

@@ -195,7 +195,7 b' def make_runners():'
     """
     
     # This omits additional top-level modules that should not be doctested.
-    # XXX: Shell.py is also ommited because of a bug in the skip_doctest
+    # XXX: shell.py is also ommited because of a bug in the skip_doctest
     # decorator.  See ticket https://bugs.launchpad.net/bugs/366209
     top_mod = \
       ['backgroundjobs.py', 'coloransi.py', 'completer.py', 'configloader.py',
@@ -209,7 +209,7 b' def make_runners():'
        'shellglobals.py', 'strdispatch.py', 'twshell.py',
        'ultraTB.py', 'upgrade_dir.py', 'usage.py', 'wildcard.py',
        # See note above for why this is skipped
-       # 'Shell.py',
+       # 'shell.py',
        'winconsole.py']
 
     if have_pexpect:

IPython/testing/plugin/ipdoctest.py

@@ -185,7 +185,7 b' def start_ipython():'
     
     # Start IPython instance.  We customize it to start with minimal frills.
     user_ns,global_ns = ipapi.make_user_namespaces(ipnsdict(),dict())
-    IPython.Shell.IPShell(argv,user_ns,global_ns)
+    IPython.shell.IPShell(argv,user_ns,global_ns)
 
     # Deactivate the various python system hooks added by ipython for
     # interactive convenience so we don't confuse the doctest system

IPython/usage.py

@@ -113,7 +113,7 b' A WARNING ABOUT SIGNALS AND THREADS'
        interpreter itself, and it comes from the difficulty of writing
        portable signal/threaded code.  If any user is an expert on this topic
        and can suggest a better solution, I would love to hear about it.  In
-       the IPython sources, look at the Shell.py module, and in particular at
+       the IPython sources, look at the shell.py module, and in particular at
        the runcode() method.
 
 REGULAR OPTIONS