Ticket #19807: 19807-1.diff

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

@@ -122 +122 @@
                 while password is None:
                     if not password:
                         password = getpass.getpass()
-                        password2 = getpass.getpass('Password (again): ')
+                        password2 = getpass.getpass(force_str('Password (again): '))
                         if password != password2:
                             self.stderr.write("Error: Your passwords didn't match.")
                             password = None

django/contrib/auth/tests/basic.py

@@ -13 +13 @@
 from django.test import TestCase
 from django.test.utils import override_settings
 from django.utils.encoding import force_str
-from django.utils.six import StringIO
+from django.utils.six import binary_type, StringIO
 
 
 def mock_inputs(inputs):
@@ -24 +24 @@
     def inner(test_func):
         def wrapped(*args):
             class mock_getpass:
-                pass
-            mock_getpass.getpass = staticmethod(lambda p=None: inputs['password'])
+                @staticmethod
+                def getpass(prompt=b'Password: ', stream=None):
+                    # getpass on Windows only supports prompt as bytestring (#19807)
+                    assert isinstance(prompt, binary_type)
+                    return inputs['password']
 
             def mock_input(prompt):
                 # prompt should be encoded in Python 2. This line will raise an