replace PyXXX_Length calls with PyXXX_Size calls
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index a00cd5d..0746282 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -1385,7 +1385,7 @@
if (!PyArg_ParseTuple(args, "O:len", &v))
return NULL;
- res = PyObject_Length(v);
+ res = PyObject_Size(v);
if (res < 0 && PyErr_Occurred())
return NULL;
return PyInt_FromLong(res);
diff --git a/Python/exceptions.c b/Python/exceptions.c
index c0e4d54..05e318e 100644
--- a/Python/exceptions.c
+++ b/Python/exceptions.c
@@ -224,7 +224,8 @@
return NULL;
/* set args attribute */
- args = PySequence_GetSlice(args, 1, PySequence_Length(args));
+ /* XXX size is only a hint */
+ args = PySequence_GetSlice(args, 1, PySequence_Size(args));
if (!args)
return NULL;
status = PyObject_SetAttrString(self, "args", args);
@@ -249,7 +250,7 @@
if (!args)
return NULL;
- switch (PySequence_Length(args)) {
+ switch (PySequence_Size(args)) {
case 0:
out = PyString_FromString("");
break;
@@ -374,7 +375,7 @@
return NULL;
/* Set args attribute. */
- if (!(args = PySequence_GetSlice(args, 1, PySequence_Length(args))))
+ if (!(args = PySequence_GetSlice(args, 1, PySequence_Size(args))))
return NULL;
status = PyObject_SetAttrString(self, "args", args);
@@ -384,7 +385,7 @@
}
/* set code attribute */
- switch (PySequence_Length(args)) {
+ switch (PySequence_Size(args)) {
case 0:
Py_INCREF(Py_None);
code = Py_None;
@@ -441,7 +442,7 @@
if (!(self = get_self(args)))
return NULL;
- if (!(args = PySequence_GetSlice(args, 1, PySequence_Length(args))))
+ if (!(args = PySequence_GetSlice(args, 1, PySequence_Size(args))))
return NULL;
if (PyObject_SetAttrString(self, "args", args) ||
@@ -452,7 +453,7 @@
goto finally;
}
- switch (PySequence_Length(args)) {
+ switch (PySequence_Size(args)) {
case 3:
/* Where a function has a single filename, such as open() or some
* of the os module functions, PyErr_SetFromErrnoWithFilename() is
@@ -671,13 +672,13 @@
if (!(self = get_self(args)))
return NULL;
- if (!(args = PySequence_GetSlice(args, 1, PySequence_Length(args))))
+ if (!(args = PySequence_GetSlice(args, 1, PySequence_Size(args))))
return NULL;
if (PyObject_SetAttrString(self, "args", args))
goto finally;
- lenargs = PySequence_Length(args);
+ lenargs = PySequence_Size(args);
if (lenargs >= 1) {
PyObject* item0 = PySequence_GetItem(args, 0);
int status;
diff --git a/Python/getargs.c b/Python/getargs.c
index ba855af..11754ef 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -348,7 +348,7 @@
return msgbuf;
}
- if ((i = PySequence_Length(arg)) != n) {
+ if ((i = PySequence_Size(arg)) != n) {
levels[0] = 0;
sprintf(msgbuf,
toplevel ? "%d arguments, %d" : "%d-sequence, %d-sequence",