|
@@ -24,6 +24,12 @@
|
|
This module handles terminal interaction including ANSI color codes.
|
|
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):
|
|
class Color(object):
|
|
"""Conditionally wraps text in ANSI color escape sequences."""
|
|
"""Conditionally wraps text in ANSI color escape sequences."""
|
|
BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = range(8)
|
|
BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = range(8)
|
|
@@ -32,14 +38,15 @@ class Color(object):
|
|
BOLD_START = '\033[1m'
|
|
BOLD_START = '\033[1m'
|
|
RESET = '\033[0m'
|
|
RESET = '\033[0m'
|
|
|
|
|
|
- def __init__(self, enabled=True):
|
|
|
|
|
|
+ def __init__(self, colored=COLOR_IF_TERMINAL):
|
|
"""Create a new Color object, optionally disabling color output.
|
|
"""Create a new Color object, optionally disabling color output.
|
|
|
|
|
|
Args:
|
|
Args:
|
|
enabled: True if color output should be enabled. If False then this
|
|
enabled: True if color output should be enabled. If False then this
|
|
class will not add color codes at all.
|
|
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):
|
|
def Start(self, color):
|
|
"""Returns a start color code.
|
|
"""Returns a start color code.
|