summaryrefslogtreecommitdiffstats
path: root/Objects/weakrefobject.c
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2007-12-19 02:45:37 (GMT)
committerChristian Heimes <christian@cheimes.de>2007-12-19 02:45:37 (GMT)
commit90aa7646affbaee9628ca6ea6a702aec17b3b550 (patch)
treee820962e9658a92c7147b686f8aa88c7658c5949 /Objects/weakrefobject.c
parent99170a5dbf4cfee78b578672b6821e855f92594b (diff)
downloadcpython-90aa7646affbaee9628ca6ea6a702aec17b3b550.zip
cpython-90aa7646affbaee9628ca6ea6a702aec17b3b550.tar.gz
cpython-90aa7646affbaee9628ca6ea6a702aec17b3b550.tar.bz2
#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT.
Diffstat (limited to 'Objects/weakrefobject.c')
-rw-r--r--Objects/weakrefobject.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c
index 0aa4703..c7dce8f 100644
--- a/Objects/weakrefobject.c
+++ b/Objects/weakrefobject.c
@@ -105,7 +105,7 @@ weakref_dealloc(PyObject *self)
{
PyObject_GC_UnTrack(self);
clear_weakref((PyWeakReference *) self);
- Py_Type(self)->tp_free(self);
+ Py_TYPE(self)->tp_free(self);
}
@@ -172,7 +172,7 @@ weakref_repr(PyWeakReference *self)
name ? "<weakref at %p; to '%.50s' at %p (%s)>"
: "<weakref at %p; to '%.50s' at %p>",
self,
- Py_Type(PyWeakref_GET_OBJECT(self))->tp_name,
+ Py_TYPE(PyWeakref_GET_OBJECT(self))->tp_name,
PyWeakref_GET_OBJECT(self),
name);
Py_XDECREF(nameobj);
@@ -276,10 +276,10 @@ weakref___new__(PyTypeObject *type, PyObject *args, PyObject *kwargs)
PyWeakReference *ref, *proxy;
PyWeakReference **list;
- if (!PyType_SUPPORTS_WEAKREFS(Py_Type(ob))) {
+ if (!PyType_SUPPORTS_WEAKREFS(Py_TYPE(ob))) {
PyErr_Format(PyExc_TypeError,
"cannot create weak reference to '%s' object",
- Py_Type(ob)->tp_name);
+ Py_TYPE(ob)->tp_name);
return NULL;
}
if (callback == Py_None)
@@ -448,7 +448,7 @@ proxy_repr(PyWeakReference *proxy)
char buf[160];
PyOS_snprintf(buf, sizeof(buf),
"<weakproxy at %p to %.100s at %p>", proxy,
- Py_Type(PyWeakref_GET_OBJECT(proxy))->tp_name,
+ Py_TYPE(PyWeakref_GET_OBJECT(proxy))->tp_name,
PyWeakref_GET_OBJECT(proxy));
return PyUnicode_FromString(buf);
}
@@ -699,10 +699,10 @@ PyWeakref_NewRef(PyObject *ob, PyObject *callback)
PyWeakReference **list;
PyWeakReference *ref, *proxy;
- if (!PyType_SUPPORTS_WEAKREFS(Py_Type(ob))) {
+ if (!PyType_SUPPORTS_WEAKREFS(Py_TYPE(ob))) {
PyErr_Format(PyExc_TypeError,
"cannot create weak reference to '%s' object",
- Py_Type(ob)->tp_name);
+ Py_TYPE(ob)->tp_name);
return NULL;
}
list = GET_WEAKREFS_LISTPTR(ob);
@@ -758,10 +758,10 @@ PyWeakref_NewProxy(PyObject *ob, PyObject *callback)
PyWeakReference **list;
PyWeakReference *ref, *proxy;
- if (!PyType_SUPPORTS_WEAKREFS(Py_Type(ob))) {
+ if (!PyType_SUPPORTS_WEAKREFS(Py_TYPE(ob))) {
PyErr_Format(PyExc_TypeError,
"cannot create weak reference to '%s' object",
- Py_Type(ob)->tp_name);
+ Py_TYPE(ob)->tp_name);
return NULL;
}
list = GET_WEAKREFS_LISTPTR(ob);
@@ -784,9 +784,9 @@ PyWeakref_NewProxy(PyObject *ob, PyObject *callback)
PyWeakReference *prev;
if (PyCallable_Check(ob))
- Py_Type(result) = &_PyWeakref_CallableProxyType;
+ Py_TYPE(result) = &_PyWeakref_CallableProxyType;
else
- Py_Type(result) = &_PyWeakref_ProxyType;
+ Py_TYPE(result) = &_PyWeakref_ProxyType;
get_basic_refs(*list, &ref, &proxy);
if (callback == NULL) {
if (proxy != NULL) {
@@ -851,7 +851,7 @@ PyObject_ClearWeakRefs(PyObject *object)
PyWeakReference **list;
if (object == NULL
- || !PyType_SUPPORTS_WEAKREFS(Py_Type(object))
+ || !PyType_SUPPORTS_WEAKREFS(Py_TYPE(object))
|| object->ob_refcnt != 0) {
PyErr_BadInternalCall();
return;