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.7.x] Fixed #23946 -- Fixed runserver crash when socket error contains Unicode chars.

Browse Source 
Backport of bba545345f46f09245799f7ae0a22177a84eba71 from master
This commit is contained in:
Andriy Sokolovskiy 2014-12-02 16:12:33 +02:00 committed by Tim Graham
parent ccc30ffe57
commit 2d0d6cadd4
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 import connections, DEFAULT_DB_ALIAS
from django.db.migrations.executor import MigrationExecutor from django.db.migrations.executor import MigrationExecutor
from django.utils import autoreload from django.utils import autoreload
from django.utils.encoding import get_system_encoding from django.utils.encoding import get_system_encoding, smart_text
from django.utils import six from django.utils import six
from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ImproperlyConfigured
@ -142,7 +142,7 @@ class Command(BaseCommand):
try: try:
error_text = ERRORS[e.errno] error_text = ERRORS[e.errno]
except KeyError: except KeyError:
error_text = str(e) error_text = smart_text(e)
self.stderr.write("Error: %s" % error_text) self.stderr.write("Error: %s" % error_text)
# Need to use an OS exit because sys.exit doesn't work in a thread # Need to use an OS exit because sys.exit doesn't work in a thread
os._exit(1) os._exit(1)

3
docs/releases/1.7.2.txt
View File

@ -98,3 +98,6 @@ Bugfixes
* Fixed a regression in ``contrib.admin`` add/change views which caused some * Fixed a regression in ``contrib.admin`` add/change views which caused some
``ModelAdmin`` methods to receive the incorrect ``obj`` value ``ModelAdmin`` methods to receive the incorrect ``obj`` value
(:ticket:`23934`). (:ticket:`23934`).
* Fixed ``runserver`` crash when socket error message contained Unicode
characters (:ticket:`23946`).