From cc60078652fd84e35e948ad503784a34b420c152 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Morin Date: Sun, 4 Dec 2022 16:49:13 -0500 Subject: [PATCH] Remove py_to_any_dictionary Signed-off-by: Jean-Christophe Morin --- .../opentimelineio-bindings/otio_bindings.cpp | 5 ++--- .../opentimelineio-bindings/otio_utils.cpp | 8 -------- .../opentimelineio-bindings/otio_utils.h | 2 -- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/py-opentimelineio/opentimelineio-bindings/otio_bindings.cpp b/src/py-opentimelineio/opentimelineio-bindings/otio_bindings.cpp index 74572125c..ce9a78baf 100644 --- a/src/py-opentimelineio/opentimelineio-bindings/otio_bindings.cpp +++ b/src/py-opentimelineio/opentimelineio-bindings/otio_bindings.cpp @@ -157,10 +157,9 @@ static void set_type_record(SerializableObject* so, std::string schema_name) { } static SerializableObject* instance_from_schema(std::string schema_name, - int schema_version, py::object data) { - AnyDictionary object_data = py_to_any_dictionary(data); + int schema_version, AnyDictionaryProxy* data) { auto result = TypeRegistry::instance().instance_from_schema(schema_name, schema_version, - object_data, ErrorStatusHandler()); + data->fetch_any_dictionary(), ErrorStatusHandler()); return result; } diff --git a/src/py-opentimelineio/opentimelineio-bindings/otio_utils.cpp b/src/py-opentimelineio/opentimelineio-bindings/otio_utils.cpp index 74d4d0ce3..a2a8b8501 100644 --- a/src/py-opentimelineio/opentimelineio-bindings/otio_utils.cpp +++ b/src/py-opentimelineio/opentimelineio-bindings/otio_utils.cpp @@ -212,14 +212,6 @@ T py_to_cpp(py::handle const& o) { return o.cast(); } -AnyDictionary py_to_any_dictionary(py::object const& o) { - if (o.is_none()) { - return AnyDictionary(); - } - - return safely_cast_any_dictionary_any(py_to_any(o)); -} - py::object any_to_py(any const& a, bool top_level) { std::type_info const& tInfo = a.type(); auto e = _py_cast_dispatch_table.find(&tInfo); diff --git a/src/py-opentimelineio/opentimelineio-bindings/otio_utils.h b/src/py-opentimelineio/opentimelineio-bindings/otio_utils.h index 1229d6d53..417a7b74b 100644 --- a/src/py-opentimelineio/opentimelineio-bindings/otio_utils.h +++ b/src/py-opentimelineio/opentimelineio-bindings/otio_utils.h @@ -164,5 +164,3 @@ AnyDictionary py_to_cpp(pybind11::dict const& o); AnyVector py_to_cpp(pybind11::iterable const& o); template T py_to_cpp(pybind11::handle const& o); - -AnyDictionary py_to_any_dictionary(pybind11::object const& o);