summaryrefslogtreecommitdiffstats
path: root/Objects/dictobject.c
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2007-12-19 02:37:44 (GMT)
committerChristian Heimes <christian@cheimes.de>2007-12-19 02:37:44 (GMT)
commite93237dfcc4ee4feee62adafb4e7899487ca864b (patch)
treeb78abc265e7fb10639492f62e4ffd0ce1bcc67af /Objects/dictobject.c
parentd586559c31b77938b514cec99f2f8b431a34dff5 (diff)
downloadcpython-e93237dfcc4ee4feee62adafb4e7899487ca864b.zip
cpython-e93237dfcc4ee4feee62adafb4e7899487ca864b.tar.gz
cpython-e93237dfcc4ee4feee62adafb4e7899487ca864b.tar.bz2
#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available.
Diffstat (limited to 'Objects/dictobject.c')
-rw-r--r--Objects/dictobject.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 365aac6..1035e5f 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -202,7 +202,7 @@ PyDict_New(void)
if (num_free_dicts) {
mp = free_dicts[--num_free_dicts];
assert (mp != NULL);
- assert (Py_Type(mp) == &PyDict_Type);
+ assert (Py_TYPE(mp) == &PyDict_Type);
_Py_NewReference((PyObject *)mp);
if (mp->ma_fill) {
EMPTY_TO_MINSIZE(mp);
@@ -868,10 +868,10 @@ dict_dealloc(register PyDictObject *mp)
}
if (mp->ma_table != mp->ma_smalltable)
PyMem_DEL(mp->ma_table);
- if (num_free_dicts < MAXFREEDICTS && Py_Type(mp) == &PyDict_Type)
+ if (num_free_dicts < MAXFREEDICTS && Py_TYPE(mp) == &PyDict_Type)
free_dicts[num_free_dicts++] = mp;
else
- Py_Type(mp)->tp_free((PyObject *)mp);
+ Py_TYPE(mp)->tp_free((PyObject *)mp);
Py_TRASHCAN_SAFE_END(mp)
}
@@ -1041,7 +1041,7 @@ dict_subscript(PyDictObject *mp, register PyObject *key)
if (missing_str == NULL)
missing_str =
PyString_InternFromString("__missing__");
- missing = _PyType_Lookup(Py_Type(mp), missing_str);
+ missing = _PyType_Lookup(Py_TYPE(mp), missing_str);
if (missing != NULL)
return PyObject_CallFunctionObjArgs(missing,
(PyObject *)mp, key, NULL);