Skip to content

remove more python2/3 shim code: next -> __next__ #1432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 4, 2022
Merged

remove more python2/3 shim code: next -> __next__ #1432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/py-opentimelineio/opentimelineio-bindings/otio_anyDictionary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@ using namespace pybind11::literals;
void otio_any_dictionary_bindings(py::module m) {
py::class_<AnyDictionaryProxy::Iterator>(m, "AnyDictionaryIterator")
.def("__iter__", &AnyDictionaryProxy::Iterator::iter)
#if PY_MAJOR_VERSION >= 3
.def("__next__", &AnyDictionaryProxy::Iterator::next);
#else
.def("next", &AnyDictionaryProxy::Iterator::next);
#endif

py::class_<AnyDictionaryProxy>(m, "AnyDictionary")
.def(py::init<>())
Expand Down
4 changes: 0 additions & 4 deletions src/py-opentimelineio/opentimelineio-bindings/otio_anyVector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,7 @@ using namespace pybind11::literals;
void otio_any_vector_bindings(py::module m) {
py::class_<AnyVectorProxy::Iterator>(m, "AnyVectorIterator")
.def("__iter__", &AnyVectorProxy::Iterator::iter)
#if PY_MAJOR_VERSION >= 3
.def("__next__", &AnyVectorProxy::Iterator::next);
#else
.def("next", &AnyVectorProxy::Iterator::next);
#endif

py::class_<AnyVectorProxy>(m, "AnyVector")
.def(py::init<>())
Expand Down
4 changes: 2 additions & 2 deletions src/py-opentimelineio/opentimelineio-bindings/otio_serializableObjects.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ The marked range may have a zero duration. The marked range is in the owning ite
using SerializableCollectionIterator = ContainerIterator<SerializableCollection, SerializableObject*>;
py::class_<SerializableCollectionIterator>(m, "SerializableCollectionIterator", py::dynamic_attr())
.def("__iter__", &SerializableCollectionIterator::iter)
.def("next", &SerializableCollectionIterator::next);
.def("__next__", &SerializableCollectionIterator::next);

py::class_<SerializableCollection, SOWithMetadata,
managing_ptr<SerializableCollection>>(m, "SerializableCollection", py::dynamic_attr(), R"docstring(
Expand Down Expand Up @@ -443,7 +443,7 @@ Contains a :class:`.MediaReference` and a trim on that media reference.
using CompositionIterator = ContainerIterator<Composition, Composable*>;
py::class_<CompositionIterator>(m, "CompositionIterator")
.def("__iter__", &CompositionIterator::iter)
.def("next", &CompositionIterator::next);
.def("__next__", &CompositionIterator::next);

py::class_<Composition, Item, managing_ptr<Composition>>(m, "Composition", py::dynamic_attr(), R"docstring(
Base class for an :class:`~Item` that contains other :class:`~Item`\s.
Expand Down
1 change: 0 additions & 1 deletion src/py-opentimelineio/opentimelineio-bindings/otio_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ struct MutableSequencePyAPI : public V {

pybind11::class_<This::Iterator>(m, (name + "Iterator").c_str())
.def("__iter__", &This::Iterator::iter)
.def("next", &This::Iterator::next)
.def("__next__", &This::Iterator::next);

pybind11::class_<This>(m, name.c_str())
Expand Down