From c2763ab5ae441c87fc6270471f53ad327481a76c 2009-07-22 20:57:13 From: Brian Granger Date: 2009-07-22 20:57:13 Subject: [PATCH] Merging upstream changes from inputhook branch. --- diff --git a/IPython/__init__.py b/IPython/__init__.py index 20632fd..d44f528 100644 --- a/IPython/__init__.py +++ b/IPython/__init__.py @@ -59,6 +59,9 @@ for name in __all__: __import__(name,glob,loc,[]) from IPython.core import shell +Shell = shell +from IPython.core import ipapi +from IPython.core import iplib # Release data from IPython.core import release # do it explicitly so pydoc can see it - pydoc bug