summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2013-02-15 16:09:31 +0100
committerClaude Paroz <claude@2xlibre.net>2013-02-15 16:11:53 +0100
commit1b54c85a53edec2f802223c702cb1dfde6be9aa5 (patch)
tree504d05fac2aae8682718c0cdd4db84e72c295bd2
parent5921f15c113f41f3baca0b599ccb9dad83649682 (diff)
[1.5.x] Avoided unneeded assertion on Python 3
Fixes failure introduced in 02e5909f7a.
-rw-r--r--django/contrib/auth/tests/basic.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/django/contrib/auth/tests/basic.py b/django/contrib/auth/tests/basic.py
index 3c7bcffc7d..097bc90451 100644
--- a/django/contrib/auth/tests/basic.py
+++ b/django/contrib/auth/tests/basic.py
@@ -13,7 +13,7 @@ from django.core.management import call_command
from django.test import TestCase
from django.test.utils import override_settings
from django.utils.encoding import force_str
-from django.utils.six import binary_type, StringIO
+from django.utils.six import binary_type, PY3, StringIO
def mock_inputs(inputs):
@@ -26,8 +26,9 @@ def mock_inputs(inputs):
class mock_getpass:
@staticmethod
def getpass(prompt=b'Password: ', stream=None):
- # getpass on Windows only supports prompt as bytestring (#19807)
- assert isinstance(prompt, binary_type)
+ if not PY3:
+ # getpass on Windows only supports prompt as bytestring (#19807)
+ assert isinstance(prompt, binary_type)
return inputs['password']
def mock_input(prompt):