mirror of
https://github.com/django/django.git
synced 2025-06-05 03:29:12 +00:00
[1.7.x] Tweaked fix for refs #23946; thanks Claude.
Backport of 5c773447c3239a297b22929f0df15d2971d72e77 from master
This commit is contained in:
parent
2d0d6cadd4
commit
0a70d63b0b
@ -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, smart_text
|
from django.utils.encoding import force_text, get_system_encoding
|
||||||
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 = smart_text(e)
|
error_text = force_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)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user