Patchwork [U-Boot,v2,1/8] patman: Use ANSI colours only when outputting to a terminal

login
register
mail settings
Submitter Simon Glass
Date Dec. 15, 2012, 8:42 p.m.
Message ID <1355604128-12938-1-git-send-email-sjg@chromium.org>
Download mbox | patch
Permalink /patch/206637/
State Accepted, archived
Delegated to: Simon Glass
Headers show

Comments

Simon Glass - Dec. 15, 2012, 8:42 p.m.
It is easy to detect whether or not the process is connected to a terminal,
or piped to a file. Disable ANSI colours automatically when output is
not to a terminal.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2: None

 tools/patman/terminal.py |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

Patch

diff --git a/tools/patman/terminal.py b/tools/patman/terminal.py
index 838c828..8fad06e 100644
--- a/tools/patman/terminal.py
+++ b/tools/patman/terminal.py
@@ -24,6 +24,12 @@ 
 This module handles terminal interaction including ANSI color codes.
 """
 
+import os
+import sys
+
+# Selection of when we want our output to be colored
+COLOR_IF_TERMINAL, COLOR_ALWAYS, COLOR_NEVER = range(3)
+
 class Color(object):
   """Conditionally wraps text in ANSI color escape sequences."""
   BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = range(8)
@@ -32,14 +38,15 @@  class Color(object):
   BOLD_START = '\033[1m'
   RESET = '\033[0m'
 
-  def __init__(self, enabled=True):
+  def __init__(self, colored=COLOR_IF_TERMINAL):
     """Create a new Color object, optionally disabling color output.
 
     Args:
       enabled: True if color output should be enabled. If False then this
         class will not add color codes at all.
     """
-    self._enabled = enabled
+    self._enabled = (colored == COLOR_ALWAYS or
+        (colored == COLOR_IF_TERMINAL and os.isatty(sys.stdout.fileno())))
 
   def Start(self, color):
     """Returns a start color code.