Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Simplified django.utils.feedgenerator.get_tag_uri now that we don't r…

…equire Python 2.4

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15930 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 7cac1ecbd0f88825564f1e28901559c1b0aecb1a 1 parent 3d5a8f7
@adrianholovaty adrianholovaty authored
Showing with 2 additions and 8 deletions.
  1. +2 −8 django/utils/feedgenerator.py
View
10 django/utils/feedgenerator.py
@@ -66,17 +66,11 @@ def get_tag_uri(url, date):
See http://diveintomark.org/archives/2004/05/28/howto-atom-id
"""
- url_split = urlparse.urlparse(url)
-
- # Python 2.4 didn't have named attributes on split results or the hostname.
- hostname = getattr(url_split, 'hostname', url_split[1].split(':')[0])
- path = url_split[2]
- fragment = url_split[5]
-
+ bits = urlparse.urlparse(url)
d = ''
if date is not None:
d = ',%s' % datetime_safe.new_datetime(date).strftime('%Y-%m-%d')
- return u'tag:%s%s:%s/%s' % (hostname, d, path, fragment)
+ return u'tag:%s%s:%s/%s' % (bits.hostname, d, bits.path, bits.fragment)
class SyndicationFeed(object):
"Base class for all syndication feeds. Subclasses should provide write()"
Please sign in to comment.
Something went wrong with that request. Please try again.