mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 18:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT.

Browse source
This commit is contained in:
Christian Heimes 2007-12-19 02:45:37 +00:00
parent 99170a5dbf
commit 90aa7646af
144 changed files with 1306 additions and 1153 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Python/ast.c
View file

@ -3156,7 +3156,7 @@ decode_unicode(const char *s, size_t len, int rawmode, const char *encoding)
return NULL;
}
r = PyString_AS_STRING(w);
rn = Py_Size(w);
rn = Py_SIZE(w);
assert(rn % 2 == 0);
for (i = 0; i < rn; i += 2) {
sprintf(p, "\\u%02x%02x",

24
Python/bltinmodule.c
View file

@ -309,16 +309,16 @@ builtin_format(PyObject *self, PyObject *args)
}
/* Make sure the type is initialized. float gets initialized late */
if (Py_Type(value)->tp_dict == NULL)
if (PyType_Ready(Py_Type(value)) < 0)
if (Py_TYPE(value)->tp_dict == NULL)
if (PyType_Ready(Py_TYPE(value)) < 0)
goto done;
/* Find the (unbound!) __format__ method (a borrowed reference) */
meth = _PyType_Lookup(Py_Type(value), format_str);
meth = _PyType_Lookup(Py_TYPE(value), format_str);
if (meth == NULL) {
PyErr_Format(PyExc_TypeError,
"Type %.100s doesn't define __format__",
Py_Type(value)->tp_name);
Py_TYPE(value)->tp_name);
goto done;
}
@ -1433,8 +1433,8 @@ builtin_round(PyObject *self, PyObject *args, PyObject *kwds)
kwlist, &number, &ndigits))
return NULL;
if (Py_Type(number)->tp_dict == NULL) {
if (PyType_Ready(Py_Type(number)) < 0)
if (Py_TYPE(number)->tp_dict == NULL) {
if (PyType_Ready(Py_TYPE(number)) < 0)
return NULL;
}
@ -1444,11 +1444,11 @@ builtin_round(PyObject *self, PyObject *args, PyObject *kwds)
return NULL;
}
round = _PyType_Lookup(Py_Type(number), round_str);
round = _PyType_Lookup(Py_TYPE(number), round_str);
if (round == NULL) {
PyErr_Format(PyExc_TypeError,
"type %.100s doesn't define __round__ method",
Py_Type(number)->tp_name);
Py_TYPE(number)->tp_name);
return NULL;
}
@ -1552,8 +1552,8 @@ builtin_trunc(PyObject *self, PyObject *number)
static PyObject *trunc_str = NULL;
PyObject *trunc;
if (Py_Type(number)->tp_dict == NULL) {
if (PyType_Ready(Py_Type(number)) < 0)
if (Py_TYPE(number)->tp_dict == NULL) {
if (PyType_Ready(Py_TYPE(number)) < 0)
return NULL;
}
@ -1563,11 +1563,11 @@ builtin_trunc(PyObject *self, PyObject *number)
return NULL;
}
trunc = _PyType_Lookup(Py_Type(number), trunc_str);
trunc = _PyType_Lookup(Py_TYPE(number), trunc_str);
if (trunc == NULL) {
PyErr_Format(PyExc_TypeError,
"type %.100s doesn't define __trunc__ method",
Py_Type(number)->tp_name);
Py_TYPE(number)->tp_name);
return NULL;
}
return PyObject_CallFunction(trunc, "O", number);

4
Python/ceval.c
View file

@ -3006,7 +3006,7 @@ unpack_iterable(PyObject *v, int argcnt, int argcntafter, PyObject **sp)
*--sp = PyList_GET_ITEM(l, ll - j);
}
/* Resize the list. */
Py_Size(l) = ll - argcntafter;
Py_SIZE(l) = ll - argcntafter;
Py_DECREF(it);
return 1;
@ -3496,7 +3496,7 @@ fast_function(PyObject *func, PyObject ***pp_stack, int n, int na, int nk)
}
if (argdefs != NULL) {
d = &PyTuple_GET_ITEM(argdefs, 0);
nd = Py_Size(argdefs);
nd = Py_SIZE(argdefs);
}
return PyEval_EvalCodeEx(co, globals,
(PyObject *)NULL, (*pp_stack)-n, na,

2
Python/codecs.c
View file

@ -354,7 +354,7 @@ PyObject *PyCodec_Encode(PyObject *object,
v = NULL;
goto onError;
}
v = PyString_FromStringAndSize(PyBytes_AS_STRING(v), Py_Size(v));
v = PyString_FromStringAndSize(PyBytes_AS_STRING(v), Py_SIZE(v));
}
else if (PyString_Check(v))
Py_INCREF(v);

4
Python/marshal.c
View file

@ -153,7 +153,7 @@ w_object(PyObject *v, WFILE *p)
PyLongObject *ob = (PyLongObject *)v;
PyErr_Clear();
w_byte(TYPE_LONG, p);
n = Py_Size(ob);
n = Py_SIZE(ob);
w_long((long)n, p);
if (n < 0)
n = -n;
@ -557,7 +557,7 @@ r_object(RFILE *p)
retval = NULL;
break;
}
Py_Size(ob) = n;
Py_SIZE(ob) = n;
for (i = 0; i < size; i++) {
int digit = r_short(p);
if (digit < 0) {