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

[1.8.x] Fixed #25204 -- Added missing space in runserver logging. 

Backport of 1a76257b1b from master
This commit is contained in:
Tim Graham 2015-07-31 12:45:27 -04:00
parent ef5cf564bf
commit 6bb8258255
2 changed files with 11 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

@ -107,7 +107,7 @@ class WSGIRequestHandler(simple_server.WSGIRequestHandler, object):
def log_message(self, format, *args): def log_message(self, format, *args):
msg = "[%s]" % self.log_date_time_string() msg = "[%s] " % self.log_date_time_string()
try: try:
msg += "%s\n" % (format % args) msg += "%s\n" % (format % args)
except UnicodeDecodeError: except UnicodeDecodeError:

10
tests/servers/test_basehttp.py
View File

@ -12,6 +12,16 @@ class Stub(object):
class WSGIRequestHandlerTestCase(TestCase): class WSGIRequestHandlerTestCase(TestCase):
def test_log_message(self):
request = WSGIRequest(RequestFactory().get('/').environ)
request.makefile = lambda *args, **kwargs: BytesIO()
handler = WSGIRequestHandler(request, '192.168.0.2', None)
with captured_stderr() as stderr:
handler.log_message('GET %s %s', 'A', 'B')
self.assertIn('] GET A B', stderr.getvalue())
def test_https(self): def test_https(self):
request = WSGIRequest(RequestFactory().get('/').environ) request = WSGIRequest(RequestFactory().get('/').environ)
request.makefile = lambda *args, **kwargs: BytesIO() request.makefile = lambda *args, **kwargs: BytesIO()