Skip to content

Commit b83ed7a

Browse files
committed
Remove all deprecated methods
1 parent 0a0cbb7 commit b83ed7a

File tree

6 files changed

+1
-116
lines changed

6 files changed

+1
-116
lines changed

plexapi/collection.py

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
ArtMixin, LogoMixin, PosterMixin, SquareArtMixin, ThemeMixin,
1212
CollectionEditMixins
1313
)
14-
from plexapi.utils import deprecated
1514

1615

1716
@utils.registerPlexObject
@@ -166,11 +165,6 @@ def isPhoto(self):
166165
""" Returns True if this is a photo collection. """
167166
return self.subtype in {'photoalbum', 'photo'}
168167

169-
@property
170-
@deprecated('use "items" instead', stacklevel=3)
171-
def children(self):
172-
return self.items()
173-
174168
@cached_data_property
175169
def _filters(self):
176170
""" Cache for filters. """
@@ -422,33 +416,6 @@ def updateFilters(self, libtype=None, limit=None, sort=None, filters=None, **kwa
422416
self._server.query(key, method=self._server._session.put)
423417
return self
424418

425-
@deprecated('use editTitle, editSortTitle, editContentRating, and editSummary instead')
426-
def edit(self, title=None, titleSort=None, contentRating=None, summary=None, **kwargs):
427-
""" Edit the collection.
428-
429-
Parameters:
430-
title (str, optional): The title of the collection.
431-
titleSort (str, optional): The sort title of the collection.
432-
contentRating (str, optional): The summary of the collection.
433-
summary (str, optional): The summary of the collection.
434-
"""
435-
args = {}
436-
if title is not None:
437-
args['title.value'] = title
438-
args['title.locked'] = 1
439-
if titleSort is not None:
440-
args['titleSort.value'] = titleSort
441-
args['titleSort.locked'] = 1
442-
if contentRating is not None:
443-
args['contentRating.value'] = contentRating
444-
args['contentRating.locked'] = 1
445-
if summary is not None:
446-
args['summary.value'] = summary
447-
args['summary.locked'] = 1
448-
449-
args.update(kwargs)
450-
self._edit(**args)
451-
452419
def delete(self):
453420
""" Delete the collection. """
454421
super(Collection, self).delete()

plexapi/library.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
ArtistEditMixins, AlbumEditMixins, TrackEditMixins, PhotoalbumEditMixins, PhotoEditMixins
1717
)
1818
from plexapi.settings import Setting
19-
from plexapi.utils import deprecated
2019

2120

2221
if TYPE_CHECKING:
@@ -1688,14 +1687,6 @@ def playlists(self, sort=None, **kwargs):
16881687
return self._server.playlists(
16891688
playlistType=self.CONTENT_TYPE, sectionId=self.key, sort=sort, **kwargs)
16901689

1691-
@deprecated('use "listFields" instead')
1692-
def filterFields(self, mediaType=None):
1693-
return self.listFields(libtype=mediaType)
1694-
1695-
@deprecated('use "listFilterChoices" instead')
1696-
def listChoices(self, category, libtype=None, **kwargs):
1697-
return self.listFilterChoices(field=category, libtype=libtype)
1698-
16991690
def getWebURL(self, base=None, tab=None, key=None):
17001691
""" Returns the Plex Web URL for the library.
17011692

plexapi/media.py

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
from plexapi import log, settings, utils
77
from plexapi.base import PlexObject, cached_data_property
88
from plexapi.exceptions import BadRequest
9-
from plexapi.utils import deprecated
109

1110

1211
@utils.registerPlexObject
@@ -231,18 +230,6 @@ def resetSelectedSubtitleStream(self):
231230
self._server.query(key, method=self._server._session.put, params=params)
232231
return self
233232

234-
@deprecated('Use "setSelectedAudioStream" instead.')
235-
def setDefaultAudioStream(self, stream):
236-
return self.setSelectedAudioStream(stream)
237-
238-
@deprecated('Use "setSelectedSubtitleStream" instead.')
239-
def setDefaultSubtitleStream(self, stream):
240-
return self.setSelectedSubtitleStream(stream)
241-
242-
@deprecated('Use "resetSelectedSubtitleStream" instead.')
243-
def resetDefaultSubtitleStream(self):
244-
return self.resetSelectedSubtitleStream()
245-
246233

247234
class MediaPartStream(PlexObject):
248235
""" Base class for media streams. These consist of video, audio, subtitles, and lyrics.
@@ -444,10 +431,6 @@ def levels(self, subSample=128):
444431
params = {'subsample': subSample}
445432
return self.fetchItems(key, params=params)
446433

447-
@deprecated('Use "setSelected" instead.')
448-
def setDefault(self):
449-
return self.setSelected()
450-
451434

452435
@utils.registerPlexObject
453436
class SubtitleStream(MediaPartStream):
@@ -494,10 +477,6 @@ def setSelected(self):
494477
"""
495478
return self._parent().setSelectedSubtitleStream(self)
496479

497-
@deprecated('Use "setSelected" instead.')
498-
def setDefault(self):
499-
return self.setSelected()
500-
501480

502481
@utils.registerPlexObject
503482
class LyricStream(MediaPartStream):
@@ -1281,20 +1260,11 @@ def mediaTypes(self):
12811260
return self.findItems(self._data, cls=AgentMediaType)
12821261
return []
12831262

1284-
@property
1285-
@deprecated('use "languageCodes" instead')
1286-
def languageCode(self):
1287-
return self.languageCodes
1288-
12891263
def settings(self):
12901264
key = f'/:/plugins/{self.identifier}/prefs'
12911265
data = self._server.query(key)
12921266
return self.findItems(data, cls=settings.Setting)
12931267

1294-
@deprecated('use "settings" instead')
1295-
def _settings(self):
1296-
return self.settings()
1297-
12981268

12991269
class AgentMediaType(Agent):
13001270
""" Represents a single Agent MediaType.
@@ -1317,11 +1287,6 @@ def _loadData(self, data):
13171287
def languageCodes(self):
13181288
return self.listAttrs(self._data, 'code', etag='Language')
13191289

1320-
@property
1321-
@deprecated('use "languageCodes" instead')
1322-
def languageCode(self):
1323-
return self.languageCodes
1324-
13251290

13261291
@utils.registerPlexObject
13271292
class Availability(PlexObject):

plexapi/mixins.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
from plexapi import media, settings, utils
88
from plexapi.exceptions import BadRequest, NotFound
9-
from plexapi.utils import deprecated, openOrRead
9+
from plexapi.utils import openOrRead
1010

1111

1212
class AdvancedSettingsMixin:
@@ -937,10 +937,6 @@ def editUserRating(self, userRating, locked=True):
937937
class EditTagsMixin:
938938
""" Mixin for editing Plex object tags. """
939939

940-
@deprecated('use "editTags" instead')
941-
def _edit_tags(self, tag, items, locked=True, remove=False):
942-
return self.editTags(tag, items, locked, remove)
943-
944940
def editTags(self, tag, items, locked=True, remove=False, **kwargs):
945941
""" Edit the tags of a Plex object. All tag editing methods can be chained together.
946942
Also see :func:`~plexapi.base.PlexPartialObject.batchEdits` for batch editing tags.

plexapi/playlist.py

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
from plexapi.exceptions import BadRequest, NotFound, Unsupported
1010
from plexapi.library import LibrarySection, MusicSection
1111
from plexapi.mixins import SmartFilterMixin, ArtMixin, LogoMixin, PosterMixin, SquareArtMixin, PlaylistEditMixins
12-
from plexapi.utils import deprecated
1312

1413

1514
@utils.registerPlexObject
@@ -253,10 +252,6 @@ def addItems(self, items):
253252

254253
return self
255254

256-
@deprecated('use "removeItems" instead')
257-
def removeItem(self, item):
258-
self.removeItems(item)
259-
260255
def removeItems(self, items):
261256
""" Remove items from the playlist.
262257
@@ -345,21 +340,6 @@ def _edit(self, **kwargs):
345340
self._server.query(key, method=self._server._session.put)
346341
return self
347342

348-
@deprecated('use "editTitle" and "editSummary" instead')
349-
def edit(self, title=None, summary=None):
350-
""" Edit the playlist.
351-
352-
Parameters:
353-
title (str, optional): The title of the playlist.
354-
summary (str, optional): The summary of the playlist.
355-
"""
356-
args = {}
357-
if title:
358-
args['title'] = title
359-
if summary:
360-
args['summary'] = summary
361-
return self._edit(**args)
362-
363343
def delete(self):
364344
""" Delete the playlist. """
365345
self._server.query(self.key, method=self._server._session.delete)

plexapi/server.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
from plexapi.playlist import Playlist
1717
from plexapi.playqueue import PlayQueue
1818
from plexapi.settings import Settings
19-
from plexapi.utils import deprecated
2019
from requests.status_codes import _codes as codes
2120

2221
# Need these imports to populate utils.PLEXOBJECTS
@@ -613,10 +612,6 @@ def runButlerTask(self, task):
613612
self.query(f'/butler/{task}', method=self._session.post)
614613
return self
615614

616-
@deprecated('use "checkForUpdate" instead')
617-
def check_for_update(self, force=True, download=False):
618-
return self.checkForUpdate(force=force, download=download)
619-
620615
def checkForUpdate(self, force=True, download=False):
621616
""" Returns a :class:`~plexapi.server.Release` object containing release info
622617
if an update is available or None if no update is available.
@@ -728,15 +723,6 @@ def optimizedItems(self, removeAll=None):
728723
backgroundProcessing = self.fetchItem('/playlists?type=42')
729724
return self.fetchItems(f'{backgroundProcessing.key}/items', cls=Optimized)
730725

731-
@deprecated('use "plexapi.media.Optimized.items()" instead')
732-
def optimizedItem(self, optimizedID):
733-
""" Returns single queued optimized item :class:`~plexapi.media.Video` object.
734-
Allows for using optimized item ID to connect back to source item.
735-
"""
736-
737-
backgroundProcessing = self.fetchItem('/playlists?type=42')
738-
return self.fetchItem(f'{backgroundProcessing.key}/items/{optimizedID}/items')
739-
740726
def conversions(self, pause=None):
741727
""" Returns list of all :class:`~plexapi.media.Conversion` objects connected to server. """
742728
if pause is True:

0 commit comments

Comments
 (0)