summaryrefslogtreecommitdiff
path: root/docs/topics
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-01-02 12:35:41 -0500
committerTim Graham <timograham@gmail.com>2015-01-02 13:33:46 -0500
commit0114b9df1359422c49bfc8a5dd9e7c09bb049553 (patch)
tree8e826a103f4e876f69631d4cbaa1f0a8a90d258c /docs/topics
parente17d98ff0292caf02b62a3e84e10e3aaff3f4015 (diff)
[1.6.x] Updated six to 1.9.0.
Backport of 52f0b2b62262743d5f935ddae29428e661b5d8ea from master
Diffstat (limited to 'docs/topics')
-rw-r--r--docs/topics/python3.txt14
1 files changed, 1 insertions, 13 deletions
diff --git a/docs/topics/python3.txt b/docs/topics/python3.txt
index 97e9f5e76b..2b8c3c530c 100644
--- a/docs/topics/python3.txt
+++ b/docs/topics/python3.txt
@@ -388,16 +388,4 @@ Django customized version of six
--------------------------------
The version of six bundled with Django (``django.utils.six``) includes a few
-extras.
-
-.. function:: assertRaisesRegex(testcase, *args, **kwargs)
-
- This replaces ``testcase.assertRaisesRegexp`` on Python 2, and
- ``testcase.assertRaisesRegex`` on Python 3. ``assertRaisesRegexp`` still
- 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.
+customizations for internal use only.