diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-09-05 14:38:59 -0500 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-09-05 14:39:23 -0500 |
| commit | 6a6428a36f221446b17eaf4876e92d3db1781962 (patch) | |
| tree | a57290e315203b770a56b0d4691ee2d4d104cccc /django/utils/feedgenerator.py | |
| parent | ed9cd4fd8b425ab5010b27aefc7ef6e50d55fb54 (diff) | |
Took advantage of django.utils.six.moves.urllib.*.
Diffstat (limited to 'django/utils/feedgenerator.py')
| -rw-r--r-- | django/utils/feedgenerator.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/django/utils/feedgenerator.py b/django/utils/feedgenerator.py index 3aa6b2cb23..e632845a84 100644 --- a/django/utils/feedgenerator.py +++ b/django/utils/feedgenerator.py @@ -24,15 +24,12 @@ http://web.archive.org/web/20110718035220/http://diveintomark.org/archives/2004/ from __future__ import unicode_literals import datetime -try: - from urllib.parse import urlparse -except ImportError: # Python 2 - from urlparse import urlparse from django.utils.xmlutils import SimplerXMLGenerator from django.utils.encoding import force_text, iri_to_uri from django.utils import datetime_safe from django.utils import six from django.utils.six import StringIO +from django.utils.six.moves.urllib.parse import urlparse from django.utils.timezone import is_aware def rfc2822_date(date): |
