#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT.
diff --git a/Modules/datetimemodule.c b/Modules/datetimemodule.c
index 8eb7e04..1e30f7e 100644
--- a/Modules/datetimemodule.c
+++ b/Modules/datetimemodule.c
@@ -764,7 +764,7 @@
PyErr_Format(PyExc_TypeError,
"tzinfo argument must be None or of a tzinfo subclass, "
"not type '%s'",
- Py_Type(p)->tp_name);
+ Py_TYPE(p)->tp_name);
return -1;
}
@@ -855,7 +855,7 @@
PyErr_Format(PyExc_TypeError,
"tzinfo.%s() must return None or "
"timedelta, not '%s'",
- name, Py_Type(u)->tp_name);
+ name, Py_TYPE(u)->tp_name);
}
Py_DECREF(u);
@@ -950,7 +950,7 @@
if (!PyUnicode_Check(result)) {
PyErr_Format(PyExc_TypeError, "tzinfo.tzname() must "
"return None or a string, not '%s'",
- Py_Type(result)->tp_name);
+ Py_TYPE(result)->tp_name);
Py_DECREF(result);
result = NULL;
}
@@ -1293,7 +1293,7 @@
assert(PyUnicode_Check(Zreplacement));
ptoappend = PyUnicode_AsStringAndSize(Zreplacement,
&ntoappend);
- ntoappend = Py_Size(Zreplacement);
+ ntoappend = Py_SIZE(Zreplacement);
}
else {
/* percent followed by neither z nor Z */
@@ -1425,7 +1425,7 @@
{
PyErr_Format(PyExc_TypeError,
"can't compare %s to %s",
- Py_Type(a)->tp_name, Py_Type(b)->tp_name);
+ Py_TYPE(a)->tp_name, Py_TYPE(b)->tp_name);
return NULL;
}
@@ -1869,7 +1869,7 @@
PyErr_Format(PyExc_TypeError,
"unsupported type for timedelta %s component: %s",
- tag, Py_Type(num)->tp_name);
+ tag, Py_TYPE(num)->tp_name);
return NULL;
}
@@ -1973,18 +1973,18 @@
{
if (GET_TD_MICROSECONDS(self) != 0)
return PyUnicode_FromFormat("%s(%d, %d, %d)",
- Py_Type(self)->tp_name,
+ Py_TYPE(self)->tp_name,
GET_TD_DAYS(self),
GET_TD_SECONDS(self),
GET_TD_MICROSECONDS(self));
if (GET_TD_SECONDS(self) != 0)
return PyUnicode_FromFormat("%s(%d, %d)",
- Py_Type(self)->tp_name,
+ Py_TYPE(self)->tp_name,
GET_TD_DAYS(self),
GET_TD_SECONDS(self));
return PyUnicode_FromFormat("%s(%d)",
- Py_Type(self)->tp_name,
+ Py_TYPE(self)->tp_name,
GET_TD_DAYS(self));
}
@@ -2031,7 +2031,7 @@
static PyObject *
delta_reduce(PyDateTime_Delta* self)
{
- return Py_BuildValue("ON", Py_Type(self), delta_getstate(self));
+ return Py_BuildValue("ON", Py_TYPE(self), delta_getstate(self));
}
#define OFFSET(field) offsetof(PyDateTime_Delta, field)
@@ -2385,7 +2385,7 @@
date_repr(PyDateTime_Date *self)
{
return PyUnicode_FromFormat("%s(%d, %d, %d)",
- Py_Type(self)->tp_name,
+ Py_TYPE(self)->tp_name,
GET_YEAR(self), GET_MONTH(self), GET_DAY(self));
}
@@ -2522,7 +2522,7 @@
tuple = Py_BuildValue("iii", year, month, day);
if (tuple == NULL)
return NULL;
- clone = date_new(Py_Type(self), tuple, NULL);
+ clone = date_new(Py_TYPE(self), tuple, NULL);
Py_DECREF(tuple);
return clone;
}
@@ -2590,7 +2590,7 @@
static PyObject *
date_reduce(PyDateTime_Date *self, PyObject *arg)
{
- return Py_BuildValue("(ON)", Py_Type(self), date_getstate(self));
+ return Py_BuildValue("(ON)", Py_TYPE(self), date_getstate(self));
}
static PyMethodDef date_methods[] = {
@@ -2893,10 +2893,10 @@
if (state == Py_None) {
Py_DECREF(state);
- return Py_BuildValue("(ON)", Py_Type(self), args);
+ return Py_BuildValue("(ON)", Py_TYPE(self), args);
}
else
- return Py_BuildValue("(ONN)", Py_Type(self), args, state);
+ return Py_BuildValue("(ONN)", Py_TYPE(self), args, state);
}
static PyMethodDef tzinfo_methods[] = {
@@ -3089,7 +3089,7 @@
if (HASTZINFO(self)) {
Py_XDECREF(self->tzinfo);
}
- Py_Type(self)->tp_free((PyObject *)self);
+ Py_TYPE(self)->tp_free((PyObject *)self);
}
/*
@@ -3122,7 +3122,7 @@
static PyObject *
time_repr(PyDateTime_Time *self)
{
- const char *type_name = Py_Type(self)->tp_name;
+ const char *type_name = Py_TYPE(self)->tp_name;
int h = TIME_GET_HOUR(self);
int m = TIME_GET_MINUTE(self);
int s = TIME_GET_SECOND(self);
@@ -3346,7 +3346,7 @@
tuple = Py_BuildValue("iiiiO", hh, mm, ss, us, tzinfo);
if (tuple == NULL)
return NULL;
- clone = time_new(Py_Type(self), tuple, NULL);
+ clone = time_new(Py_TYPE(self), tuple, NULL);
Py_DECREF(tuple);
return clone;
}
@@ -3400,7 +3400,7 @@
static PyObject *
time_reduce(PyDateTime_Time *self, PyObject *arg)
{
- return Py_BuildValue("(ON)", Py_Type(self), time_getstate(self));
+ return Py_BuildValue("(ON)", Py_TYPE(self), time_getstate(self));
}
static PyMethodDef time_methods[] = {
@@ -3897,7 +3897,7 @@
if (HASTZINFO(self)) {
Py_XDECREF(self->tzinfo);
}
- Py_Type(self)->tp_free((PyObject *)self);
+ Py_TYPE(self)->tp_free((PyObject *)self);
}
/*
@@ -4045,7 +4045,7 @@
static PyObject *
datetime_repr(PyDateTime_DateTime *self)
{
- const char *type_name = Py_Type(self)->tp_name;
+ const char *type_name = Py_TYPE(self)->tp_name;
PyObject *baserepr;
if (DATE_GET_MICROSECOND(self)) {
@@ -4262,7 +4262,7 @@
tuple = Py_BuildValue("iiiiiiiO", y, m, d, hh, mm, ss, us, tzinfo);
if (tuple == NULL)
return NULL;
- clone = datetime_new(Py_Type(self), tuple, NULL);
+ clone = datetime_new(Py_TYPE(self), tuple, NULL);
Py_DECREF(tuple);
return clone;
}
@@ -4450,7 +4450,7 @@
static PyObject *
datetime_reduce(PyDateTime_DateTime *self, PyObject *arg)
{
- return Py_BuildValue("(ON)", Py_Type(self), datetime_getstate(self));
+ return Py_BuildValue("(ON)", Py_TYPE(self), datetime_getstate(self));
}
static PyMethodDef datetime_methods[] = {