Correct the implementation of relational key construction in Episode._season(), separating XML attributes from key construction.

Author: Touchstone64

plexapi/mixins/tv_parent_child.py

@@ -4,15 +4,15 @@
 class TvParentChildMixin:
     """ Mixin for Plex objects that have parent/child relationships (episode/season/show). """
 
-    def _buildRelationKey(self, key, **kwargs):
+    def _buildRelationalKey(self, key, **kwargs):
         """ Returns a key suitable for fetching parent/child TV items
 
             Parameters:
-                key (str): The relational key being fetched, such as '/children' (may be
-                    empty).
-                **kwargs (dict): Custom XML attribute filters to apply to add to the
-                    query. See :func:`~plexapi.base.PlexObject.fetchItems` for more
-                    details on how this is used.
+                key (str): The relational key to be fetched.
+                **kwargs (dict): Optional relational selection parameters to apply to the
+                    key, for example 'excludeAllLeaves=1'. Additional options (such as XML
+                    filters) should be passed into search functions. See :func:`~plexapi.base.PlexObject.fetchItems`
+                    for details.
 
         """
         if not key:

plexapi/video.py

@@ -710,7 +710,7 @@ def season(self, title=None, season=None):
             Raises:
                 :exc:`~plexapi.exceptions.BadRequest`: If title or season parameter is missing.
         """
-        key = self._buildRelationKey(f'{self.key}/children', excludeAllLeaves=1)
+        key = self._buildRelationalKey(f'{self.key}/children', excludeAllLeaves=1)
         if title is not None and not isinstance(title, int):
             return self.fetchItem(key, Season, title__iexact=title)
         elif season is not None or isinstance(title, int):
@@ -723,7 +723,7 @@ def season(self, title=None, season=None):
 
     def seasons(self, **kwargs):
         """ Returns a list of :class:`~plexapi.video.Season` objects in the show. """
-        key = self._buildRelationKey(f'{self.key}/children', excludeAllLeaves=1)
+        key = self._buildRelationalKey(f'{self.key}/children', excludeAllLeaves=1)
         return self.fetchItems(key, Season, container_size=self.childCount, **kwargs)
 
     def episode(self, title=None, season=None, episode=None):
@@ -737,7 +737,7 @@ def episode(self, title=None, season=None, episode=None):
             Raises:
                 :exc:`~plexapi.exceptions.BadRequest`: If title or season and episode parameters are missing.
         """
-        key = self._buildRelationKey(f'{self.key}/allLeaves')
+        key = self._buildRelationalKey(f'{self.key}/allLeaves')
         if title is not None:
             return self.fetchItem(key, Episode, title__iexact=title)
         elif season is not None and episode is not None:
@@ -746,7 +746,7 @@ def episode(self, title=None, season=None, episode=None):
 
     def episodes(self, **kwargs):
         """ Returns a list of :class:`~plexapi.video.Episode` objects in the show. """
-        key = self._buildRelationKey(f'{self.key}/allLeaves')
+        key = self._buildRelationalKey(f'{self.key}/allLeaves')
         return self.fetchItems(key, Episode, **kwargs)
 
     def get(self, title=None, season=None, episode=None):
@@ -906,7 +906,7 @@ def episode(self, title=None, episode=None):
             Raises:
                 :exc:`~plexapi.exceptions.BadRequest`: If title or episode parameter is missing.
         """
-        key = self._buildRelationKey(f'{self.key}/children')
+        key = self._buildRelationalKey(f'{self.key}/children')
         if title is not None and not isinstance(title, int):
             return self.fetchItem(key, Episode, title__iexact=title)
         elif episode is not None or isinstance(title, int):
@@ -919,7 +919,7 @@ def episode(self, title=None, episode=None):
 
     def episodes(self, **kwargs):
         """ Returns a list of :class:`~plexapi.video.Episode` objects in the season. """
-        key = self._buildRelationKey(f'{self.key}/children')
+        key = self._buildRelationalKey(f'{self.key}/children')
         return self.fetchItems(key, Episode, **kwargs)
 
     def get(self, title=None, episode=None):
@@ -928,7 +928,7 @@ def get(self, title=None, episode=None):
 
     def show(self):
         """ Return the season's :class:`~plexapi.video.Show`. """
-        return self.fetchItem(self._buildRelationKey(self.parentKey))
+        return self.fetchItem(self._buildRelationalKey(self.parentKey))
 
     def watched(self):
         """ Returns list of watched :class:`~plexapi.video.Episode` objects. """
@@ -1136,12 +1136,11 @@ def parentThumb(self):
     def _season(self):
         """ Returns the :class:`~plexapi.video.Season` object by querying for the show's children. """
         if self.grandparentKey and self.parentIndex is not None:
-            key = self._buildRelationKey(
+            key = self._buildRelationalKey(
                 f'{self.grandparentKey}/children',
-                excludeAllLeaves=1,
-                index=self.parentIndex
+                excludeAllLeaves=1
             )
-            return self.fetchItem(key)
+            return self.fetchItem(key, index=self.parentIndex)
         return None
 
     def __repr__(self):
@@ -1218,11 +1217,11 @@ def hasPreviewThumbnails(self):
 
     def season(self):
         """" Return the episode's :class:`~plexapi.video.Season`. """
-        return self.fetchItem(self._buildRelationKey(self.parentKey))
+        return self.fetchItem(self._buildRelationalKey(self.parentKey))
 
     def show(self):
         """" Return the episode's :class:`~plexapi.video.Show`. """
-        return self.fetchItem(self._buildRelationKey(self.grandparentKey))
+        return self.fetchItem(self._buildRelationalKey(self.grandparentKey))
 
     def _defaultSyncTitle(self):
         """ Returns str, default title for a new syncItem. """