mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

[1.6.x] Updated six to 1.9.0.

Browse Source 
Backport of 52f0b2b622 from master
This commit is contained in:
Tim Graham
2015-01-02 12:35:41 -05:00
parent e17d98ff02
commit 0114b9df13
4 changed files with 87 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/releases/1.4.17.txt
View File

@@ -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
========

2
docs/releases/1.6.9.txt
View File

@@ -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
========

14
docs/topics/python3.txt
View File

@@ -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.