mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-01-10 18:36:05 +00:00
Code Issues 32 Releases Wiki Activity

Optimized two functions slightly.

Browse Source 
This avoids calling date.tzinfo.utcoffset(date) twice. It's also
robust to cases where that function returns None -- which never
happens in practice :-)
This commit is contained in:
Aymeric Augustin 2015-05-02 14:11:11 +02:00
parent 432678dbc1
commit 76220fe730
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
django/utils/feedgenerator.py
View File

@ -29,7 +29,6 @@ from django.utils import datetime_safe, six
from django.utils.encoding import force_text, iri_to_uri from django.utils.encoding import force_text, iri_to_uri
from django.utils.six import StringIO from django.utils.six import StringIO
from django.utils.six.moves.urllib.parse import urlparse from django.utils.six.moves.urllib.parse import urlparse
from django.utils.timezone import is_aware
from django.utils.xmlutils import SimplerXMLGenerator from django.utils.xmlutils import SimplerXMLGenerator
@ -46,13 +45,14 @@ def rfc2822_date(date):
time_str = date.strftime('%s, %%d %s %%Y %%H:%%M:%%S ' % (dow, month)) time_str = date.strftime('%s, %%d %s %%Y %%H:%%M:%%S ' % (dow, month))
if six.PY2: # strftime returns a byte string in Python 2 if six.PY2: # strftime returns a byte string in Python 2
time_str = time_str.decode('utf-8') time_str = time_str.decode('utf-8')
if is_aware(date): offset = date.utcoffset()
offset = date.tzinfo.utcoffset(date) # Historically, this function assumes that naive datetimes are in UTC.
if offset is None:
return time_str + '-0000'
else:
timezone = (offset.days * 24 * 60) + (offset.seconds // 60) timezone = (offset.days * 24 * 60) + (offset.seconds // 60)
hour, minute = divmod(timezone, 60) hour, minute = divmod(timezone, 60)
return time_str + '%+03d%02d' % (hour, minute) return time_str + '%+03d%02d' % (hour, minute)
else:
return time_str + '-0000'
def rfc3339_date(date): def rfc3339_date(date):
@ -61,13 +61,14 @@ def rfc3339_date(date):
time_str = date.strftime('%Y-%m-%dT%H:%M:%S') time_str = date.strftime('%Y-%m-%dT%H:%M:%S')
if six.PY2: # strftime returns a byte string in Python 2 if six.PY2: # strftime returns a byte string in Python 2
time_str = time_str.decode('utf-8') time_str = time_str.decode('utf-8')
if is_aware(date): offset = date.utcoffset()
offset = date.tzinfo.utcoffset(date) # Historically, this function assumes that naive datetimes are in UTC.
if offset is None:
return time_str + 'Z'
else:
timezone = (offset.days * 24 * 60) + (offset.seconds // 60) timezone = (offset.days * 24 * 60) + (offset.seconds // 60)
hour, minute = divmod(timezone, 60) hour, minute = divmod(timezone, 60)
return time_str + '%+03d:%02d' % (hour, minute) return time_str + '%+03d:%02d' % (hour, minute)
else:
return time_str + 'Z'
def get_tag_uri(url, date): def get_tag_uri(url, date):