From 9f8a36eb20895d9e542820d5190bfa77ad1b85d9 Mon Sep 17 00:00:00 2001 From: Anssi Kääriäinen Date: Wed, 9 Oct 2013 14:20:37 +0300 Subject: [1.5.x] Fixed #21248 -- Skipped test_bcrypt if no py-bcrypt found Pre 1.6 Django worked only with py-bcrypt, not with bcrypt. Skipped test_bcrypt when using bcrypt to avoid false positives. --- django/contrib/auth/tests/hashers.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/django/contrib/auth/tests/hashers.py b/django/contrib/auth/tests/hashers.py index 2b2243cb0c..be56fde378 100644 --- a/django/contrib/auth/tests/hashers.py +++ b/django/contrib/auth/tests/hashers.py @@ -16,6 +16,10 @@ except ImportError: try: import bcrypt + # Django 1.5 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 -- cgit v1.3