r15775 - in /1.3: prompt/interpreter.py relax_warnings.py -- April 17, 2012 - 19:50

Author: bugman
Date: Tue Apr 17 19:50:21 2012
New Revision: 15775

URL: http://svn.gna.org/viewcvs/relax?rev=15775&view=rev
Log:
The ANSI ending escape sequence is now always placed before the last newline.

This fixes some weirdness of the cursor or other parts being coloured when 
they should not be.


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

Modified: 1.3/prompt/interpreter.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/prompt/interpreter.py?rev=15775&r1=15774&r2=15775&view=diff
==============================================================================
--- 1.3/prompt/interpreter.py (original)
+++ 1.3/prompt/interpreter.py Tue Apr 17 19:50:21 2012
@@ -491,12 +491,16 @@
         sys.stdout.write("script = " + repr(script_file) + "\n")
         
sys.stdout.write("----------------------------------------------------------------------------------------------------\n")
         sys.stdout.write(file.read())
-        
sys.stdout.write("----------------------------------------------------------------------------------------------------\n")
+        
sys.stdout.write("----------------------------------------------------------------------------------------------------")
 
         # End coloured text.
         if sys.stdout.isatty():
             sys.stdout.write(ansi.end)
 
+        # Terminating newline.
+        sys.stdout.write("\n")
+
+        # Close the script file handle.
         file.close()
 
     # The execution flag.

Modified: 1.3/relax_warnings.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/relax_warnings.py?rev=15775&r1=15774&r2=15775&view=diff
==============================================================================
--- 1.3/relax_warnings.py (original)
+++ 1.3/relax_warnings.py Tue Apr 17 19:50:21 2012
@@ -60,7 +60,12 @@
 
     # Text colouring
     if sys.stderr.isatty():
-        message = "%s%s%s" % (ansi.relax_warning, message, ansi.end)
+        # Strip the last newline, if it exists.
+        if message[-1] == '\n':
+            message = message[:-1]
+
+        # Reformat.
+        message = "%s%s%s\n" % (ansi.relax_warning, message, ansi.end)
 
     # Return the warning message.
     return message