innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

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
This commit is contained in:
Russell Keith-Magee 2010-01-23 17:26:56 +00:00
parent 3df1a16c79
commit e71b10efb7
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/core/servers/basehttp.py
View File

@ -619,6 +619,8 @@ class WSGIRequestHandler(BaseHTTPRequestHandler):
msg = self.style.HTTP_SUCCESS(msg) msg = self.style.HTTP_SUCCESS(msg)
elif args[1][0] == '1': elif args[1][0] == '1':
msg = self.style.HTTP_INFO(msg) msg = self.style.HTTP_INFO(msg)
elif args[1] == '304':
msg = self.style.HTTP_NOT_MODIFIED(msg)
elif args[1][0] == '3': elif args[1][0] == '3':
msg = self.style.HTTP_REDIRECT(msg) msg = self.style.HTTP_REDIRECT(msg)
elif args[1] == '404': elif args[1] == '404':

3
django/utils/termcolors.py
View File

@ -81,6 +81,7 @@ PALETTES = {
'HTTP_INFO': {}, 'HTTP_INFO': {},
'HTTP_SUCCESS': {}, 'HTTP_SUCCESS': {},
'HTTP_REDIRECT': {}, 'HTTP_REDIRECT': {},
'HTTP_NOT_MODIFIED': {},
'HTTP_BAD_REQUEST': {}, 'HTTP_BAD_REQUEST': {},
'HTTP_NOT_FOUND': {}, 'HTTP_NOT_FOUND': {},
'HTTP_SERVER_ERROR': {}, 'HTTP_SERVER_ERROR': {},
@ -95,6 +96,7 @@ PALETTES = {
'HTTP_INFO': { 'opts': ('bold',) }, 'HTTP_INFO': { 'opts': ('bold',) },
'HTTP_SUCCESS': { }, 'HTTP_SUCCESS': { },
'HTTP_REDIRECT': { 'fg': 'green' }, 'HTTP_REDIRECT': { 'fg': 'green' },
'HTTP_NOT_MODIFIED': { 'fg': 'cyan' },
'HTTP_BAD_REQUEST': { 'fg': 'red', 'opts': ('bold',) }, 'HTTP_BAD_REQUEST': { 'fg': 'red', 'opts': ('bold',) },
'HTTP_NOT_FOUND': { 'fg': 'yellow' }, 'HTTP_NOT_FOUND': { 'fg': 'yellow' },
'HTTP_SERVER_ERROR': { 'fg': 'magenta', 'opts': ('bold',) }, 'HTTP_SERVER_ERROR': { 'fg': 'magenta', 'opts': ('bold',) },
@ -109,6 +111,7 @@ PALETTES = {
'HTTP_INFO': { 'opts': ('bold',) }, 'HTTP_INFO': { 'opts': ('bold',) },
'HTTP_SUCCESS': { }, 'HTTP_SUCCESS': { },
'HTTP_REDIRECT': { 'fg': 'green', 'opts': ('bold',) }, 'HTTP_REDIRECT': { 'fg': 'green', 'opts': ('bold',) },
'HTTP_NOT_MODIFIED': { 'fg': 'green' },
'HTTP_BAD_REQUEST': { 'fg': 'red', 'opts': ('bold',) }, 'HTTP_BAD_REQUEST': { 'fg': 'red', 'opts': ('bold',) },
'HTTP_NOT_FOUND': { 'fg': 'red' }, 'HTTP_NOT_FOUND': { 'fg': 'red' },
'HTTP_SERVER_ERROR': { 'fg': 'magenta', 'opts': ('bold',) }, 'HTTP_SERVER_ERROR': { 'fg': 'magenta', 'opts': ('bold',) },

3
docs/ref/django-admin.txt
View File

@ -1028,7 +1028,8 @@ number of roles in which color is used:
* ``sql_table`` - The name of a model in SQL. * ``sql_table`` - The name of a model in SQL.
* ``http_info`` - A 1XX HTTP Informational server response. * ``http_info`` - A 1XX HTTP Informational server response.
* ``http_success`` - A 2XX HTTP Success 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_not_found`` - A 404 HTTP Not Found server response.
* ``http_bad_request`` - A 4XX HTTP Bad Request server response other than 404. * ``http_bad_request`` - A 4XX HTTP Bad Request server response other than 404.
* ``http_server_error`` - A 5XX HTTP Server Error response. * ``http_server_error`` - A 5XX HTTP Server Error response.