From 26078ecc175764c138b8415c70ba85aecbb81565 Mon Sep 17 00:00:00 2001
From: Andrea Crotti <andrea.crotti.0@gmail.com>
Date: Fri, 16 Mar 2012 14:50:26 +0000
Subject: [PATCH 1/2] remove unused colors and refactor more how the escaping
 is done

---
 pelican/log.py | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/pelican/log.py b/pelican/log.py
index 027743d0..c5e9b688 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -8,31 +8,25 @@ from logging import Formatter, getLogger, StreamHandler
 RESET_TERM = u'\033[0;m'
 
 
-def term_color(code):
-    return lambda text: code + unicode(text) + RESET_TERM
+def start_color(index):
+    return u'\033[1;{0}m'.format(index)
+
+
+def term_color(color):
+    code = COLOR_CODES[color]
+    return lambda text: start_color(code) + unicode(text) + RESET_TERM
 
 
 COLOR_CODES = {
-    'gray': u'\033[1;30m',
-    'red': u'\033[1;31m',
-    'green': u'\033[1;32m',
-    'yellow': u'\033[1;33m',
-    'blue': u'\033[1;34m',
-    'magenta': u'\033[1;35m',
-    'cyan': u'\033[1;36m',
-    'white': u'\033[1;37m',
-    'bgred': u'\033[1;41m',
-    'bggreen': u'\033[1;42m',
-    'bgbrown': u'\033[1;43m',
-    'bgblue': u'\033[1;44m',
-    'bgmagenta': u'\033[1;45m',
-    'bgcyan': u'\033[1;46m',
-    'bggray': u'\033[1;47m',
-    'bgyellow': u'\033[1;43m',
-    'bggrey': u'\033[1;100m',
+    'red': 31,
+    'yellow': 33,
+    'cyan': 36,
+    'white': 37,
+    'bgred': 41,
+    'bggrey': 100,
 }
 
-ANSI = dict((col, term_color(code)) for col, code in COLOR_CODES.items())
+ANSI = dict((col, term_color(col)) for col in COLOR_CODES)
 
 
 class ANSIFormatter(Formatter):

From 173133dbf34b322511feb36663e189709e505949 Mon Sep 17 00:00:00 2001
From: Andrea Crotti <andrea.crotti.0@gmail.com>
Date: Fri, 16 Mar 2012 14:53:28 +0000
Subject: [PATCH 2/2] remove couple of extra spaces

---
 pelican/log.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/log.py b/pelican/log.py
index c5e9b688..8811b372 100644
--- a/pelican/log.py
+++ b/pelican/log.py
@@ -1,6 +1,6 @@
 import os
 import sys
-from logging import CRITICAL, ERROR,  WARN, INFO, DEBUG
+from logging import CRITICAL, ERROR, WARN, INFO, DEBUG
 from logging import critical, error, info, warning, warn, debug
 from logging import Formatter, getLogger, StreamHandler
 
@@ -74,7 +74,7 @@ class DummyFormatter(object):
            and not sys.platform.startswith('win'):
             return ANSIFormatter(*args, **kwargs)
         else:
-            return TextFormatter( *args, **kwargs)
+            return TextFormatter(*args, **kwargs)
 
 
 def init(level=None, logger=getLogger(), handler=StreamHandler()):