summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-01-26 13:47:11 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-01-26 13:47:11 +0100
commit55416e235d95b6168034236e5b1cdc581d544cc6 (patch)
treeb8916535102c084f4e6af0bc5038f7a7ea6f30a1 /django
parentcebbec9b6122579a32a019a0449d4995dcf2191d (diff)
Fixed #19589 -- assertRegexpMatches is deprecated in Python 3.3.
Diffstat (limited to 'django')
-rw-r--r--django/utils/six.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/django/utils/six.py b/django/utils/six.py
index 73846358a1..b93dc5b164 100644
--- a/django/utils/six.py
+++ b/django/utils/six.py
@@ -393,9 +393,11 @@ def with_metaclass(meta, base=object):
if PY3:
_iterlists = "lists"
_assertRaisesRegex = "assertRaisesRegex"
+ _assertRegex = "assertRegex"
else:
_iterlists = "iterlists"
_assertRaisesRegex = "assertRaisesRegexp"
+ _assertRegex = "assertRegexpMatches"
def iterlists(d):
@@ -407,5 +409,9 @@ def assertRaisesRegex(self, *args, **kwargs):
return getattr(self, _assertRaisesRegex)(*args, **kwargs)
+def assertRegex(self, *args, **kwargs):
+ return getattr(self, _assertRegex)(*args, **kwargs)
+
+
add_move(MovedModule("_dummy_thread", "dummy_thread"))
add_move(MovedModule("_thread", "thread"))