traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hg pull/merge - Changes to accomodate.

This commit is contained in:
Senthil Kumaran 2011-04-06 14:41:42 +08:00
parent 792eb5dc84 07019bcaab
commit bb4e470dcd
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/test/test_datetime.py
View File

@ -231,6 +231,13 @@ class TestTimeDelta(HarmlessMixedComparison, unittest.TestCase):
eq(a//10, td(0, 7*24*360))
eq(a//3600000, td(0, 0, 7*24*1000))
# Issue #11576
eq(td(999999999, 86399, 999999) - td(999999999, 86399, 999998),
td(0, 0, 1))
eq(td(999999999, 1, 1) - td(999999999, 1, 0),
td(0, 0, 1))
def test_disallowed_computations(self):
a = timedelta(42)

15
Modules/datetimemodule.c
View File

@ -1737,13 +1737,14 @@ delta_subtract(PyObject *left, PyObject *right)
if (PyDelta_Check(left) && PyDelta_Check(right)) {
/* delta - delta */
PyObject *minus_right = PyNumber_Negative(right);
if (minus_right) {
result = delta_add(left, minus_right);
Py_DECREF(minus_right);
}
else
result = NULL;
/* The C-level additions can't overflow because of the
* invariant bounds.
*/
int days = GET_TD_DAYS(left) - GET_TD_DAYS(right);
int seconds = GET_TD_SECONDS(left) - GET_TD_SECONDS(right);
int microseconds = GET_TD_MICROSECONDS(left) -
GET_TD_MICROSECONDS(right);
result = new_delta(days, seconds, microseconds, 1);
}
if (result == Py_NotImplemented)