r3706 - /1.3/relax -- November 20, 2007 - 18:03

Author: bugman
Date: Tue Nov 20 18:03:16 2007
New Revision: 3706

URL: http://svn.gna.org/viewcvs/relax?rev=3706&view=rev
Log:
Fix for the renaming of io.py to relax_io.py.

The module renaming has been taken into account as well as the eventual 
removal of the IO class and
the conversion from class methods to module functions.


Modified:
    1.3/relax

Modified: 1.3/relax
URL: 
http://svn.gna.org/viewcvs/relax/1.3/relax?rev=3706&r1=3705&r2=3706&view=diff
==============================================================================
--- 1.3/relax (original)
+++ 1.3/relax Tue Nov 20 18:03:16 2007
@@ -65,11 +65,11 @@
 
 # relax modules.
 from colour import Colour
-from io import IO
 from generic_fns.main import Generic
 from prompt.gpl import gpl
 from prompt import interpreter
 import relax_errors
+from relax_io import log
 import relax_warnings
 from specific_fns.main import Specific
 from specific_fns.specific_setup import Specific_setup
@@ -108,9 +108,6 @@
         # The thread data storage object.
         self.thread_data = ThreadData()
 
-        # File operation functions.
-        self.IO = IO(self)
-
         # Colour operations.
         self.colour = Colour()
 
@@ -148,11 +145,11 @@
 
         # Logging.
         if log_file and mode != 'thread':
-            self.IO.log(log_file)
+            log(log_file)
 
         # Tee.
         elif tee_file and mode != 'thread':
-            self.IO.tee(tee_file)
+            tee(tee_file)
 
         # Run the interpreter for the prompt or script modes.
         if mode == 'prompt' or mode == 'script':
@@ -171,11 +168,11 @@
 
             # Logging (silent IO redirection).
             if log_file:
-                self.IO.log(log_file, print_flag=0)
+                log(log_file, print_flag=0)
 
             # Tee (silent IO redirection).
             elif tee_file:
-                self.IO.tee(tee_file, print_flag=0)
+                tee(tee_file, print_flag=0)
 
             # Execute the script.
             self.threading.execute()