summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2013-01-08 19:07:12 +0100
committerClaude Paroz <claude@2xlibre.net>2013-01-08 19:08:15 +0100
commit34ee7d9875d26809b0a2c6115edee0a35be0d17d (patch)
treed38e2b17f5f35dc77e787b281b2efe89c09a02d4 /django
parent23ca3a01940c63942885df4709712cebf4df79ec (diff)
Updated deprecated test assertions
Diffstat (limited to 'django')
-rw-r--r--django/contrib/auth/tests/management.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/contrib/auth/tests/management.py b/django/contrib/auth/tests/management.py
index 976c0c4972..02939e39dc 100644
--- a/django/contrib/auth/tests/management.py
+++ b/django/contrib/auth/tests/management.py
@@ -186,7 +186,7 @@ class PermissionDuplicationTestCase(TestCase):
# check duplicated default permission
models.Permission._meta.permissions = [
('change_permission', 'Can edit permission (duplicate)')]
- self.assertRaisesRegexp(CommandError,
+ six.assertRaisesRegex(self, CommandError,
"The permission codename 'change_permission' clashes with a "
"builtin permission for model 'auth.Permission'.",
create_permissions, models, [], verbosity=0)
@@ -197,7 +197,7 @@ class PermissionDuplicationTestCase(TestCase):
('other_one', 'Some other permission'),
('my_custom_permission', 'Some permission with duplicate permission code'),
]
- self.assertRaisesRegexp(CommandError,
+ six.assertRaisesRegex(self, CommandError,
"The permission codename 'my_custom_permission' is duplicated for model "
"'auth.Permission'.",
create_permissions, models, [], verbosity=0)