mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-19 00:40:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #10825: fixed the 'U' format code to dateformat (and the date/now filter/tag). Thanks to gsong and mir.

Browse source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jacob Kaplan-Moss 2009-05-08 13:39:37 +00:00
parent f7d01c49e9
commit 2af75b485d
5 changed files with 64 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
django/utils/dateformat.py
View file

@ -11,12 +11,13 @@ Usage:
>>>
"""
import re
import time
import calendar
from django.utils.dates import MONTHS, MONTHS_3, MONTHS_AP, WEEKDAYS, WEEKDAYS_ABBR
from django.utils.tzinfo import LocalTimezone
from django.utils.translation import ugettext as _
from django.utils.encoding import force_unicode
from calendar import isleap, monthrange
import re, time
re_formatchars = re.compile(r'(?<!\\)([aAbBdDfFgGhHiIjlLmMnNOPrsStTUwWyYzZ])')
re_escaped = re.compile(r'\\(.)')
@ -146,7 +147,7 @@ class DateFormat(TimeFormat):
def L(self):
"Boolean for whether it is a leap year; i.e. True or False"
return isleap(self.data.year)
return calendar.isleap(self.data.year)
def m(self):
"Month; i.e. '01' to '12'"
@ -188,7 +189,7 @@ class DateFormat(TimeFormat):
def t(self):
"Number of days in the given month; i.e. '28' to '31'"
return u'%02d' % monthrange(self.data.year, self.data.month)[1]
return u'%02d' % calendar.monthrange(self.data.year, self.data.month)[1]
def T(self):
"Time zone of this machine; e.g. 'EST' or 'MDT'"
@ -199,8 +200,10 @@ class DateFormat(TimeFormat):
def U(self):
"Seconds since the Unix epoch (January 1 1970 00:00:00 GMT)"
off = self.timezone and self.timezone.utcoffset(self.data) or 0
return int(time.mktime(self.data.timetuple())) + off.seconds * 60
if getattr(self.data, 'tzinfo', None):
return int(calendar.timegm(self.data.utctimetuple()))
else:
return int(time.mktime(self.data.timetuple()))
def w(self):
"Day of the week, numeric, i.e. '0' (Sunday) to '6' (Saturday)"
@ -214,12 +217,12 @@ class DateFormat(TimeFormat):
weekday = self.data.weekday() + 1
day_of_year = self.z()
if day_of_year <= (8 - jan1_weekday) and jan1_weekday > 4:
if jan1_weekday == 5 or (jan1_weekday == 6 and isleap(self.data.year-1)):
if jan1_weekday == 5 or (jan1_weekday == 6 and calendar.isleap(self.data.year-1)):
week_number = 53
else:
week_number = 52
else:
if isleap(self.data.year):
if calendar.isleap(self.data.year):
i = 366
else:
i = 365