Ticket #15778: createsuperuser.diff

django/contrib/auth/management/commands/createsuperuser.py

@@ -3 +3 @@
 """
 
 import getpass
+import locale
 import re
 import sys
+import unicodedata
 from optparse import make_option
 from django.contrib.auth.models import User
 from django.core import exceptions
@@ -58 +60 @@
 
         # Try to determine the current system user's username to use as a default.
         try:
-            default_username = getpass.getuser().replace(' ', '').lower()
-        except (ImportError, KeyError):
+            default_username = getpass.getuser().decode(locale.getdefaultlocale()[1])
+            default_username = unicodedata.normalize('NFKD', default_username) \
+                                    .encode('ascii', 'ignore').replace(' ', '').lower()
+            if not RE_VALID_USERNAME.match(default_username):
+                default_username = ''
+        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
             # (a very restricted chroot environment, for example).
+            # UnicodeDecodeError - preventive treatment for non-latin Windows.
             default_username = ''
 
         # Determine whether the default username is taken, so we don't display