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

bpo-1635741: Enhance _datetime error handling (GH-23139)

This commit is contained in:
Mohamed Koubaa 2020-11-20 04:39:40 -06:00 committed by GitHub
parent 5c36da78d7
commit 2db8e35489
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 103 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

220
Modules/_datetimemodule.c
View File

@ -6494,32 +6494,9 @@ static PyDateTime_CAPI CAPI = {
new_time_ex2 new_time_ex2
}; };
static int
_datetime_exec(PyObject *module)
static struct PyModuleDef datetimemodule = {
PyModuleDef_HEAD_INIT,
"_datetime",
"Fast implementation of the datetime type.",
-1,
module_methods,
NULL,
NULL,
NULL,
NULL
};
PyMODINIT_FUNC
PyInit__datetime(void)
{ {
PyObject *m; /* a module object */
PyObject *d; /* its dict */
PyObject *x;
PyObject *delta;
m = PyModule_Create(&datetimemodule);
if (m == NULL)
return NULL;
// `&...` is not a constant expression according to a strict reading // `&...` is not a constant expression according to a strict reading
// of C standards. Fill tp_base at run-time rather than statically. // of C standards. Fill tp_base at run-time rather than statically.
// See https://bugs.python.org/issue40777 // See https://bugs.python.org/issue40777
@ -6537,98 +6514,72 @@ PyInit__datetime(void)
}; };
for (size_t i = 0; i < Py_ARRAY_LENGTH(types); i++) { for (size_t i = 0; i < Py_ARRAY_LENGTH(types); i++) {
if (PyModule_AddType(m, types[i]) < 0) { if (PyModule_AddType(module, types[i]) < 0) {
return NULL; return -1;
} }
} }
if (PyType_Ready(&PyDateTime_IsoCalendarDateType) < 0) { if (PyType_Ready(&PyDateTime_IsoCalendarDateType) < 0) {
return NULL; return -1;
} }
Py_INCREF(&PyDateTime_IsoCalendarDateType);
#define DATETIME_ADD_MACRO(dict, c, value_expr) \
do { \
PyObject *value = (value_expr); \
if (value == NULL) { \
return -1; \
} \
if (PyDict_SetItemString(dict, c, value) < 0) { \
Py_DECREF(value); \
return -1; \
} \
Py_DECREF(value); \
} while(0)
/* timedelta values */ /* timedelta values */
d = PyDateTime_DeltaType.tp_dict; PyObject *d = PyDateTime_DeltaType.tp_dict;
DATETIME_ADD_MACRO(d, "resolution", new_delta(0, 0, 1, 0));
x = new_delta(0, 0, 1, 0); DATETIME_ADD_MACRO(d, "min", new_delta(-MAX_DELTA_DAYS, 0, 0, 0));
if (x == NULL || PyDict_SetItemString(d, "resolution", x) < 0) DATETIME_ADD_MACRO(d, "max",
return NULL; new_delta(MAX_DELTA_DAYS, 24*3600-1, 1000000-1, 0));
Py_DECREF(x);
x = new_delta(-MAX_DELTA_DAYS, 0, 0, 0);
if (x == NULL || PyDict_SetItemString(d, "min", x) < 0)
return NULL;
Py_DECREF(x);
x = new_delta(MAX_DELTA_DAYS, 24*3600-1, 1000000-1, 0);
if (x == NULL || PyDict_SetItemString(d, "max", x) < 0)
return NULL;
Py_DECREF(x);
/* date values */ /* date values */
d = PyDateTime_DateType.tp_dict; d = PyDateTime_DateType.tp_dict;
DATETIME_ADD_MACRO(d, "min", new_date(1, 1, 1));
x = new_date(1, 1, 1); DATETIME_ADD_MACRO(d, "max", new_date(MAXYEAR, 12, 31));
if (x == NULL || PyDict_SetItemString(d, "min", x) < 0) DATETIME_ADD_MACRO(d, "resolution", new_delta(1, 0, 0, 0));
return NULL;
Py_DECREF(x);
x = new_date(MAXYEAR, 12, 31);
if (x == NULL || PyDict_SetItemString(d, "max", x) < 0)
return NULL;
Py_DECREF(x);
x = new_delta(1, 0, 0, 0);
if (x == NULL || PyDict_SetItemString(d, "resolution", x) < 0)
return NULL;
Py_DECREF(x);
/* time values */ /* time values */
d = PyDateTime_TimeType.tp_dict; d = PyDateTime_TimeType.tp_dict;
DATETIME_ADD_MACRO(d, "min", new_time(0, 0, 0, 0, Py_None, 0));
x = new_time(0, 0, 0, 0, Py_None, 0); DATETIME_ADD_MACRO(d, "max", new_time(23, 59, 59, 999999, Py_None, 0));
if (x == NULL || PyDict_SetItemString(d, "min", x) < 0) DATETIME_ADD_MACRO(d, "resolution", new_delta(0, 0, 1, 0));
return NULL;
Py_DECREF(x);
x = new_time(23, 59, 59, 999999, Py_None, 0);
if (x == NULL || PyDict_SetItemString(d, "max", x) < 0)
return NULL;
Py_DECREF(x);
x = new_delta(0, 0, 1, 0);
if (x == NULL || PyDict_SetItemString(d, "resolution", x) < 0)
return NULL;
Py_DECREF(x);
/* datetime values */ /* datetime values */
d = PyDateTime_DateTimeType.tp_dict; d = PyDateTime_DateTimeType.tp_dict;
DATETIME_ADD_MACRO(d, "min",
x = new_datetime(1, 1, 1, 0, 0, 0, 0, Py_None, 0); new_datetime(1, 1, 1, 0, 0, 0, 0, Py_None, 0));
if (x == NULL || PyDict_SetItemString(d, "min", x) < 0) DATETIME_ADD_MACRO(d, "max", new_datetime(MAXYEAR, 12, 31, 23, 59, 59,
return NULL; 999999, Py_None, 0));
Py_DECREF(x); DATETIME_ADD_MACRO(d, "resolution", new_delta(0, 0, 1, 0));
x = new_datetime(MAXYEAR, 12, 31, 23, 59, 59, 999999, Py_None, 0);
if (x == NULL || PyDict_SetItemString(d, "max", x) < 0)
return NULL;
Py_DECREF(x);
x = new_delta(0, 0, 1, 0);
if (x == NULL || PyDict_SetItemString(d, "resolution", x) < 0)
return NULL;
Py_DECREF(x);
/* timezone values */ /* timezone values */
d = PyDateTime_TimeZoneType.tp_dict; d = PyDateTime_TimeZoneType.tp_dict;
PyObject *delta = new_delta(0, 0, 0, 0);
if (delta == NULL) {
return -1;
}
delta = new_delta(0, 0, 0, 0); PyObject *x = create_timezone(delta, NULL);
if (delta == NULL)
return NULL;
x = create_timezone(delta, NULL);
Py_DECREF(delta); Py_DECREF(delta);
if (x == NULL || PyDict_SetItemString(d, "utc", x) < 0) if (x == NULL) {
return NULL; return -1;
}
if (PyDict_SetItemString(d, "utc", x) < 0) {
Py_DECREF(x);
return -1;
}
PyDateTime_TimeZone_UTC = x; PyDateTime_TimeZone_UTC = x;
CAPI.TimeZone_UTC = PyDateTime_TimeZone_UTC; CAPI.TimeZone_UTC = PyDateTime_TimeZone_UTC;
@ -6636,37 +6587,47 @@ PyInit__datetime(void)
* compatibility, even though the constructor will accept a wider range of * compatibility, even though the constructor will accept a wider range of
* values. This may change in the future.*/ * values. This may change in the future.*/
delta = new_delta(-1, 60, 0, 1); /* -23:59 */ delta = new_delta(-1, 60, 0, 1); /* -23:59 */
if (delta == NULL) if (delta == NULL) {
return NULL; return -1;
}
x = create_timezone(delta, NULL); x = create_timezone(delta, NULL);
Py_DECREF(delta); Py_DECREF(delta);
if (x == NULL || PyDict_SetItemString(d, "min", x) < 0) DATETIME_ADD_MACRO(d, "min", x);
return NULL;
Py_DECREF(x);
delta = new_delta(0, (23 * 60 + 59) * 60, 0, 0); /* +23:59 */ delta = new_delta(0, (23 * 60 + 59) * 60, 0, 0); /* +23:59 */
if (delta == NULL) if (delta == NULL) {
return NULL; return -1;
}
x = create_timezone(delta, NULL); x = create_timezone(delta, NULL);
Py_DECREF(delta); Py_DECREF(delta);
if (x == NULL || PyDict_SetItemString(d, "max", x) < 0) DATETIME_ADD_MACRO(d, "max", x);
return NULL;
Py_DECREF(x);
/* Epoch */ /* Epoch */
PyDateTime_Epoch = new_datetime(1970, 1, 1, 0, 0, 0, 0, PyDateTime_Epoch = new_datetime(1970, 1, 1, 0, 0, 0, 0,
PyDateTime_TimeZone_UTC, 0); PyDateTime_TimeZone_UTC, 0);
if (PyDateTime_Epoch == NULL) if (PyDateTime_Epoch == NULL) {
return NULL; return -1;
}
/* module initialization */ /* module initialization */
PyModule_AddIntMacro(m, MINYEAR); if (PyModule_AddIntMacro(module, MINYEAR) < 0) {
PyModule_AddIntMacro(m, MAXYEAR); return -1;
}
if (PyModule_AddIntMacro(module, MAXYEAR) < 0) {
return -1;
}
x = PyCapsule_New(&CAPI, PyDateTime_CAPSULE_NAME, NULL); x = PyCapsule_New(&CAPI, PyDateTime_CAPSULE_NAME, NULL);
if (x == NULL) if (x == NULL) {
return NULL; return -1;
PyModule_AddObject(m, "datetime_CAPI", x); }
if (PyModule_AddObject(module, "datetime_CAPI", x) < 0) {
Py_DECREF(x);
return -1;
}
/* A 4-year cycle has an extra leap day over what we'd get from /* A 4-year cycle has an extra leap day over what we'd get from
* pasting together 4 single years. * pasting together 4 single years.
@ -6691,8 +6652,9 @@ PyInit__datetime(void)
us_per_minute = PyLong_FromLong(60000000); us_per_minute = PyLong_FromLong(60000000);
seconds_per_day = PyLong_FromLong(24 * 3600); seconds_per_day = PyLong_FromLong(24 * 3600);
if (us_per_ms == NULL || us_per_second == NULL || if (us_per_ms == NULL || us_per_second == NULL ||
us_per_minute == NULL || seconds_per_day == NULL) us_per_minute == NULL || seconds_per_day == NULL) {
return NULL; return -1;
}
/* The rest are too big for 32-bit ints, but even /* The rest are too big for 32-bit ints, but even
* us_per_week fits in 40 bits, so doubles should be exact. * us_per_week fits in 40 bits, so doubles should be exact.
@ -6700,9 +6662,33 @@ PyInit__datetime(void)
us_per_hour = PyLong_FromDouble(3600000000.0); us_per_hour = PyLong_FromDouble(3600000000.0);
us_per_day = PyLong_FromDouble(86400000000.0); us_per_day = PyLong_FromDouble(86400000000.0);
us_per_week = PyLong_FromDouble(604800000000.0); us_per_week = PyLong_FromDouble(604800000000.0);
if (us_per_hour == NULL || us_per_day == NULL || us_per_week == NULL) if (us_per_hour == NULL || us_per_day == NULL || us_per_week == NULL) {
return -1;
}
return 0;
}
static struct PyModuleDef datetimemodule = {
PyModuleDef_HEAD_INIT,
.m_name = "_datetime",
.m_doc = "Fast implementation of the datetime type.",
.m_size = -1,
.m_methods = module_methods,
};
PyMODINIT_FUNC
PyInit__datetime(void)
{
PyObject *mod = PyModule_Create(&datetimemodule);
if (mod == NULL)
return NULL; return NULL;
return m;
if (_datetime_exec(mod) < 0) {
Py_DECREF(mod);
return NULL;
}
return mod;
} }
/* --------------------------------------------------------------------------- /* ---------------------------------------------------------------------------