mirror of https://github.com/django/django.git
Fixed #228 -- Better handling of timezones. Thanks, rmunn
git-svn-id: http://code.djangoproject.com/svn/django/trunk@347 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
017b8753a6
commit
47ce61533a
|
@ -21,8 +21,16 @@ def typecast_timestamp(s): # does NOT store time zone information
|
||||||
# "2005-07-29 09:56:00-05"
|
# "2005-07-29 09:56:00-05"
|
||||||
if not s: return None
|
if not s: return None
|
||||||
d, t = s.split()
|
d, t = s.split()
|
||||||
if t[-3] in ('-', '+'):
|
# Extract timezone information, if it exists. Currently we just throw
|
||||||
t = t[:-3] # Remove the time-zone information, if it exists.
|
# it away, but in the future we may make use of it.
|
||||||
|
if '-' in t:
|
||||||
|
t, tz = t.split('-', 1)
|
||||||
|
tz = '-' + tz
|
||||||
|
elif '+' in t:
|
||||||
|
t, tz = t.split('+', 1)
|
||||||
|
tz = '+' + tz
|
||||||
|
else:
|
||||||
|
tz = ''
|
||||||
dates = d.split('-')
|
dates = d.split('-')
|
||||||
times = t.split(':')
|
times = t.split(':')
|
||||||
seconds = times[2]
|
seconds = times[2]
|
||||||
|
|
Loading…
Reference in New Issue