Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 8 additions & 7 deletions src/py-opentimelineio/opentimelineio/adapters/fcp_xml.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,18 +181,19 @@ def _element_identification_string(element):

def _name_from_element(element):
"""
Fetches the name from the ``name`` element child of the provided element.
If no element exists, returns ``None``.
Fetches a name suitable for OTIO objects from the ``name`` element child
of the provided element.
If no element exists, returns empty string.

:param element: The element to find the name for.

:return: The name string or ``None``
:return: The name string or and empty string
"""
name_elem = element.find("./name")
if name_elem is not None:
return name_elem.text
return name_elem.text if name_elem.text is not None else ""

return None
return ""


def _rate_for_element(element):
Expand Down Expand Up @@ -1107,7 +1108,7 @@ def effect_from_filter_element(self, filter_element):
"could not find effect in filter: {}".format(filter_element)
)

name = effect_element.find("./name").text
name = _name_from_element(effect_element)

effect_metadata = _xml_tree_to_dict(effect_element, {"name"})

Expand Down Expand Up @@ -1138,7 +1139,7 @@ def transition_for_element(self, item_element, context):
cut_point = _transition_cut_point(item_element, context)

transition = schema.Transition(
name=item_element.find('./effect/name').text,
name=_name_from_element(item_element.find('./effect')),
transition_type=schema.TransitionTypes.SMPTE_Dissolve,
in_offset=cut_point - start,
out_offset=end - cut_point,
Expand Down
Loading