X-Git-Url: https://jfr.im/git/z_archive/twitter.git/blobdiff_plain/a90963cc0bd68b743b86857748034dab521579fc..3756d82e3400879e3ac632d535bdb6d112faecff:/twitter/ansi.py

diff --git a/twitter/ansi.py b/twitter/ansi.py
index ae99ddb..0a84564 100644
--- a/twitter/ansi.py
+++ b/twitter/ansi.py
@@ -15,6 +15,7 @@ Support for ANSI colours in command-line client.
 """
 
 import itertools
+import sys
 
 ESC = chr(0x1B)
 RESET = "0"
@@ -50,16 +51,22 @@ class ColourMap(object):
             self._cmap[string] = self._colourIter.next()
         return self._cmap[string]
 
+def cmdReset():
+    ''' Returns the ansi cmd colour for a RESET '''
+    if sys.stdout.isatty():
+        return ESC + "[0m"
+    else:
+        return ""
+
 def cmdColour(colour):
     '''
     Return the ansi cmd colour (i.e. escape sequence)
     for the ansi `colour` value
     '''
-    return ESC + "[" + colour + "m"
-
-def cmdReset():
-    ''' Returns the ansi cmd colour for a RESET '''
-    return cmdColour(RESET)
+    if sys.stdout.isatty():
+        return ESC + "[" + colour + "m"
+    else:
+        return ""
 
 def cmdColourNamed(colour):
     ''' Return the ansi cmdColour for a given named `colour` '''