summaryrefslogtreecommitdiff
path: root/docs/topics/python3.txt
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 /docs/topics/python3.txt
parentcebbec9b6122579a32a019a0449d4995dcf2191d (diff)
Fixed #19589 -- assertRegexpMatches is deprecated in Python 3.3.
Diffstat (limited to 'docs/topics/python3.txt')
-rw-r--r--docs/topics/python3.txt8
1 files changed, 7 insertions, 1 deletions
diff --git a/docs/topics/python3.txt b/docs/topics/python3.txt
index b44c180d7f..b1f3fa3277 100644
--- a/docs/topics/python3.txt
+++ b/docs/topics/python3.txt
@@ -402,7 +402,13 @@ The version of six bundled with Django includes one extra function:
This replaces ``testcase.assertRaisesRegexp`` on Python 2, and
``testcase.assertRaisesRegex`` on Python 3. ``assertRaisesRegexp`` still
- exists in current Python3 versions, but issues a warning.
+ exists in current Python 3 versions, but issues a warning.
+
+.. function:: assertRegex(testcase, *args, **kwargs)
+
+ This replaces ``testcase.assertRegexpMatches`` on Python 2, and
+ ``testcase.assertRegex`` on Python 3. ``assertRegexpMatches`` still
+ exists in current Python 3 versions, but issues a warning.
In addition to six' defaults moves, Django's version provides ``thread`` as