ipy_leo: @ipy-startup children are run in sequence, not ipy_startup itself

IPython/Extensions/ipy_leo.py

@@ -234,31 +234,18 b' def eval_body(body):'
         val = IPython.genutils.SList(body.splitlines())
     return val 
     
-def push_variable(p,varname):    
-    try:
-        val = eval_node(LeoNode(p))
-    except:
-        
-        body = p.bodyString()
-        val = IPython.genutils.SList(body.splitlines())
-        
-    ip.user_ns[varname] = val
-    es('ipy var: %s' % (varname,))
-
 def push_plain_python(p):
     script = g.getScript(c,p,useSelectedText=False,forcePythonSentinels=False,useSentinels=False)
-    exec script in ip.user_ns
+    try:
+        exec script in ip.user_ns
+    except:
+        print " -- Exception in script:\n"+script + "\n --"
+        raise
     es('ipy plain: %s' % (p.headString(),))
     
 def push_from_leo(p):
     nod = LeoNode(p)
     h =  p.headString()   
-    tup = h.split(None,1)
-    # @ipy foo is variable foo
-    if len(tup) == 2 and tup[0] == '@ipy':
-        varname = tup[1]
-        push_variable(p,varname)
-        return
     if h.endswith('P'):
         push_plain_python(p)
         return
@@ -324,8 +311,11 b' def show_welcome():'
 def run_leo_startup_node():
     p = g.findNodeAnywhere(c,'@ipy-startup')
     if p:
-        print "Running @ipy-startup"
-        push_script(p)
+        print "Running @ipy-startup nodes"
+        for n in LeoNode(p):
+            push_from_leo(n.p)
+            
+            
 
 run_leo_startup_node()
 show_welcome()

doc/examples/leo_bridge_demo.leo

@@ -3,7 +3,7 b''
 <leo_file>
 <leo_header file_format="2" tnodes="0" max_tnode_index="0" clone_windows="0"/>
 <globals body_outline_ratio="0.5">
-	<global_window_position top="250" left="207" height="621" width="1280"/>
+	<global_window_position top="161" left="139" height="621" width="1280"/>
 	<global_log_window_position top="0" left="0" height="0" width="0"/>
 </globals>
 <preferences/>
@@ -12,11 +12,11 b''
 <v t="vivainio.20080218184525"><vh>@chapters</vh></v>
 <v t="vivainio.20080218184540" a="E"><vh>@ipy-startup</vh>
 <v t="vivainio.20080218184613.1"><vh>b</vh></v>
-<v t="vivainio.20080218200031" a="E"><vh>Some classes P</vh>
+<v t="vivainio.20080218200031" a="ETV"><vh>Some classes P</vh>
 <v t="vivainio.20080218190816"><vh>File-like access</vh></v>
 <v t="vivainio.20080218200106"><vh>csv data</vh></v>
 <v t="vivainio.20080219225120"><vh>String list</vh></v>
-<v t="vivainio.20080219230342" a="TV"><vh>slist to leo</vh></v>
+<v t="vivainio.20080219230342"><vh>slist to leo</vh></v>
 </v>
 </v>
 <v t="vivainio.20080218195413"><vh>Class tests</vh>
@@ -25,15 +25,15 b''
 <v t="vivainio.20080218195413.1"><vh>rfile</vh></v>
 <v t="vivainio.20080219225804"><vh>strlist</vh></v>
 </v>
-<v t="vivainio.20080218201219" a="E"><vh>Direct variables</vh>
+<v t="vivainio.20080218201219"><vh>Direct variables</vh>
 <v t="vivainio.20080218201219.2" a="E"><vh>bar</vh></v>
 </v>
 </vnodes>
 <tnodes>
 <t tx="vivainio.20080218184525">?</t>
-<t tx="vivainio.20080218184540"># this stuff will be pushed at ipython bridge startup
+<t tx="vivainio.20080218184540">?Direct children of this node will be pushed at ipython bridge startup
 
-@others</t>
+This node itself will *not* be pushed</t>
 <t tx="vivainio.20080218184613.1">print "world"</t>
 <t tx="vivainio.20080218190816">def rfile(body,n):
     """ @cl rfile 
@@ -66,7 +66,7 b' lines'
 should 
 be
 readable </t>
-<t tx="vivainio.20080218200031"></t>
+<t tx="vivainio.20080218200031">@others</t>
 <t tx="vivainio.20080218200106">def csvdata(body,n):
     import csv
     d = csv.Sniffer().sniff(body)
@@ -90,7 +90,8 b' on'
 many
 lines
 </t>
-<t tx="vivainio.20080219230342">@ipy_leo.format_for_leo.when_type(IPython.genutils.SList)
+<t tx="vivainio.20080219230342">import ipy_leo
+@ipy_leo.format_for_leo.when_type(IPython.genutils.SList)
 def format_slist(obj):
     return "@cl slist\n" + obj.n
 </t>