[1.7.x] Fixed #23265 -- Used system-specific encoding in runserver
Thanks SpaceFox for the report.
Backport of 055d95fce0
from master.
This commit is contained in:
parent
46edcd621e
commit
63ccf64079
|
@ -13,6 +13,7 @@ from django.core.servers.basehttp import run, get_internal_wsgi_application
|
|||
from django.db import connections, DEFAULT_DB_ALIAS
|
||||
from django.db.migrations.executor import MigrationExecutor
|
||||
from django.utils import autoreload
|
||||
from django.utils.encoding import get_system_encoding
|
||||
from django.utils import six
|
||||
from django.core.exceptions import ImproperlyConfigured
|
||||
|
||||
|
@ -108,7 +109,7 @@ class Command(BaseCommand):
|
|||
pass
|
||||
now = datetime.now().strftime('%B %d, %Y - %X')
|
||||
if six.PY2:
|
||||
now = now.decode('utf-8')
|
||||
now = now.decode(get_system_encoding())
|
||||
self.stdout.write((
|
||||
"%(started_at)s\n"
|
||||
"Django version %(version)s, using settings %(settings)r\n"
|
||||
|
|
|
@ -33,3 +33,6 @@ Bugfixes
|
|||
|
||||
* Restored bug fix for sending unicode email with Python 2.6.5 and below
|
||||
(`#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>`_).
|
||||
|
|
Loading…
Reference in New Issue