The date class is now properly subclassable. (SF bug #720908)
(This is only the tip of the iceberg; the time and datetime classes
need the same treatment.)
diff --git a/Modules/datetimemodule.c b/Modules/datetimemodule.c
index e514a54..88a076b 100644
--- a/Modules/datetimemodule.c
+++ b/Modules/datetimemodule.c
@@ -1291,16 +1291,19 @@
/* Create a date instance with no range checking. */
static PyObject *
-new_date(int year, int month, int day)
+new_date_ex(int year, int month, int day, PyTypeObject *type)
{
PyDateTime_Date *self;
- self = PyObject_New(PyDateTime_Date, &PyDateTime_DateType);
+ self = (PyDateTime_Date *) (type->tp_alloc(type, 0));
if (self != NULL)
set_date_fields(self, year, month, day);
return (PyObject *) self;
}
+#define new_date(year, month, day) \
+ (new_date_ex(year, month, day, &PyDateTime_DateType))
+
/* Create a datetime instance with no range checking. */
static PyObject *
new_datetime(int year, int month, int day, int hour, int minute,
@@ -2168,7 +2171,7 @@
{
PyDateTime_Date *me;
- me = PyObject_New(PyDateTime_Date, &PyDateTime_DateType);
+ me = PyObject_New(PyDateTime_Date, type);
if (me != NULL) {
char *pdata = PyString_AS_STRING(state);
memcpy(me->data, pdata, _PyDateTime_DATE_DATASIZE);
@@ -2181,7 +2184,7 @@
&year, &month, &day)) {
if (check_date_args(year, month, day) < 0)
return NULL;
- self = new_date(year, month, day);
+ self = new_date_ex(year, month, day, type);
}
return self;
}
@@ -2632,7 +2635,7 @@
"datetime.date", /* tp_name */
sizeof(PyDateTime_Date), /* tp_basicsize */
0, /* tp_itemsize */
- (destructor)PyObject_Del, /* tp_dealloc */
+ 0, /* tp_dealloc */
0, /* tp_print */
0, /* tp_getattr */
0, /* tp_setattr */