mirror of https://github.com/python/cpython
gh-106084: Remove _PyObject_HasLen() function (#106103)
Remove _PyObject_HasLen() and _PySequence_IterSearch() functions from the public C API: move them to the internal C API (pycore_abstract.h). No longer export these symbols (in libpython). Remove also unused pycore_initconfig.h include in typeobject.c.
This commit is contained in:
parent
c075a1974b
commit
6200aaf296
|
@ -133,8 +133,6 @@ _PyObject_CallMethodIdOneArg(PyObject *self, _Py_Identifier *name, PyObject *arg
|
||||||
return _PyObject_VectorcallMethodId(name, args, nargsf, _Py_NULL);
|
return _PyObject_VectorcallMethodId(name, args, nargsf, _Py_NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
PyAPI_FUNC(int) _PyObject_HasLen(PyObject *o);
|
|
||||||
|
|
||||||
/* Guess the size of object 'o' using len(o) or o.__length_hint__().
|
/* Guess the size of object 'o' using len(o) or o.__length_hint__().
|
||||||
If neither of those return a non-negative value, then return the default
|
If neither of those return a non-negative value, then return the default
|
||||||
value. If one of the calls fails, this function returns -1. */
|
value. If one of the calls fails, this function returns -1. */
|
||||||
|
@ -147,24 +145,6 @@ PyAPI_FUNC(Py_ssize_t) PyObject_LengthHint(PyObject *o, Py_ssize_t);
|
||||||
#define PySequence_ITEM(o, i)\
|
#define PySequence_ITEM(o, i)\
|
||||||
( Py_TYPE(o)->tp_as_sequence->sq_item((o), (i)) )
|
( Py_TYPE(o)->tp_as_sequence->sq_item((o), (i)) )
|
||||||
|
|
||||||
#define PY_ITERSEARCH_COUNT 1
|
|
||||||
#define PY_ITERSEARCH_INDEX 2
|
|
||||||
#define PY_ITERSEARCH_CONTAINS 3
|
|
||||||
|
|
||||||
/* Iterate over seq.
|
|
||||||
|
|
||||||
Result depends on the operation:
|
|
||||||
|
|
||||||
PY_ITERSEARCH_COUNT: return # of times obj appears in seq; -1 if
|
|
||||||
error.
|
|
||||||
PY_ITERSEARCH_INDEX: return 0-based index of first occurrence of
|
|
||||||
obj in seq; set ValueError and return -1 if none found;
|
|
||||||
also return -1 on error.
|
|
||||||
PY_ITERSEARCH_CONTAINS: return 1 if obj in seq, else 0; -1 on
|
|
||||||
error. */
|
|
||||||
PyAPI_FUNC(Py_ssize_t) _PySequence_IterSearch(PyObject *seq,
|
|
||||||
PyObject *obj, int operation);
|
|
||||||
|
|
||||||
/* === Mapping protocol ================================================= */
|
/* === Mapping protocol ================================================= */
|
||||||
|
|
||||||
PyAPI_FUNC(int) _PyObject_RealIsInstance(PyObject *inst, PyObject *cls);
|
PyAPI_FUNC(int) _PyObject_RealIsInstance(PyObject *inst, PyObject *cls);
|
||||||
|
|
|
@ -19,6 +19,28 @@ _PyIndex_Check(PyObject *obj)
|
||||||
PyObject *_PyNumber_PowerNoMod(PyObject *lhs, PyObject *rhs);
|
PyObject *_PyNumber_PowerNoMod(PyObject *lhs, PyObject *rhs);
|
||||||
PyObject *_PyNumber_InPlacePowerNoMod(PyObject *lhs, PyObject *rhs);
|
PyObject *_PyNumber_InPlacePowerNoMod(PyObject *lhs, PyObject *rhs);
|
||||||
|
|
||||||
|
extern int _PyObject_HasLen(PyObject *o);
|
||||||
|
|
||||||
|
/* === Sequence protocol ================================================ */
|
||||||
|
|
||||||
|
#define PY_ITERSEARCH_COUNT 1
|
||||||
|
#define PY_ITERSEARCH_INDEX 2
|
||||||
|
#define PY_ITERSEARCH_CONTAINS 3
|
||||||
|
|
||||||
|
/* Iterate over seq.
|
||||||
|
|
||||||
|
Result depends on the operation:
|
||||||
|
|
||||||
|
PY_ITERSEARCH_COUNT: return # of times obj appears in seq; -1 if
|
||||||
|
error.
|
||||||
|
PY_ITERSEARCH_INDEX: return 0-based index of first occurrence of
|
||||||
|
obj in seq; set ValueError and return -1 if none found;
|
||||||
|
also return -1 on error.
|
||||||
|
PY_ITERSEARCH_CONTAINS: return 1 if obj in seq, else 0; -1 on
|
||||||
|
error. */
|
||||||
|
extern Py_ssize_t _PySequence_IterSearch(PyObject *seq,
|
||||||
|
PyObject *obj, int operation);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
/* Iterator objects */
|
/* Iterator objects */
|
||||||
|
|
||||||
#include "Python.h"
|
#include "Python.h"
|
||||||
|
#include "pycore_abstract.h" // _PyObject_HasLen()
|
||||||
#include "pycore_call.h" // _PyObject_CallNoArgs()
|
#include "pycore_call.h" // _PyObject_CallNoArgs()
|
||||||
#include "pycore_object.h" // _PyObject_GC_TRACK()
|
#include "pycore_object.h" // _PyObject_GC_TRACK()
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
/* Type object implementation */
|
/* Type object implementation */
|
||||||
|
|
||||||
#include "Python.h"
|
#include "Python.h"
|
||||||
#include "pycore_call.h"
|
#include "pycore_abstract.h" // _PySequence_IterSearch()
|
||||||
|
#include "pycore_call.h" // _PyObject_VectorcallTstate()
|
||||||
#include "pycore_code.h" // CO_FAST_FREE
|
#include "pycore_code.h" // CO_FAST_FREE
|
||||||
#include "pycore_dict.h" // _PyDict_KeysSize()
|
#include "pycore_dict.h" // _PyDict_KeysSize()
|
||||||
#include "pycore_frame.h" // _PyInterpreterFrame
|
#include "pycore_frame.h" // _PyInterpreterFrame
|
||||||
#include "pycore_initconfig.h" // _PyStatus_OK()
|
|
||||||
#include "pycore_long.h" // _PyLong_IsNegative()
|
#include "pycore_long.h" // _PyLong_IsNegative()
|
||||||
#include "pycore_memoryobject.h" // _PyMemoryView_FromBufferProc()
|
#include "pycore_memoryobject.h" // _PyMemoryView_FromBufferProc()
|
||||||
#include "pycore_moduleobject.h" // _PyModule_GetDef()
|
#include "pycore_moduleobject.h" // _PyModule_GetDef()
|
||||||
|
|
Loading…
Reference in New Issue