ipapi: allow specifying shell class in launch_new_instance & make_new instance. Use this in test_embed.py

IPython/ipapi.py

@@ -533,7 +533,7 b' class DebugTools:'
         if name in self.hotnames:
             self.debug_stack( "HotName '%s' caught" % name)
 
-def launch_new_instance(user_ns = None):
+def launch_new_instance(user_ns = None,shellclass = None):
     """ Make and start a new ipython instance.
     
     This can be called even without having an already initialized 
@@ -542,7 +542,7 b' def launch_new_instance(user_ns = None):'
     This is also used as the egg entry point for the 'ipython' script.
     
     """
-    ses = make_session(user_ns)
+    ses = make_session(user_ns,shellclass)
     ses.mainloop()
 
 
@@ -578,7 +578,7 b' def make_user_global_ns(ns = None):'
     return ns
 
 
-def make_session(user_ns = None):
+def make_session(user_ns = None, shellclass = None):
     """Makes, but does not launch an IPython session.
     
     Later on you can call obj.mainloop() on the returned object.
@@ -591,6 +591,6 b' def make_session(user_ns = None):'
     WARNING: This should *not* be run when a session exists already."""
 
     import IPython.Shell
-    return IPython.Shell.start(user_ns)
-
-
+    if shellclass is None:
+        return IPython.Shell.start(user_ns)
+    return shellclass(user_ns = user_ns)

test/test_embed.py

@@ -6,27 +6,37 b' user namespace.'
 """
 
 import sys
-sys.path.append('..')
+sys.path.insert(1,'..')
 
 import IPython.ipapi
 
-my_ns = dict(a=10)
 
-ses = IPython.ipapi.make_session(my_ns)
 
-# Now get the ipapi instance, to be stored somewhere in your program for manipulation of the running 
-# IPython session. See http://ipython.scipy.org/moin/IpythonExtensionApi
-
-ip = ses.IP.getapi()   
-
-# let's play with the ipapi a bit, creating a magic function for a soon-to-be-started IPython
-def mymagic_f(self,s):
-    print "mymagic says",s
-
-ip.expose_magic("mymagic",mymagic_f)
-
-# And finally, start the IPython interaction! This will block until you say Exit.
-
-ses.mainloop()
-
-print "IPython session finished! namespace content:",my_ns
+def test_session(shellclass):
+    print "*****************\nLaunch shell for",shellclass
+    my_ns = dict(a=10)
+    ses = IPython.ipapi.make_session(my_ns)
+    
+    # Now get the ipapi instance, to be stored somewhere in your program for manipulation of the running 
+    # IPython session. See http://ipython.scipy.org/moin/IpythonExtensionApi
+    
+    ip = ses.IP.getapi()   
+    
+    # let's play with the ipapi a bit, creating a magic function for a soon-to-be-started IPython
+    def mymagic_f(self,s):
+        print "mymagic says",s
+    
+    ip.expose_magic("mymagic",mymagic_f)
+    
+    # And finally, start the IPython interaction! This will block until you say Exit.
+    
+    ses.mainloop()
+    
+    print "IPython session for shell ",shellclass," finished! namespace content:"
+    for k,v in my_ns.items():
+        print k,':',str(v)[:80].rstrip()
+    
+import  IPython.Shell    
+
+test_session(shellclass = None)
+test_session(IPython.Shell._select_shell(['ipython', '-q4thread']))