Commit bba54534 authored by Andriy Sokolovskiy's avatar Andriy Sokolovskiy Committed by Tim Graham
Browse files

Fixed #23946 -- Fixed runserver crash when socket error contains Unicode chars.

parent 0623f4de
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,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.encoding import get_system_encoding, smart_text
from django.utils import six
from django.core.exceptions import ImproperlyConfigured

@@ -148,7 +148,7 @@ class Command(BaseCommand):
            try:
                error_text = ERRORS[e.errno]
            except KeyError:
                error_text = str(e)
                error_text = smart_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)
+3 −0
Original line number Diff line number Diff line
@@ -98,3 +98,6 @@ Bugfixes
* Fixed a regression in ``contrib.admin`` add/change views which caused some
  ``ModelAdmin`` methods to receive the incorrect ``obj`` value
  (:ticket:`23934`).

* Fixed ``runserver`` crash when socket error message contained Unicode
  characters (:ticket:`23946`).