Skip to content

Commit

Permalink
Updated test based on new unique naming.
Browse files Browse the repository at this point in the history
Lint.
  • Loading branch information
jminor committed Dec 20, 2017
1 parent 912732f commit d6282e7
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion contrib/adapters/advanced_authoring_format.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ def _unique_name(name):
__names.add(name)
return name


def _get_name(item):
if hasattr(item, 'name'):
name = item.name
Expand Down Expand Up @@ -322,7 +323,7 @@ def _transcribe(item, parent=None, editRate=24, masterMobs=None):
)

elif isinstance(item, aaf.component.DescriptiveMarker):

# TODO: We can get markers this way, but they come in on
# a separate Track. We need to consolidate them onto the
# same track(s) as the Clips.
Expand Down
12 changes: 6 additions & 6 deletions contrib/adapters/tests/test_aaf_adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -289,15 +289,15 @@ def test_aaf_read_transitions(self):
"Filler",
"Transition",
"tech.fux (loop)-HD.mp4",
"Transition",
"Transition 2",
"t-hawk (loop)-HD.mp4",
"Transition",
"Filler",
"Transition",
"Transition 3",
"Filler 2",
"Transition 4",
"KOLL-HD.mp4",
"brokchrd (loop)-HD.mp4",
"Transition",
"Filler"
"Transition 5",
"Filler 3"
]
)

Expand Down

0 comments on commit d6282e7

Please sign in to comment.