##// END OF EJS Templates
Merging upstream changes from inputhook branch.
Brian Granger -
r2076:c2763ab5 merge
parent child Browse files
Show More
@@ -59,6 +59,9 b' for name in __all__:'
59 __import__(name,glob,loc,[])
59 __import__(name,glob,loc,[])
60
60
61 from IPython.core import shell
61 from IPython.core import shell
62 Shell = shell
63 from IPython.core import ipapi
64 from IPython.core import iplib
62
65
63 # Release data
66 # Release data
64 from IPython.core import release # do it explicitly so pydoc can see it - pydoc bug
67 from IPython.core import release # do it explicitly so pydoc can see it - pydoc bug
General Comments 0
You need to be logged in to leave comments. Login now