r15763 - in /1.3: relax.py status.py -- April 17, 2012 - 17:01

Author: bugman
Date: Tue Apr 17 17:01:00 2012
New Revision: 15763

URL: http://svn.gna.org/viewcvs/relax?rev=15763&view=rev
Log:
Reverted r15756 as the status.text_colouring flag is no longer needed.

The command used was:
svn merge -r15756:r15755 .

.....
  r15756 | bugman | 2012-04-17 16:33:03 +0200 (Tue, 17 Apr 2012) | 6 lines
  Changed paths:
     M /1.3/relax.py
     M /1.3/status.py
  
  Added a flag to the status singleton object to signal if text output can be 
coloured.
  
  This is only activated when sys.stdout has not been changed.  Unix 
redirection and pipes will need
  to be handled later 
(http://mail.python.org/pipermail/python-list/2012-April/1291044.html).
.....


Modified:
    1.3/relax.py
    1.3/status.py

Modified: 1.3/relax.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/relax.py?rev=15763&r1=15762&r2=15763&view=diff
==============================================================================
--- 1.3/relax.py (original)
+++ 1.3/relax.py Tue Apr 17 17:01:00 2012
@@ -186,10 +186,6 @@
 
         # Run the interpreter for the prompt or script modes.
         if self.mode == 'prompt' or self.mode == 'script':
-            # Turn on text colouring.
-            if sys.stdout == sys.__stdout__:
-                status.text_colouring = True
-
             # Run the interpreter.
             self.interpreter = interpreter.Interpreter()
             self.interpreter.run(self.script_file)

Modified: 1.3/status.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/status.py?rev=15763&r1=15762&r2=15763&view=diff
==============================================================================
--- 1.3/status.py (original)
+++ 1.3/status.py Tue Apr 17 17:01:00 2012
@@ -97,9 +97,6 @@
         else:
             self.text_width = 100
 
-        # Text output colouring.
-        self.text_colouring = False
-
 
     def _setup_observers(self):
         """Set up all the observer objects."""