Commit e71b10ef authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

Added color configuration for HTTP 304, since it doesn't require as much... 

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
parent 3df1a16c

django/core/servers/basehttp.py

+2 −0
Original line number Diff line number Diff line
@@ -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':

django/utils/termcolors.py

+3 −0
Original line number Diff line number Diff line
@@ -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',) },

docs/ref/django-admin.txt

+2 −1
Original line number Diff line number Diff line
@@ -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.