Ticket #17649: ticket17649_2.patch

django/contrib/auth/management/__init__.py

@@ -82 +82 @@
         username could not be determined.
     """
     try:
-        return getpass.getuser().decode(locale.getdefaultlocale()[1])
+        system_locale = locale.getdefaultlocale()[1]
+        if system_locale:
+            return getpass.getuser().decode(system_locale)
+        else:
+            return getpass.getuser().decode(errors='ignore')
     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

@@ -25 +25 @@
         # 'Julia' with accented 'u':
         management.get_system_username = lambda: u'J\xfalia'
         self.assertEqual(management.get_default_username(), 'julia')
+
+    def test_locale_empty(self):
+        # Test for emty locale.
+        import locale
+        import getpass
+        locale.getdefaultlocale = lambda: (None,None)
+        getpass.getuser = lambda: 'J\xfalia'
+        self.assertEqual(management.get_system_username(), u'Jlia')