python

packages/python/yap_kernel/yap_ipython/yapi.py

@@ -709,6 +709,7 @@ class YAPRun:
         self.shell.displayhook.exec_result = self.result
         has_raised = False
         try:
+            self.yapeng.mgoal(streams(True),"user", True)
             self.bindings = dicts = []
             if cell.strip('\n \t'):
                 #create a Trace object, telling it what to ignore, and whether to
@@ -725,16 +726,16 @@ class YAPRun:
                 # run the new command using the given tracer
                 #
                 # tracer.runfunc(f,self,cell,state)
-                self.yapeng.mgoal(streams(True),"user", True)
                 self.jupyter_query( cell )
-                self.yapeng.mgoal(streams(False),"user", True)
                 # state = tracer.runfunc(jupyter_query( self, cell ) )
             self.shell.last_execution_succeeded = True
             self.result.result    = (True, dicts)
-            
+            self.yapeng.mgoal(streams(False),"user", True)
+
         except Exception as e:
             has_raised = True
             self.result.result = False
+            self.yapeng.mgoal(streams(False),"user", True)
 
         self.shell.last_execution_succeeded = not has_raised
 
@@ -771,7 +772,7 @@ class YAPRun:
         else:
             taken = l0-(i-1)
             n = s[i+1:].strip()
-            s = s[:i-1]
+            s = s[:i]
             if n:
                 its = 0
                 for ch in n: