Changeset 860

Timestamp:

09/19/05 16:15:39 (3 years ago)

Author:

rkern

Message:

Restored output cache and input history

Files:

• nbshell/trunk/ChangeLog (modified) (1 diff)
• nbshell/trunk/nbshell/IPythonLog.py (modified) (5 diffs)

nbshell/trunk/ChangeLog

@@ +1 @@
+2005-09-19  Robert Kern  <robert.kern@gmail.com>
+
+    * IPythonLog.py (IPythonLog.__init__, displayhook, __run): Restored
+    output cache and input history functionality via the In and Out
+    variables.
+
+
-2005-09-18  Tzanko Matev  <tsanko@gmail.com>
-

nbshell/trunk/nbshell/IPythonLog.py

@@ -17 +17 @@
-import StringIO
-import textwrap
+import __builtin__
+import pprint
-
-from wx.py.buffer import Buffer
@@ -28 +30 @@
-
-from IPython import Shell
+from IPython import genutils
+from IPython.Magic import Macro
-from notabene import notebook
-
@@ -87 +91 @@
-        excepthook_orig = sys.excepthook
-        self.interp = Shell.IPShellGUI(argv=['-colors','NoColor'], user_ns=user_ns)
+
+        self.interp_log = self.interp.IP.log
+        def donothing(*args, **kwds):
+            pass
+        self.interp.IP.log = donothing
+        del self.interp.IP.input_hist[0]
+
-        self.excepthook_IP = sys.excepthook
-        sys.excepthook = excepthook_orig
@@ -241 +252 @@
-        #TODO:this could be prettier
-        self.currentcell = cell
+
+        # Add the whole input to the input history (ignoring the leading and
+        # trailing '\n')
+        self.interp_log(cell.input[1:-1], False)
+
-        #The first and last characters of cell.input are '\n'
-        retval = self.interp.runlines(cell.input[1:-1],\
@@ -284 +300 @@
-        
-    def displayhook(self, obj):
+        # RTK: modified from IPython.Prompts.CachedOutput.__call__()
+        
+        slf = self.interp.IP.outputcache
+        slf.prompt_count = self.currentcell.number
+
-        #print >> self.stdout_orig,  'displayhook called' #dbg
-        # We want to keep only the last output
-        if obj is not None:
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+