summaryrefslogtreecommitdiff
path: root/docs/topics/python3.txt
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@rd.io>2012-09-07 15:51:22 -0400
committerAlex Gaynor <alex.gaynor@rd.io>2012-09-07 15:51:22 -0400
commit3a10bcc91726859f9f0f817b39586712c2d37c2b (patch)
tree3158b00d54a816f1b222857e72a2683871515879 /docs/topics/python3.txt
parent5999eb42eb6dad6a74c43eb6e9d96ac368ad97b4 (diff)
Document ``six.assertRaisesRegex``.
Diffstat (limited to 'docs/topics/python3.txt')
-rw-r--r--docs/topics/python3.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/topics/python3.txt b/docs/topics/python3.txt
index d816db8046..89d0c9f91f 100644
--- a/docs/topics/python3.txt
+++ b/docs/topics/python3.txt
@@ -400,5 +400,12 @@ The version of six bundled with Django includes one extra function:
2 and :meth:`~django.utils.datastructures.MultiValueDict.lists()` on
Python 3.
+.. function:: assertRaisesRegex(testcase, *args, **kwargs)
+
+ This replaces ``testcase.assertRaisesRegexp`` on Python 2, and
+ ``testcase.assertRaisesRegex`` on Python 3. ``assertRaisesRegexp`` still
+ exists in current Python3 versions, but issues a warning.
+
+
In addition to six' defaults moves, Django's version provides ``thread`` as
``_thread`` and ``dummy_thread`` as ``_dummy_thread``.