From f9f792eb04dfd48d93682070583f473166b490ae Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Thu, 5 Sep 2013 14:38:59 -0500 Subject: [1.6.x] Took advantage of django.utils.six.moves.urllib.*. Backport of 6a6428a36 from master. --- docs/topics/python3.txt | 9 --------- 1 file changed, 9 deletions(-) (limited to 'docs/topics/python3.txt') diff --git a/docs/topics/python3.txt b/docs/topics/python3.txt index 8f2306962b..372de1009d 100644 --- a/docs/topics/python3.txt +++ b/docs/topics/python3.txt @@ -367,15 +367,6 @@ Moved modules Some modules were renamed in Python 3. The :mod:`django.utils.six.moves ` module provides a compatible location to import them. -The ``urllib``, ``urllib2`` and ``urlparse`` modules were reworked in depth -and :mod:`django.utils.six.moves ` doesn't handle them. Django -explicitly tries both locations, as follows:: - - try: - from urllib.parse import urlparse, urlunparse - except ImportError: # Python 2 - from urlparse import urlparse, urlunparse - PY2 ~~~ -- cgit v1.3