master conflict resolution

This commit is contained in:
blacktwin 2020-08-30 01:11:26 -04:00
parent 998ed04a6c
commit 34e1ea3444

View file

@ -823,6 +823,13 @@ class Clip(Playable, Video):
self.title = data.attrib.get('title')
self.type = data.attrib.get('type')
self.year = data.attrib.get('year')
self.viewOffset = utils.cast(int, data.attrib.get('viewOffset', 0))
def section(self):
"""Return the :class:`~plexapi.library.LibrarySection` this item belongs to."""
# Clip payloads currently do not contain 'librarySectionID'.
# Return None to avoid unnecessary attribute lookup attempts.
return None
@utils.registerPlexObject