mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Fixed microsecond rounding in python version of utcfromtimestamp

Browse source
This commit is contained in:
Alexander Belopolsky 2010-09-21 16:30:56 +00:00
parent b3bfc3d88b
commit 3e62f78c4e
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Lib/datetime.py
View file

@ -1379,12 +1379,17 @@ class datetime(date):
@classmethod
def utcfromtimestamp(cls, t):
"Construct a UTC datetime from a POSIX timestamp (like time.time())."
if 1 - (t % 1.0) < 0.000001:
t = float(int(t)) + 1
if t < 0:
t -= 1
t, frac = divmod(t, 1.0)
us = round(frac * 1e6)
# If timestamp is less than one microsecond smaller than a
# full second, us can be rounded up to 1000000. In this case,
# roll over to seconds, otherwise, ValueError is raised
# by the constructor.
if us == 1000000:
t += 1
us = 0
y, m, d, hh, mm, ss, weekday, jday, dst = _time.gmtime(t)
us = int((t % 1.0) * 1000000)
ss = min(ss, 59) # clamp out leap seconds if the platform has them
return cls(y, m, d, hh, mm, ss, us)