[Python-checkins] cpython: Issue #22117: Remove _PyTime_ROUND_DOWN and _PyTime_ROUND_UP rounding methods
victor.stinner
python-checkins at python.org
Mon Mar 30 03:59:21 CEST 2015
https://hg.python.org/cpython/rev/350eb1ca561a
changeset: 95274:350eb1ca561a
user: Victor Stinner <victor.stinner at gmail.com>
date: Mon Mar 30 03:57:14 2015 +0200
summary:
Issue #22117: Remove _PyTime_ROUND_DOWN and _PyTime_ROUND_UP rounding methods
Use _PyTime_ROUND_FLOOR and _PyTime_ROUND_CEILING instead.
files:
Include/pytime.h | 7 +-
Lib/test/test_time.py | 100 +++----------------------
Modules/_testcapimodule.c | 3 +-
Python/pytime.c | 20 +---
4 files changed, 20 insertions(+), 110 deletions(-)
diff --git a/Include/pytime.h b/Include/pytime.h
--- a/Include/pytime.h
+++ b/Include/pytime.h
@@ -25,14 +25,9 @@
#endif
typedef enum {
- /* Round towards zero. */
- _PyTime_ROUND_DOWN=0,
- /* Round away from zero.
- For example, used for timeout to wait "at least" N seconds. */
- _PyTime_ROUND_UP,
/* Round towards minus infinity (-inf).
For example, used to read a clock. */
- _PyTime_ROUND_FLOOR,
+ _PyTime_ROUND_FLOOR=0,
/* Round towards infinity (+inf).
For example, used for timeout to wait "at least" N seconds. */
_PyTime_ROUND_CEILING
diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -24,20 +24,12 @@
SEC_TO_NS = 10 ** 9
class _PyTime(enum.IntEnum):
- # Round towards zero
- ROUND_DOWN = 0
- # Round away from zero
- ROUND_UP = 1
# Round towards minus infinity (-inf)
- ROUND_FLOOR = 2
+ ROUND_FLOOR = 0
# Round towards infinity (+inf)
- ROUND_CEILING = 3
+ ROUND_CEILING = 1
-ALL_ROUNDING_METHODS = (
- _PyTime.ROUND_UP,
- _PyTime.ROUND_DOWN,
- _PyTime.ROUND_FLOOR,
- _PyTime.ROUND_CEILING)
+ALL_ROUNDING_METHODS = (_PyTime.ROUND_FLOOR, _PyTime.ROUND_CEILING)
class TimeTestCase(unittest.TestCase):
@@ -617,13 +609,6 @@
def test_time_t(self):
from _testcapi import pytime_object_to_time_t
for obj, time_t, rnd in (
- # Round towards zero
- (0, 0, _PyTime.ROUND_DOWN),
- (-1, -1, _PyTime.ROUND_DOWN),
- (-1.0, -1, _PyTime.ROUND_DOWN),
- (-1.9, -1, _PyTime.ROUND_DOWN),
- (1.0, 1, _PyTime.ROUND_DOWN),
- (1.9, 1, _PyTime.ROUND_DOWN),
# Round towards minus infinity (-inf)
(0, 0, _PyTime.ROUND_FLOOR),
(-1, -1, _PyTime.ROUND_FLOOR),
@@ -631,13 +616,6 @@
(-1.9, -2, _PyTime.ROUND_FLOOR),
(1.0, 1, _PyTime.ROUND_FLOOR),
(1.9, 1, _PyTime.ROUND_FLOOR),
- # Round away from zero
- (0, 0, _PyTime.ROUND_UP),
- (-1, -1, _PyTime.ROUND_UP),
- (-1.0, -1, _PyTime.ROUND_UP),
- (-1.9, -2, _PyTime.ROUND_UP),
- (1.0, 1, _PyTime.ROUND_UP),
- (1.9, 2, _PyTime.ROUND_UP),
# Round towards infinity (+inf)
(0, 0, _PyTime.ROUND_CEILING),
(-1, -1, _PyTime.ROUND_CEILING),
@@ -657,20 +635,6 @@
def test_timespec(self):
from _testcapi import pytime_object_to_timespec
for obj, timespec, rnd in (
- # Round towards zero
- (0, (0, 0), _PyTime.ROUND_DOWN),
- (-1, (-1, 0), _PyTime.ROUND_DOWN),
- (-1.0, (-1, 0), _PyTime.ROUND_DOWN),
- (1e-9, (0, 1), _PyTime.ROUND_DOWN),
- (1e-10, (0, 0), _PyTime.ROUND_DOWN),
- (-1e-9, (-1, 999999999), _PyTime.ROUND_DOWN),
- (-1e-10, (0, 0), _PyTime.ROUND_DOWN),
- (-1.2, (-2, 800000000), _PyTime.ROUND_DOWN),
- (0.9999999999, (0, 999999999), _PyTime.ROUND_DOWN),
- (1.1234567890, (1, 123456789), _PyTime.ROUND_DOWN),
- (1.1234567899, (1, 123456789), _PyTime.ROUND_DOWN),
- (-1.1234567890, (-2, 876543211), _PyTime.ROUND_DOWN),
- (-1.1234567891, (-2, 876543211), _PyTime.ROUND_DOWN),
# Round towards minus infinity (-inf)
(0, (0, 0), _PyTime.ROUND_FLOOR),
(-1, (-1, 0), _PyTime.ROUND_FLOOR),
@@ -685,20 +649,6 @@
(1.1234567899, (1, 123456789), _PyTime.ROUND_FLOOR),
(-1.1234567890, (-2, 876543211), _PyTime.ROUND_FLOOR),
(-1.1234567891, (-2, 876543210), _PyTime.ROUND_FLOOR),
- # Round away from zero
- (0, (0, 0), _PyTime.ROUND_UP),
- (-1, (-1, 0), _PyTime.ROUND_UP),
- (-1.0, (-1, 0), _PyTime.ROUND_UP),
- (1e-9, (0, 1), _PyTime.ROUND_UP),
- (1e-10, (0, 1), _PyTime.ROUND_UP),
- (-1e-9, (-1, 999999999), _PyTime.ROUND_UP),
- (-1e-10, (-1, 999999999), _PyTime.ROUND_UP),
- (-1.2, (-2, 800000000), _PyTime.ROUND_UP),
- (0.9999999999, (1, 0), _PyTime.ROUND_UP),
- (1.1234567890, (1, 123456790), _PyTime.ROUND_UP),
- (1.1234567899, (1, 123456790), _PyTime.ROUND_UP),
- (-1.1234567890, (-2, 876543211), _PyTime.ROUND_UP),
- (-1.1234567891, (-2, 876543210), _PyTime.ROUND_UP),
# Round towards infinity (+inf)
(0, (0, 0), _PyTime.ROUND_CEILING),
(-1, (-1, 0), _PyTime.ROUND_CEILING),
@@ -836,40 +786,26 @@
PyTime_FromSecondsObject(-9223372037.0, rnd)
# Conversion giving different results depending on the rounding method
- UP = _PyTime.ROUND_UP
- DOWN = _PyTime.ROUND_DOWN
FLOOR = _PyTime.ROUND_FLOOR
CEILING = _PyTime.ROUND_CEILING
for obj, ts, rnd in (
# close to zero
+ ( 1e-10, 0, FLOOR),
( 1e-10, 1, CEILING),
- ( 1e-10, 1, UP),
- ( 1e-10, 0, DOWN),
- ( 1e-10, 0, FLOOR),
+ (-1e-10, -1, FLOOR),
(-1e-10, 0, CEILING),
- (-1e-10, 0, DOWN),
- (-1e-10, -1, UP),
- (-1e-10, -1, FLOOR),
# test rounding of the last nanosecond
+ ( 1.1234567899, 1123456789, FLOOR),
( 1.1234567899, 1123456790, CEILING),
- ( 1.1234567899, 1123456790, UP),
- ( 1.1234567899, 1123456789, DOWN),
- ( 1.1234567899, 1123456789, FLOOR),
+ (-1.1234567899, -1123456790, FLOOR),
(-1.1234567899, -1123456789, CEILING),
- (-1.1234567899, -1123456789, DOWN),
- (-1.1234567899, -1123456790, UP),
- (-1.1234567899, -1123456790, FLOOR),
# close to 1 second
+ ( 0.9999999999, 999999999, FLOOR),
( 0.9999999999, 1000000000, CEILING),
- ( 0.9999999999, 1000000000, UP),
- ( 0.9999999999, 999999999, DOWN),
- ( 0.9999999999, 999999999, FLOOR),
+ (-0.9999999999, -1000000000, FLOOR),
(-0.9999999999, -999999999, CEILING),
- (-0.9999999999, -999999999, DOWN),
- (-0.9999999999, -1000000000, UP),
- (-0.9999999999, -1000000000, FLOOR),
):
with self.subTest(obj=obj, round=rnd, timestamp=ts):
self.assertEqual(PyTime_FromSecondsObject(obj, rnd), ts)
@@ -939,30 +875,20 @@
with self.subTest(nanoseconds=ns, timeval=tv, round=rnd):
self.assertEqual(PyTime_AsTimeval(ns, rnd), tv)
- UP = _PyTime.ROUND_UP
- DOWN = _PyTime.ROUND_DOWN
FLOOR = _PyTime.ROUND_FLOOR
CEILING = _PyTime.ROUND_CEILING
for ns, tv, rnd in (
# nanoseconds
+ (1, (0, 0), FLOOR),
(1, (0, 1), CEILING),
- (1, (0, 1), UP),
- (1, (0, 0), DOWN),
- (1, (0, 0), FLOOR),
+ (-1, (-1, 999999), FLOOR),
(-1, (0, 0), CEILING),
- (-1, (0, 0), DOWN),
- (-1, (-1, 999999), UP),
- (-1, (-1, 999999), FLOOR),
# seconds + nanoseconds
+ (1234567001, (1, 234567), FLOOR),
(1234567001, (1, 234568), CEILING),
- (1234567001, (1, 234568), UP),
- (1234567001, (1, 234567), DOWN),
- (1234567001, (1, 234567), FLOOR),
+ (-1234567001, (-2, 765432), FLOOR),
(-1234567001, (-2, 765433), CEILING),
- (-1234567001, (-2, 765433), DOWN),
- (-1234567001, (-2, 765432), UP),
- (-1234567001, (-2, 765432), FLOOR),
):
with self.subTest(nanoseconds=ns, timeval=tv, round=rnd):
self.assertEqual(PyTime_AsTimeval(ns, rnd), tv)
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -2634,8 +2634,7 @@
static int
check_time_rounding(int round)
{
- if (round != _PyTime_ROUND_DOWN && round != _PyTime_ROUND_UP
- && round != _PyTime_ROUND_FLOOR && round != _PyTime_ROUND_CEILING) {
+ if (round != _PyTime_ROUND_FLOOR && round != _PyTime_ROUND_CEILING) {
PyErr_SetString(PyExc_ValueError, "invalid rounding");
return -1;
}
diff --git a/Python/pytime.c b/Python/pytime.c
--- a/Python/pytime.c
+++ b/Python/pytime.c
@@ -26,16 +26,6 @@
"timestamp out of range for platform time_t");
}
-static int
-_PyTime_RoundTowardsPosInf(int is_neg, _PyTime_round_t round)
-{
- if (round == _PyTime_ROUND_FLOOR)
- return 0;
- if (round == _PyTime_ROUND_CEILING)
- return 1;
- return ((round == _PyTime_ROUND_UP) ^ is_neg);
-}
-
time_t
_PyLong_AsTime_t(PyObject *obj)
{
@@ -84,7 +74,7 @@
}
floatpart *= denominator;
- if (_PyTime_RoundTowardsPosInf(intpart < 0, round)) {
+ if (round == _PyTime_ROUND_CEILING) {
floatpart = ceil(floatpart);
if (floatpart >= denominator) {
floatpart = 0.0;
@@ -121,7 +111,7 @@
double d, intpart, err;
d = PyFloat_AsDouble(obj);
- if (_PyTime_RoundTowardsPosInf(d < 0, round))
+ if (round == _PyTime_ROUND_CEILING)
d = ceil(d);
else
d = floor(d);
@@ -223,7 +213,7 @@
d = PyFloat_AsDouble(obj);
d *= 1e9;
- if (_PyTime_RoundTowardsPosInf(d < 0, round))
+ if (round == _PyTime_ROUND_CEILING)
d = ceil(d);
else
d = floor(d);
@@ -289,7 +279,7 @@
_PyTime_t k;
if (multiply < SEC_TO_NS) {
k = SEC_TO_NS / multiply;
- if (_PyTime_RoundTowardsPosInf(t < 0, round))
+ if (round == _PyTime_ROUND_CEILING)
return (t + k - 1) / k;
else
return t / k;
@@ -350,7 +340,7 @@
res = -1;
#endif
- if (_PyTime_RoundTowardsPosInf(tv->tv_sec < 0, round))
+ if (round == _PyTime_ROUND_CEILING)
tv->tv_usec = (int)((ns + US_TO_NS - 1) / US_TO_NS);
else
tv->tv_usec = (int)(ns / US_TO_NS);
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list