diff options
author | Victor Stinner <vstinner@wyplay.com> | 2012-03-13 13:35:55 +0100 |
---|---|---|
committer | Victor Stinner <vstinner@wyplay.com> | 2012-03-13 13:35:55 +0100 |
commit | 5d272cc6a28f3600a6c5ab3ea0ceea94f2285f35 (patch) | |
tree | 13726571347da753ab494dc42cff7055d1bc96a2 /Lib/datetime.py | |
parent | 3cac309939378f806daa3459afde0908267b070a (diff) | |
download | cpython-git-5d272cc6a28f3600a6c5ab3ea0ceea94f2285f35.tar.gz |
Close #14180: Factorize code to convert a number of seconds to time_t, timeval or timespec
time.ctime(), gmtime(), time.localtime(), datetime.date.fromtimestamp(),
datetime.datetime.fromtimestamp() and datetime.datetime.utcfromtimestamp() now
raises an OverflowError, instead of a ValueError, if the timestamp does not fit
in time_t.
datetime.datetime.fromtimestamp() and datetime.datetime.utcfromtimestamp() now
round microseconds towards zero instead of rounding to nearest with ties going
away from zero.
Diffstat (limited to 'Lib/datetime.py')
-rw-r--r-- | Lib/datetime.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/datetime.py b/Lib/datetime.py index c5eeca4a3f..59f3c68788 100644 --- a/Lib/datetime.py +++ b/Lib/datetime.py @@ -1360,7 +1360,7 @@ class datetime(date): converter = _time.localtime if tz is None else _time.gmtime t, frac = divmod(t, 1.0) - us = round(frac * 1e6) + us = int(frac * 1e6) # If timestamp is less than one microsecond smaller than a # full second, us can be rounded up to 1000000. In this case, @@ -1380,7 +1380,7 @@ class datetime(date): def utcfromtimestamp(cls, t): "Construct a UTC datetime from a POSIX timestamp (like time.time())." t, frac = divmod(t, 1.0) - us = round(frac * 1e6) + us = int(frac * 1e6) # If timestamp is less than one microsecond smaller than a # full second, us can be rounded up to 1000000. In this case, |