1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

And put back a little code duplication, in the form of asserts.

Browse Source
This commit is contained in:
Tim Peters 2002-12-27 02:26:16 +00:00
parent 00237037ae
commit 8702d5f33f
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/datetimemodule.c
View File

@ -3168,6 +3168,7 @@ datetime_richcompare(PyDateTime_DateTime *self, PyObject *other, int op)
if (classify_two_utcoffsets((PyObject *)self, &offset1, &n1, if (classify_two_utcoffsets((PyObject *)self, &offset1, &n1,
other, &offset2, &n2) < 0) other, &offset2, &n2) < 0)
return NULL; return NULL;
assert(n1 != OFFSET_UNKNOWN && n2 != OFFSET_UNKNOWN);
/* If they're both naive, or both aware and have the same offsets, /* If they're both naive, or both aware and have the same offsets,
* we get off cheap. Note that if they're both naive, offset1 == * we get off cheap. Note that if they're both naive, offset1 ==
* offset2 == 0 at this point. * offset2 == 0 at this point.
@ -3681,6 +3682,7 @@ time_richcompare(PyDateTime_Time *self, PyObject *other, int op)
if (classify_two_utcoffsets((PyObject *)self, &offset1, &n1, if (classify_two_utcoffsets((PyObject *)self, &offset1, &n1,
other, &offset2, &n2) < 0) other, &offset2, &n2) < 0)
return NULL; return NULL;
assert(n1 != OFFSET_UNKNOWN && n2 != OFFSET_UNKNOWN);
/* If they're both naive, or both aware and have the same offsets, /* If they're both naive, or both aware and have the same offsets,
* we get off cheap. Note that if they're both naive, offset1 == * we get off cheap. Note that if they're both naive, offset1 ==
* offset2 == 0 at this point. * offset2 == 0 at this point.
@ -4619,6 +4621,7 @@ datetimetz_subtract(PyObject *left, PyObject *right)
if (classify_two_utcoffsets(left, &offset1, &n1, if (classify_two_utcoffsets(left, &offset1, &n1,
right, &offset2, &n2) < 0) right, &offset2, &n2) < 0)
return NULL; return NULL;
assert(n1 != OFFSET_UNKNOWN && n2 != OFFSET_UNKNOWN);
if (n1 != n2) { if (n1 != n2) {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"can't subtract offset-naive and " "can't subtract offset-naive and "