Ticket #18160: auth_invalid_encoding.diff

django/contrib/auth/management/__init__.py

@@ -2 +2 @@
 Creates permissions for all installed apps that need permissions.
 """
 import getpass
-import locale
 import unicodedata
 from django.contrib.auth import models as auth_app
 from django.db.models import get_models, signals
 from django.contrib.auth.models import User
+from django.utils.encoding import DEFAULT_LOCALE_ENCODING
 
 
 def _get_permission_codename(action, opts):
@@ -82 +82 @@
         username could not be determined.
     """
     try:
-        return getpass.getuser().decode(locale.getdefaultlocale()[1])
+        return getpass.getuser().decode(DEFAULT_LOCALE_ENCODING)
     except (ImportError, KeyError, UnicodeDecodeError):
         # KeyError will be raised by os.getpwuid() (called by getuser())
         # if there is no corresponding entry in the /etc/passwd file

django/contrib/auth/tests/management.py

@@ -30 +30 @@
         management.get_system_username = lambda: u'J\xfalia'
         self.assertEqual(management.get_default_username(), 'julia')
 
+    def test_unknown_encoding(self):
+        import locale
+        _getdefaultlocale = locale.getdefaultlocale
+        locale.getdefaultlocale = lambda: ("en_US", "UNKNOWN ENCODING STRING")
+        management.get_default_username()
+        locale.getdefaultlocale = _getdefaultlocale
+
+    def test_none_encoding(self):
+        import locale
+        _getdefaultlocale = locale.getdefaultlocale
+        locale.getdefaultlocale = lambda: None, None
+        management.get_default_username()
+        locale.getdefaultlocale = _getdefaultlocale
+
 
 class ChangepasswordManagementCommandTestCase(TestCase):