Skip to content

Commit

Permalink
Worked around Python 3.3 modified exception repr
Browse files Browse the repository at this point in the history
Refs #20599.
  • Loading branch information
claudep committed Jun 15, 2013
1 parent 990f8d9 commit beb652e
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions django/contrib/auth/tests/test_hashers.py
Expand Up @@ -5,6 +5,7 @@
from django.contrib.auth.hashers import (is_password_usable, BasePasswordHasher,
check_password, make_password, PBKDF2PasswordHasher, load_hashers,
PBKDF2SHA1PasswordHasher, get_hasher, identify_hasher, UNUSABLE_PASSWORD)
from django.utils import six
from django.utils import unittest
from django.utils.unittest import skipUnless

Expand Down Expand Up @@ -187,7 +188,7 @@ def test_load_library_no_algorithm(self):
def test_load_library_importerror(self):
PlainHasher = type(str('PlainHasher'), (BasePasswordHasher,),
{'algorithm': 'plain', 'library': 'plain'})
with self.assertRaises(ValueError) as e:
# Python 3.3 adds quotes around module name
with six.assertRaisesRegex(self, ValueError,
"Couldn't load 'PlainHasher' algorithm library: No module named '?plain'?"):
PlainHasher()._load_library()
self.assertEqual("Couldn't load 'PlainHasher' algorithm library: "
"No module named plain", str(e.exception))

0 comments on commit beb652e

Please sign in to comment.