Context Navigation

Ticket #19933: 19933-1.diff

File 19933-1.diff, 1.4 KB (added by Claude Paroz, 11 years ago)
Using DEFAULT_LOCALE_ENCODING

diff --git a/django/contrib/auth/management/__init__.py b/django/contrib/auth/management/__init__.py
index 475dd25..6a8d5d3 100644

                from django.core.management.base import CommandError
 from django.db import DEFAULT_DB_ALIAS, router
 from django.db.models import get_models, signals
 from django.utils import six
+from django.utils.encoding import DEFAULT_LOCALE_ENCODING
 from django.utils.six.moves import input
-…
+               def get_system_username():
         # (a very restricted chroot environment, for example).
         return ''
     if not six.PY3:
-        default_locale = locale.getdefaultlocale()[1]
-        if not default_locale:
-            return ''
         try:
             result = result.decode(default_locale)
+            result = result.decode(DEFAULT_LOCALE_ENCODING)
         except UnicodeDecodeError:
             # UnicodeDecodeError - preventive treatment for non-latin Windows.
             return ''

diff --git a/django/utils/encoding.py b/django/utils/encoding.py
index 68929cc..6c3a9de 100644

a	b	def filepath_to_uri(path):
240	240	try:
241	241	DEFAULT_LOCALE_ENCODING = locale.getdefaultlocale()[1] or 'ascii'
242	242	codecs.lookup(DEFAULT_LOCALE_ENCODING)
243		except:
	243	except Exception:
244	244	DEFAULT_LOCALE_ENCODING = 'ascii'