made history persistence optional

ricardokirkner · ricardokirkner · commit 941b8079f34d · 2009-04-10T21:33:35.000Z
- also included completer namespace initialization fix
diff --git a/cocos/interpreter/history/_readline.py b/cocos/interpreter/history/_readline.py
@@ -12,7 +12,7 @@ def load(self, filename, size):
         readline.set_history_length(size)
 
     def save(self):
-        if self.filename:
+        if self.persistent and self.filename:
             readline.write_history_file(self.filename)
 
     def reset(self, size):
diff --git a/cocos/interpreter/history/history.py b/cocos/interpreter/history/history.py
@@ -4,9 +4,10 @@
 
 class History(object):
 
-    def __init__(self, filename=None, size=100):
+    def __init__(self, filename=None, size=100, persistent=False):
         self.filename = filename
         self.size = size
+        self.persistent = persistent
         if filename and os.path.exists(filename):
             self.load(filename, size)
         else:
@@ -17,13 +18,13 @@ def __len__(self):
         return len(self.data)
 
     def __del__(self):
-        self.save()
+        self.persist()
 
     def load(self, filename, size):
         self.data = pickle.load(open(filename, 'rb'))
 
-    def save(self):
-        if self.filename:
+    def persist(self):
+        if self.persistent and self.filename:
             pickle.dump(self.data, open(self.filename, 'wb'))
 
     def reset(self, size):
diff --git a/cocos/interpreter/interpreter.py b/cocos/interpreter/interpreter.py
@@ -20,7 +20,8 @@
 class Interpreter(InteractiveInterpreter, EventDispatcher):
     def __init__(self, ns_locals=None, ns_globals=None,
                  stdin=None, stdout=None, stderr=None,
-                 history_file=None, history_size=100):
+                 history_file=None, history_size=100,
+                 history_persistent=False):
 
         # redirect input and output
         if stdin is None:
@@ -39,16 +40,19 @@ def __init__(self, ns_locals=None, ns_globals=None,
         if ns_globals is None:
             ns_globals = {}
 
-        self.history = self.init_history(history_file, history_size)
-        self.completer = self.init_completer(ns_locals)
-        super(Interpreter, self).__init__(locals=ns_locals)
+        self.history = self.init_history(history_file, history_size,
+                                         history_persistent)
+        namespace = ns_globals.copy()
+        namespace.update(ns_locals)
+        self.completer = self.init_completer(namespace)
+        super(Interpreter, self).__init__(locals=namespace)
 
-    def init_history(self, filename, size):
+    def init_history(self, filename, size, persistent):
         if has_readline:
             from history import ReadlineHistory
-            history = ReadlineHistory(filename, size)
+            history = ReadlineHistory(filename, size, persistent)
         else:
-            history = History(filename, size)
+            history = History(filename, size, persistent)
         return history
 
     def init_completer(self, namespace=None):
@@ -81,14 +85,14 @@ def toggle_env(self):
     # Common Events
     #################
     def on_exit(self):
-        self.history.save()
+        self.history.persist()
 
     #################
     # Command Events
     #################
     def on_command(self, command):
         self.execute(command)
-        self.stdout.dispatch_event('on_command_done')
+        self.dispatch_event('on_command_done')
 
     def on_completion(self, command):
         if not command.strip():
diff --git a/cocos/layer/interpreter.py b/cocos/layer/interpreter.py
@@ -21,14 +21,15 @@ class InterpreterLayer(Layer, EventDispatcher):
 
     history_file = '.cocos_history'
     history_size = 100
+    history_persistent = False
 
     is_event_handler = True     #: enable pyglet's events
 
-    def __init__(self, ns_locals=None):
+    def __init__(self, ns_locals=None, ns_globals=None):
         super(InterpreterLayer, self).__init__()
         self.init_config()
         self.init_background()
-        self.init_interpreter(ns_locals)
+        self.init_interpreter(ns_locals, ns_globals)
         self.init_text()
 
     def init_config(self):
@@ -52,14 +53,17 @@ def init_background(self):
             bg.y = bg_y
         self.add(bg, z=-1)
 
-    def init_interpreter(self, ns_locals=None):
-        if ns_locals is None:
-            ns_locals = director.interpreter_locals
-            ns_locals['self'] = self
+    def init_interpreter(self, ns_locals=None, ns_globals=None):
+        if ns_globals is None:
+            ns_globals = director.interpreter_locals
+            ns_globals['self'] = self
         self.interpreter = Interpreter(stdin=self, stdout=self, stderr=self,
-                                       ns_locals=ns_locals,
+                                       ns_locals=ns_locals, ns_globals=ns_globals,
                                        history_file=self.history_file,
-                                       history_size=self.history_size)
+                                       history_size=self.history_size,
+                                       history_persistent=self.history_persistent)
+        # register event handlers
+        self.interpreter.push_handlers(self)
 
     def init_text(self):
         self.content = self.prompt
