From a9725c5139f44a865e19bd09f6a1ad74afee7098 Mon Sep 17 00:00:00 2001 From: Olivier Verdier Date: Fri, 26 Aug 2011 10:51:04 +0200 Subject: [PATCH] using termstyle instead of termcolor --- README.rst | 2 +- pydflatex/typesetter.py | 15 +++++++++++---- requirements.txt | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/README.rst b/README.rst index f712713..790cfe6 100644 --- a/README.rst +++ b/README.rst @@ -44,4 +44,4 @@ Requirements ************ - Python v.2.6 (because of the new string formatting) -- ``termcolor`` (optional but strongly advised): to display results in colour \ No newline at end of file +- ``termstyle`` (optional but strongly advised): to display results in colour diff --git a/pydflatex/typesetter.py b/pydflatex/typesetter.py index 69c570b..b55cbd6 100755 --- a/pydflatex/typesetter.py +++ b/pydflatex/typesetter.py @@ -114,14 +114,21 @@ class LaTeXLoggerColour(LaTeXLogger): 'info': {'attrs': ['bold']} } - def styled(self, msg, colour): - return colored(msg, **self.colours[colour]) + def styled(self, msg, style): + style_specs = self.colours[style] + color = style_specs.get('color') + styled = msg + if color: + styled = getattr(termstyle, style_specs['color'])(styled) + for attr in style_specs.get('attrs',[]): + styled = getattr(termstyle, attr)(styled) + return styled try: - from termcolor import colored + import termstyle except ImportError: import warnings - warnings.warn('termcolor was not found: in black and white it will be') + warnings.warn('termstyle was not found: in black and white it will be') LaTeXLoggerColour = LaTeXLogger latex_logger = LaTeXLogger('pydflatex') diff --git a/requirements.txt b/requirements.txt index 6a99057..7ee324b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -termcolor +termstyle nose