summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-12-02 15:57:08 -0500
committerTim Graham <timograham@gmail.com>2014-12-02 15:58:49 -0500
commit0a70d63b0b7cced774270586768ccb5ccebbb7ca (patch)
treefe886a8e049a81be95717df6c179ff6b3c22a6c1 /django
parent2d0d6cadd41a132950e28fd08a99f72c085e0a42 (diff)
[1.7.x] Tweaked fix for refs #23946; thanks Claude.
Backport of 5c773447c3239a297b22929f0df15d2971d72e77 from master
Diffstat (limited to 'django')
-rw-r--r--django/core/management/commands/runserver.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/core/management/commands/runserver.py b/django/core/management/commands/runserver.py
index 6246b5094c..53dd6c3c9e 100644
--- a/django/core/management/commands/runserver.py
+++ b/django/core/management/commands/runserver.py
@@ -13,7 +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, smart_text
+from django.utils.encoding import force_text, get_system_encoding
from django.utils import six
from django.core.exceptions import ImproperlyConfigured
@@ -142,7 +142,7 @@ class Command(BaseCommand):
try:
error_text = ERRORS[e.errno]
except KeyError:
- error_text = smart_text(e)
+ error_text = force_text(e)
self.stderr.write("Error: %s" % error_text)
# Need to use an OS exit because sys.exit doesn't work in a thread
os._exit(1)