r3696 - in /branches/N_state_model: ./ relax -- November 20, 2007 - 17:31

Author: bugman
Date: Tue Nov 20 17:31:39 2007
New Revision: 3696

URL: http://svn.gna.org/viewcvs/relax?rev=3696&view=rev
Log:
Merged revisions 3695 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r3695 | bugman | 2007-11-20 17:30:44 +0100 (Tue, 20 Nov 2007) | 3 lines
  
  Made the 'Debug' flag accessible to the functions of the relax interpreter 
module.
........

Modified:
    branches/N_state_model/   (props changed)
    branches/N_state_model/relax

Propchange: branches/N_state_model/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Nov 20 17:31:39 2007
@@ -1,1 +1,1 @@
-/1.3:1-3692
+/1.3:1-3692,3695

Modified: branches/N_state_model/relax
URL: 
http://svn.gna.org/viewcvs/relax/branches/N_state_model/relax?rev=3696&r1=3695&r2=3696&view=diff
==============================================================================
--- branches/N_state_model/relax (original)
+++ branches/N_state_model/relax Tue Nov 20 17:31:39 2007
@@ -68,7 +68,7 @@
 from io import IO
 from generic_fns.main import Generic
 from prompt.gpl import gpl
-from prompt.interpreter import Interpreter
+from prompt import interpreter
 import relax_errors
 import relax_warnings
 from specific_fns.main import Specific
@@ -129,9 +129,10 @@
         # Process the command line arguments and determine the relax mode.
         mode, log_file, tee_file = self.arguments()
 
-        # Set up the debugging flag.
+        # Place the debugging flag in a number of modules which don't have 
access to the 'self.relax' namespace.
         relax_errors.Debug = self.Debug
         relax_warnings.Debug = self.Debug
+        interpreter.Debug = self.Debug
 
         # Set up the pedantic flag.
         relax_warnings.Pedantic = self.Pedantic
@@ -159,7 +160,7 @@
             self.set_intro_string()
 
             # Run the interpreter.
-            self.interpreter = Interpreter(self)
+            self.interpreter = interpreter.Interpreter(self)
             self.interpreter.run()
 
         # Threading mode.