From e71b10efb7366f9e80d54960d9e77cc527a7413e Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat, 23 Jan 2010 17:26:56 +0000
Subject: [PATCH] Added color configuration for HTTP 304, since it doesn't
 require as much attention as other 3XX codes.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12281 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/core/servers/basehttp.py | 2 ++
 django/utils/termcolors.py      | 3 +++
 docs/ref/django-admin.txt       | 3 ++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/django/core/servers/basehttp.py b/django/core/servers/basehttp.py
index d24eb5c2a38..dae42973793 100644
--- a/django/core/servers/basehttp.py
+++ b/django/core/servers/basehttp.py
@@ -619,6 +619,8 @@ class WSGIRequestHandler(BaseHTTPRequestHandler):
             msg = self.style.HTTP_SUCCESS(msg)
         elif args[1][0] == '1':
             msg = self.style.HTTP_INFO(msg)
+        elif args[1] == '304':
+            msg = self.style.HTTP_NOT_MODIFIED(msg)
         elif args[1][0] == '3':
             msg = self.style.HTTP_REDIRECT(msg)
         elif args[1] == '404':
diff --git a/django/utils/termcolors.py b/django/utils/termcolors.py
index 4bcf634061c..ccafb42524b 100644
--- a/django/utils/termcolors.py
+++ b/django/utils/termcolors.py
@@ -81,6 +81,7 @@ PALETTES = {
         'HTTP_INFO':         {},
         'HTTP_SUCCESS':      {},
         'HTTP_REDIRECT':     {},
+        'HTTP_NOT_MODIFIED': {},
         'HTTP_BAD_REQUEST':  {},
         'HTTP_NOT_FOUND':    {},
         'HTTP_SERVER_ERROR': {},
@@ -95,6 +96,7 @@ PALETTES = {
         'HTTP_INFO':         { 'opts': ('bold',) },
         'HTTP_SUCCESS':      { },
         'HTTP_REDIRECT':     { 'fg': 'green' },
+        'HTTP_NOT_MODIFIED': { 'fg': 'cyan' },
         'HTTP_BAD_REQUEST':  { 'fg': 'red', 'opts': ('bold',) },
         'HTTP_NOT_FOUND':    { 'fg': 'yellow' },
         'HTTP_SERVER_ERROR': { 'fg': 'magenta', 'opts': ('bold',) },
@@ -109,6 +111,7 @@ PALETTES = {
         'HTTP_INFO':         { 'opts': ('bold',) },
         'HTTP_SUCCESS':      { },
         'HTTP_REDIRECT':     { 'fg': 'green', 'opts': ('bold',) },
+        'HTTP_NOT_MODIFIED': { 'fg': 'green' },
         'HTTP_BAD_REQUEST':  { 'fg': 'red', 'opts': ('bold',) },
         'HTTP_NOT_FOUND':    { 'fg': 'red' },
         'HTTP_SERVER_ERROR': { 'fg': 'magenta', 'opts': ('bold',) },
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index af477597450..8ed489deb41 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -1028,7 +1028,8 @@ number of roles in which color is used:
     * ``sql_table`` - The name of a model in SQL.
     * ``http_info`` - A 1XX HTTP Informational server response.
     * ``http_success`` - A 2XX HTTP Success server response.
-    * ``http_redirect`` - A 3XX HTTP Redirect server response.
+    * ``http_not_modified`` - A 304 HTTP Not Modified server response.
+    * ``http_redirect`` - A 3XX HTTP Redirect server response other than 304.
     * ``http_not_found`` - A 404 HTTP Not Found server response.
     * ``http_bad_request`` - A 4XX HTTP Bad Request server response other than 404.
     * ``http_server_error`` - A 5XX HTTP Server Error response.