summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2014-08-14 11:56:25 +0200
committerClaude Paroz <claude@2xlibre.net>2014-08-14 12:09:22 +0200
commit63ccf64079f833ff93a3fe9d158df2ec99015147 (patch)
tree9bfa0f274833075fc58731c34ec93e2faabb2343 /django
parent46edcd621e3092bcbf5817f98d7ff2ae86266f0e (diff)
[1.7.x] Fixed #23265 -- Used system-specific encoding in runserver
Thanks SpaceFox for the report. Backport of 055d95fce066 from master.
Diffstat (limited to 'django')
-rw-r--r--django/core/management/commands/runserver.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/core/management/commands/runserver.py b/django/core/management/commands/runserver.py
index 2d7d6bffde..e371d64099 100644
--- a/django/core/management/commands/runserver.py
+++ b/django/core/management/commands/runserver.py
@@ -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"