Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2025-01-31 15:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add and remove some PyPy iterator workarounds

Browse Source 
* The definition of `PySequence_Fast` is more restrictive on PyPy, so
  use the slow path instead.
* `PyDict_Next` has been fixed in PyPy -> remove workaround.
This commit is contained in:
Dean Moldovan 2017-02-10 12:20:24 +01:00 committed by Wenzel Jakob
parent 5637af7b67
commit 5fe9908b7a
2 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/pybind11/pybind11.h
View File

@ -1177,29 +1177,10 @@ public:
/// Export enumeration entries into the parent scope /// Export enumeration entries into the parent scope
enum_ &export_values() { enum_ &export_values() {
#if !defined(PYPY_VERSION) for (auto item : reinterpret_borrow<dict>(((PyTypeObject *) this->m_ptr)->tp_dict)) {
PyObject *dict = ((PyTypeObject *) this->m_ptr)->tp_dict; if (isinstance(item.second, this->m_ptr))
PyObject *key, *value; m_parent.attr(item.first) = item.second;
ssize_t pos = 0;
while (PyDict_Next(dict, &pos, &key, &value)) {
if (PyObject_IsInstance(value, this->m_ptr))
m_parent.attr(key) = value;
} }
#else
/* PyPy's cpyext still has difficulties with the above
CPython API calls; emulate using Python code. */
dict d; d["t"] = *this; d["p"] = m_parent;
PyObject *result = PyRun_String(
"for k, v in t.__dict__.items():\n"
" if isinstance(v, t):\n"
" setattr(p, k, v)\n",
Py_file_input, d.ptr(), d.ptr());
if (result == nullptr)
throw error_already_set();
Py_DECREF(result);
#endif
return *this; return *this;
} }

6
include/pybind11/pytypes.h
View File

@ -613,8 +613,14 @@ private:
}; };
NAMESPACE_END(iterator_policies) NAMESPACE_END(iterator_policies)
#if !defined(PYPY_VERSION)
using tuple_iterator = generic_iterator<iterator_policies::sequence_fast_readonly>; using tuple_iterator = generic_iterator<iterator_policies::sequence_fast_readonly>;
using list_iterator = generic_iterator<iterator_policies::sequence_fast_readonly>; using list_iterator = generic_iterator<iterator_policies::sequence_fast_readonly>;
#else
using tuple_iterator = generic_iterator<iterator_policies::sequence_slow_readwrite>;
using list_iterator = generic_iterator<iterator_policies::sequence_slow_readwrite>;
#endif
using sequence_iterator = generic_iterator<iterator_policies::sequence_slow_readwrite>; using sequence_iterator = generic_iterator<iterator_policies::sequence_slow_readwrite>;
using dict_iterator = generic_iterator<iterator_policies::dict_readonly>; using dict_iterator = generic_iterator<iterator_policies::dict_readonly>;