From fda458c0b6902c248e84c5cde03ff5f4a4dce665 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Fri, 2 Jan 2015 12:35:41 -0500 Subject: [1.7.x] Updated six to 1.9.0. Backport of 52f0b2b62262743d5f935ddae29428e661b5d8ea from master --- docs/topics/python3.txt | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'docs/topics/python3.txt') 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__ -- cgit v1.3