mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-01-31 16:36:20 +00:00
util: hooray! A clean implementation of this simple utility! Black Dew pointed out that the inverse of time.gmtime() is hidden in the "calendar" module.
This commit is contained in:
parent
45928315f6
commit
cc2953e663
@ -7,7 +7,7 @@
|
|||||||
# ISO-8601:
|
# ISO-8601:
|
||||||
# http://www.cl.cam.ac.uk/~mgk25/iso-time.html
|
# http://www.cl.cam.ac.uk/~mgk25/iso-time.html
|
||||||
|
|
||||||
import datetime, re, time
|
import calendar, datetime, re, time
|
||||||
|
|
||||||
def iso_utc_date(now=None, t=time.time):
|
def iso_utc_date(now=None, t=time.time):
|
||||||
if now is None:
|
if now is None:
|
||||||
@ -42,16 +42,7 @@ def iso_utc_time_to_seconds(isotime, _conversion_re=re.compile(r"(?P<year>\d{4})
|
|||||||
else:
|
else:
|
||||||
subsecfloat = 0
|
subsecfloat = 0
|
||||||
|
|
||||||
# Brian's hack to figure out the offset from localtime to UTC.
|
return calendar.timegm( (year, month, day, hour, minute, second, 0, 1, 0) ) + subsecfloat
|
||||||
localseconds = time.mktime( (year, month, day, hour, minute, second, 0, 1, 0) )
|
|
||||||
asifutcstr = iso_utc(localseconds)
|
|
||||||
asifm = _conversion_re.match(asifutcstr)
|
|
||||||
asifyear, asifmonth, asifday = int(asifm.group('year')), int(asifm.group('month')), int(asifm.group('day'))
|
|
||||||
asifhour, asifminute, asifsecond = int(asifm.group('hour')), int(asifm.group('minute')), int(asifm.group('second'))
|
|
||||||
asifutcsecs = time.mktime( (asifyear, asifmonth, asifday, asifhour, asifminute, asifsecond, 0, 1, 0) )
|
|
||||||
offset = asifutcsecs - localseconds
|
|
||||||
|
|
||||||
return localseconds - offset + subsecfloat
|
|
||||||
|
|
||||||
def parse_duration(s):
|
def parse_duration(s):
|
||||||
orig = s
|
orig = s
|
||||||
|
Loading…
x
Reference in New Issue
Block a user