summaryrefslogtreecommitdiff
path: root/docs
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 12:35:41 -0500
commit52f0b2b62262743d5f935ddae29428e661b5d8ea (patch)
tree62568fd36d5959c435abc7390be9fa93c1712884 /docs
parent839f431ef5b927c8b07ce33483b3a7b0dd17b761 (diff)
Updated six to 1.9.0.
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.4.17.txt2
-rw-r--r--docs/releases/1.6.9.txt2
-rw-r--r--docs/releases/1.7.2.txt2
-rw-r--r--docs/topics/python3.txt14
4 files changed, 4 insertions, 16 deletions
diff --git a/docs/releases/1.4.17.txt b/docs/releases/1.4.17.txt
index 4ca2b6a0c8..7b9f7e784c 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 2f1321a919..2f12809163 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: https://docs.python.org/2/library/functions.html#unicode
.. _ __unicode__(): https://docs.python.org/2/reference/datamodel.html#object.__unicode__