diff --git a/django/contrib/auth/tests/hashers.py b/django/contrib/auth/tests/hashers.py index bf68c45a1b..cf383e3da1 100644 --- a/django/contrib/auth/tests/hashers.py +++ b/django/contrib/auth/tests/hashers.py @@ -14,6 +14,10 @@ except ImportError: try: import bcrypt + # Django 1.4 works only with py-bcrypt, not with bcrypt. py-bcrypt has + # '_bcrypt' attribute, bcrypt doesn't. + if not hasattr(bcrypt, '_bcrypt'): + bcrypt = None except ImportError: bcrypt = None