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:23:18 -0500 |
| commit | fda458c0b6902c248e84c5cde03ff5f4a4dce665 (patch) | |
| tree | ab76c428b6e4c5bbad1582d2abf95f8e05297ee2 /docs | |
| parent | 1b8346439180ac443e397fcb176879680882f75c (diff) | |
[1.7.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/releases/1.7.2.txt | 2 | ||||
| -rw-r--r-- | docs/topics/python3.txt | 14 |
4 files changed, 4 insertions, 16 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/releases/1.7.2.txt b/docs/releases/1.7.2.txt index 3b614ed7ab..63818cd594 100644 --- a/docs/releases/1.7.2.txt +++ b/docs/releases/1.7.2.txt @@ -7,7 +7,7 @@ Django 1.7.2 release notes Django 1.7.2 fixes several bugs in 1.7.1. 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 8e4c3f1e63..274734e213 100644 --- a/docs/topics/python3.txt +++ b/docs/topics/python3.txt @@ -387,19 +387,7 @@ 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. .. _unicode: http://docs.python.org/2/library/functions.html#unicode .. _ __unicode__(): https://docs.python.org/2/reference/datamodel.html#object.__unicode__ |