r10313 - in /1.3: prompt/interpreter.py relax -- January 25, 2010 - 17:00

Author: bugman
Date: Mon Jan 25 17:00:12 2010
New Revision: 10313

URL: http://svn.gna.org/viewcvs/relax?rev=10313&view=rev
Log:
The relax main instance is no longer passed into the prompt/script interface.

This can be done as the prompt/script interface has been detached from relax.


Modified:
    1.3/prompt/interpreter.py
    1.3/relax

Modified: 1.3/prompt/interpreter.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/prompt/interpreter.py?rev=10313&r1=10312&r2=10313&view=diff
==============================================================================
--- 1.3/prompt/interpreter.py (original)
+++ 1.3/prompt/interpreter.py Mon Jan 25 17:00:12 2010
@@ -93,11 +93,9 @@
 
 
 class Interpreter:
-    def __init__(self, relax, intro_string=None, show_script=True, 
quit=True, raise_relax_error=False):
+    def __init__(self, intro_string=None, show_script=True, quit=True, 
raise_relax_error=False):
         """The interpreter class.
 
-        @param relax:               The relax instance.
-        @type relax:                instance
         @param intro_string:        The string to print at the start of 
execution.
         @type intro_string:         str
         @param show_script:         If true, the relax will print the script 
contents prior to
@@ -113,7 +111,6 @@
         """
 
         # Place the arguments in the class namespace.
-        self.relax = relax
         self.__intro_string = intro_string
         self.__show_script = show_script
         self.__quit_flag = quit

Modified: 1.3/relax
URL: 
http://svn.gna.org/viewcvs/relax/1.3/relax?rev=10313&r1=10312&r2=10313&view=diff
==============================================================================
--- 1.3/relax (original)
+++ 1.3/relax Mon Jan 25 17:00:12 2010
@@ -124,13 +124,13 @@
         # Run the interpreter for the prompt or script modes.
         if mode == 'prompt' or mode == 'script':
             # Run the interpreter.
-            self.interpreter = interpreter.Interpreter(self, intro_string)
+            self.interpreter = interpreter.Interpreter(intro_string)
             self.interpreter.run(self.script_file)
 
         # Execute the relax test suite
         elif mode == 'test suite':
             # Load the interpreter and turn intros on.
-            self.interpreter = interpreter.Interpreter(self, 
show_script=False, quit=False, raise_relax_error=True)
+            self.interpreter = interpreter.Interpreter(show_script=False, 
quit=False, raise_relax_error=True)
             self.interpreter._on()
 
             # Run the tests.
@@ -140,7 +140,7 @@
         # Execute the relax system tests.
         elif mode == 'system tests':
             # Load the interpreter and turn intros on.
-            self.interpreter = interpreter.Interpreter(self, 
show_script=False, quit=False, raise_relax_error=True)
+            self.interpreter = interpreter.Interpreter(show_script=False, 
quit=False, raise_relax_error=True)
             self.interpreter._on()
 
             # Run the tests.