From 63ccf64079f833ff93a3fe9d158df2ec99015147 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Thu, 14 Aug 2014 11:56:25 +0200 Subject: [1.7.x] Fixed #23265 -- Used system-specific encoding in runserver Thanks SpaceFox for the report. Backport of 055d95fce066 from master. --- django/core/management/commands/runserver.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'django') 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" -- cgit v1.3