nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reuse termcolor's environment variable to disable colors

Browse source
This commit is contained in:
Laurent Bachelier 2013-08-03 01:09:45 +02:00
commit e78714b560
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
weboob/tools/application/console.py
View file

@ -63,7 +63,9 @@ class ConsoleApplication(BaseApplication):
CAPS = None CAPS = None
# shell escape strings # shell escape strings
if sys.platform == 'win32' or not os.isatty(sys.stdout.fileno()): if sys.platform == 'win32' \
or not os.isatty(sys.stdout.fileno()) \
or os.getenv('ANSI_COLORS_DISABLED') is not None:
#workaround to disable bold #workaround to disable bold
BOLD = '' BOLD = ''
NC = '' # no color NC = '' # no color

3
weboob/tools/application/formatters/iformatter.py
View file

@ -28,7 +28,8 @@ try:
from termcolor import colored from termcolor import colored
except ImportError: except ImportError:
def colored(s, color=None, on_color=None, attrs=None): def colored(s, color=None, on_color=None, attrs=None):
if attrs is not None and 'bold' in attrs: if os.getenv('ANSI_COLORS_DISABLED') is None \
and attrs is not None and 'bold' in attrs:
return '%s%s%s' % (IFormatter.BOLD, s, IFormatter.NC) return '%s%s%s' % (IFormatter.BOLD, s, IFormatter.NC)
else: else:
return s return s