Ticket #7679: colorize_runserver.py.patch

core/management/color.py

@@ -5 +5 @@
 import sys
 
 from django.utils import termcolors
+from django.conf import settings
 
 def supports_color():
     """
@@ -21 +22 @@
 
 def color_style():
     """Returns a Style object with the Django color scheme."""
-    if not supports_color():
+    color_enabled = getattr( settings, 'COLORIZE_CONSOLE', False )
+    if False == color_enabled or not supports_color():
         return no_style()
     class dummy: pass
     style = dummy()
-    style.ERROR = termcolors.make_style(fg='red', opts=('bold',))
+    style.ERROR        = termcolors.make_style(fg='red', opts=('bold',))
     style.ERROR_OUTPUT = termcolors.make_style(fg='red', opts=('bold',))
-    style.NOTICE = termcolors.make_style(fg='red')
-    style.SQL_FIELD = termcolors.make_style(fg='green', opts=('bold',))
-    style.SQL_COLTYPE = termcolors.make_style(fg='green')
-    style.SQL_KEYWORD = termcolors.make_style(fg='yellow')
-    style.SQL_TABLE = termcolors.make_style(opts=('bold',))
+    style.NOTICE       = termcolors.make_style(fg='red')
+    style.SQL_FIELD    = termcolors.make_style(fg='green', opts=('bold',))
+    style.SQL_COLTYPE  = termcolors.make_style(fg='green')
+    style.SQL_KEYWORD  = termcolors.make_style(fg='yellow')
+    style.SQL_TABLE    = termcolors.make_style(opts=('bold',))
+    style.NOT_FOUND    = termcolors.make_style(fg='yellow', opts=('bold',))
+    style.UNAUTHORIZED = termcolors.make_style(fg='red', opts=('reverse',))
     return style
 
 def no_style():

core/servers/basehttp.py

@@ -15 +15 @@
 import urllib
 
 from django.utils.http import http_date
+from django.core.management.color import color_style
 
 __version__ = "0.1"
 __all__ = ['WSGIServer','WSGIRequestHandler']
@@ -554 +555 @@
         # We set self.path to avoid crashes in log_message() on unsupported
         # requests (like "OPTIONS").
         self.path = ''
+        self.style = color_style()
         BaseHTTPRequestHandler.__init__(self, *args, **kwargs)
 
     def get_environ(self):
@@ -605 +607 @@
         # Don't bother logging requests for admin images or the favicon.
         if self.path.startswith(self.admin_media_prefix) or self.path == '/favicon.ico':
             return
-        sys.stderr.write("[%s] %s\n" % (self.log_date_time_string(), format % args))
+        msg = "[%s] %s\n" % (self.log_date_time_string(), format % args)
 
+        # utilize terminal colors, if available
+        if '404' == args[1]:
+            msg = self.style.NOT_FOUND(msg)
+        if '401' == args[1]:
+            msg = self.style.UNAUTHORIZED(msg)
+        elif '500' == args[1]:
+            msg = self.style.ERROR(msg)
+
+        sys.stderr.write(msg)
+
 class AdminMediaHandler(object):
     """
     WSGI middleware that intercepts calls to the admin media directory, as