mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-05 03:29:12 +00:00
Code Issues 32 Releases Wiki Activity

[1.6.x] Fixed #23265 -- Used system-specific encoding in runserver

Browse Source 
Thanks SpaceFox for the report.
Backport of 055d95fce066 from master.
This commit is contained in:
Claude Paroz 2014-08-14 11:56:25 +02:00
parent 123f490ae3
commit 99b5567796
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/core/management/commands/runserver.py
View File

@ -11,6 +11,7 @@ import socket
from django.core.management.base import BaseCommand, CommandError from django.core.management.base import BaseCommand, CommandError
from django.core.servers.basehttp import run, get_internal_wsgi_application from django.core.servers.basehttp import run, get_internal_wsgi_application
from django.utils import autoreload from django.utils import autoreload
from django.utils.encoding import get_system_encoding
from django.utils import six from django.utils import six
naiveip_re = re.compile(r"""^(?: naiveip_re = re.compile(r"""^(?:
@ -101,7 +102,7 @@ class Command(BaseCommand):
self.validate(display_num_errors=True) self.validate(display_num_errors=True)
now = datetime.now().strftime('%B %d, %Y - %X') now = datetime.now().strftime('%B %d, %Y - %X')
if six.PY2: if six.PY2:
now = now.decode('utf-8') now = now.decode(get_system_encoding())
self.stdout.write(( self.stdout.write((
"%(started_at)s\n" "%(started_at)s\n"

3
docs/releases/1.6.6.txt
View File

@ -33,3 +33,6 @@ Bugfixes
* Restored bug fix for sending unicode email with Python 2.6.5 and below * Restored bug fix for sending unicode email with Python 2.6.5 and below
(`#19107 <https://code.djangoproject.com/ticket/19107>`_). (`#19107 <https://code.djangoproject.com/ticket/19107>`_).
* Prevented ``UnicodeDecodeError`` in ``runserver`` with non-UTF-8 and
non-English locale (`#23265 <https://code.djangoproject.com/ticket/23265>`_).