Changeset 3025

Timestamp:

06/22/08 19:10:55 (5 years ago)

Author:

nopper

Message:

New Console implementation

Location:

branch/UmitPlugins/source-plugins/umit-console/sources

Files:

• console/pyconsole.py (modified) (8 diffs)
• main.py (modified) (2 diffs)

branch/UmitPlugins/source-plugins/umit-console/sources/console/pyconsole.py

@@ -47 +47 @@
     return prefix
 
+class VirtualStdIn(object):
+    def __init__(self):
+        self.buffer = str()
+    
+    def feed(self, txt):
+        if txt:
+            self.buffer += txt
+    
+    def read(self, size):
+        t = self.buffer[0:size]
+        self.buffer = self.buffer[size + 1:]
+        return t
+    
+    def readline(self):
+        t = self.buffer.split('\n')
+        self.buffer = "\n".join(t[1:])
+        return t[0]
+    
+    def readlines(self):
+        t = self.buffer.split('\n')
+        self.buffer = ""
+        return t
+
 class _ReadLine(object):
 
@@ -108 +131 @@
         self.history = _ReadLine.History()
         self.nonword_re = re.compile("[^\w\._]")
+        self.my_stdin = VirtualStdIn()
 
     def freeze_undo(self):
@@ -212 +236 @@
         self.tab_pressed = 0
         handled = True
+        
+        self.my_stdin.feed(event.string)
 
         state = event.state & (gdk.SHIFT_MASK |
@@ -406 +432 @@
 
     def do_raw_input(self, text):
-        pass
-
-    def write(self,whatever):
+        print "HERE"
+
+    def write(self, whatever):
         self.buffer.insert_at_cursor(whatever)
-
+    
+    def readline(self):
+        self.my_stdin.readline()
 
 class _Console(_ReadLine, code.InteractiveInterpreter):
@@ -437 +465 @@
         self.run_on_raw_input = start_script
         self.raw_input(self.ps1)
-
+    
     def __start(self):
         self.cmd_buffer = ""
@@ -474 +502 @@
 
     def runcode(self, code):
-        saved = sys.stdout
+        savedo = sys.stdout
+        savedi = sys.stdin
+        
         sys.stdout = self
+        sys.stdin = self
+        
         try:
             eval(code, self.locals)
@@ -482 +514 @@
         except:
             self.showtraceback()
-        sys.stdout = saved
+            
+        sys.stdout = savedo
+        sys.stdin = savedi
 
     def complete_attr(self, start, end):
@@ -545 +579 @@
         return completions
 
-
 def ReadLineType(t=gtk.TextView):
     class readline(t, _ReadLine):

branch/UmitPlugins/source-plugins/umit-console/sources/main.py

@@ -22 +22 @@
 import sys
 
-import console.pyconsole as pyconsole
+import console.console as console
 
 # yes we can do it
@@ -32 +32 @@
 class ConsoleView(UmitView):
     def create_ui(self):
-        sw = gtk.ScrolledWindow()
-        sw.set_shadow_type(gtk.SHADOW_ETCHED_IN)
-        sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+        con = console.Console(globals())
+        con.banner()
 
-        sw.add(pyconsole.Console(banner="UMIT Python Shell"))
-        self._main_widget.add(sw)
+        self._main_widget.add(con)
         self._main_widget.show_all()