diff options
| author | Tim Graham <timograham@gmail.com> | 2015-01-02 12:35:41 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-01-02 13:33:46 -0500 |
| commit | 0114b9df1359422c49bfc8a5dd9e7c09bb049553 (patch) | |
| tree | 8e826a103f4e876f69631d4cbaa1f0a8a90d258c /docs | |
| parent | e17d98ff0292caf02b62a3e84e10e3aaff3f4015 (diff) | |
[1.6.x] Updated six to 1.9.0.
Backport of 52f0b2b62262743d5f935ddae29428e661b5d8ea from master
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/releases/1.4.17.txt | 2 | ||||
| -rw-r--r-- | docs/releases/1.6.9.txt | 2 | ||||
| -rw-r--r-- | docs/topics/python3.txt | 14 |
3 files changed, 3 insertions, 15 deletions
diff --git a/docs/releases/1.4.17.txt b/docs/releases/1.4.17.txt index 6279941733..a46cdd9bc0 100644 --- a/docs/releases/1.4.17.txt +++ b/docs/releases/1.4.17.txt @@ -7,7 +7,7 @@ Django 1.4.17 release notes Django 1.4.17 fixes a regression in the 1.4.14 security release. Additionally, Django's vendored version of six, :mod:`django.utils.six`, has -been upgraded to the latest release (1.8.0). +been upgraded to the latest release (1.9.0). Bugfixes ======== diff --git a/docs/releases/1.6.9.txt b/docs/releases/1.6.9.txt index 08f943fa51..3142d9e81d 100644 --- a/docs/releases/1.6.9.txt +++ b/docs/releases/1.6.9.txt @@ -7,7 +7,7 @@ Django 1.6.9 release notes Django 1.6.9 fixes a regression in the 1.6.6 security release. Additionally, Django's vendored version of six, :mod:`django.utils.six`, has -been upgraded to the latest release (1.8.0). +been upgraded to the latest release (1.9.0). Bugfixes ======== 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. |