Skip to content

Commit d59a358

Browse files
Remove support for passing a None value as the name argument to Marker, Track, Stack and MissingReference constructors (#1453)
Signed-off-by: Jean-Christophe Morin <[email protected]>
1 parent bc504f7 commit d59a358

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/py-opentimelineio/opentimelineio-bindings/otio_serializableObjects.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -211,12 +211,12 @@ A marker indicates a marked range of time on an item in a timeline, usually with
211211
The marked range may have a zero duration. The marked range is in the owning item's time coordinate system.
212212
)docstring")
213213
.def(py::init([](
214-
optional<std::string> name,
214+
std::string name,
215215
TimeRange marked_range,
216216
std::string const& color,
217217
py::object metadata) {
218218
return new Marker(
219-
name.value_or(""),
219+
name,
220220
marked_range,
221221
color,
222222
py_to_any_dictionary(metadata));
@@ -552,12 +552,12 @@ Should be subclassed (for example by :class:`.Track` and :class:`.Stack`), not u
552552
.value("never", Track::NeighborGapPolicy::never);
553553

554554
track_class
555-
.def(py::init([](optional<std::string> name, optional<std::vector<Composable*>> children,
555+
.def(py::init([](std::string name, optional<std::vector<Composable*>> children,
556556
optional<TimeRange> const& source_range,
557557
std::string const& kind, py::object metadata) {
558558
auto composable_children = vector_or_default<Composable>(children);
559559
Track* t = new Track(
560-
name.value_or(""),
560+
name,
561561
source_range,
562562
kind,
563563
py_to_any_dictionary(metadata)
@@ -586,15 +586,15 @@ Should be subclassed (for example by :class:`.Track` and :class:`.Stack`), not u
586586

587587

588588
py::class_<Stack, Composition, managing_ptr<Stack>>(m, "Stack", py::dynamic_attr())
589-
.def(py::init([](optional<std::string> name,
589+
.def(py::init([](std::string name,
590590
optional<std::vector<Composable*>> children,
591591
optional<TimeRange> const& source_range,
592592
optional<std::vector<Marker*>> markers,
593593
optional<std::vector<Effect*>> effects,
594594
py::object metadata) {
595595
auto composable_children = vector_or_default<Composable>(children);
596596
Stack* s = new Stack(
597-
name.value_or(""),
597+
name,
598598
source_range,
599599
py_to_any_dictionary(metadata),
600600
vector_or_default<Effect>(effects),
@@ -742,12 +742,12 @@ Represents media for which a concrete reference is missing.
742742
Note that a :class:`~MissingReference` may have useful metadata, even if the location of the media is not known.
743743
)docstring")
744744
.def(py::init([](
745-
optional<std::string> name,
745+
std::string name,
746746
optional<TimeRange> available_range,
747747
py::object metadata,
748748
optional<Imath::Box2d> const& available_image_bounds) {
749749
return new MissingReference(
750-
name.value_or(""),
750+
name,
751751
available_range,
752752
py_to_any_dictionary(metadata),
753753
available_image_bounds);

src/py-opentimelineio/opentimelineio/adapters/fcp_xml.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,7 @@ def track_for_element(self, track_element, track_kind, context):
738738
"""
739739
local_context = context.context_pushing_element(track_element)
740740
name_element = track_element.find("./name")
741-
track_name = (name_element.text if name_element is not None else None)
741+
track_name = (name_element.text if name_element is not None else '')
742742

743743
timeline_item_tags = {"clipitem", "generatoritem", "transitionitem"}
744744

0 commit comments

Comments
 (0)