Skip to content

Commit 18afdc2

Browse files
committed
some linting
1 parent 3ca655b commit 18afdc2

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

plexapi/myplex.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
# -*- coding: utf-8 -*-
22
import copy
3-
import requests
43
import time
5-
from requests.status_codes import _codes as codes
6-
from plexapi import BASE_HEADERS, CONFIG, TIMEOUT, X_PLEX_IDENTIFIER, X_PLEX_ENABLE_FAST_CONNECT
7-
from plexapi import log, logfilter, utils
4+
5+
import requests
6+
from plexapi import (BASE_HEADERS, CONFIG, TIMEOUT, X_PLEX_ENABLE_FAST_CONNECT,
7+
X_PLEX_IDENTIFIER, log, logfilter, utils)
88
from plexapi.base import PlexObject
9-
from plexapi.exceptions import BadRequest, NotFound
109
from plexapi.client import PlexClient
1110
from plexapi.compat import ElementTree
11+
from plexapi.exceptions import BadRequest, NotFound
1212
from plexapi.library import LibrarySection
1313
from plexapi.server import PlexServer
14-
from plexapi.sync import SyncList, SyncItem
14+
from plexapi.sync import SyncItem, SyncList
1515
from plexapi.utils import joinArgs
16+
from requests.status_codes import _codes as codes
1617

1718

1819
class MyPlexAccount(PlexObject):
@@ -390,8 +391,7 @@ def updateFriend(self, user, server, sections=None, removeSections=False, allowS
390391
params = {'server_id': machineId, 'shared_server': {'library_section_ids': sectionIds}}
391392
url = self.FRIENDSERVERS.format(machineId=machineId, serverId=serverId)
392393
else:
393-
params = {'server_id': machineId, 'shared_server': {'library_section_ids': sectionIds,
394-
'invited_id': user.id}}
394+
params = {'server_id': machineId, 'shared_server': {'library_section_ids': sectionIds, 'invited_id': user.id}}
395395
url = self.FRIENDINVITE.format(machineId=machineId)
396396
# Remove share sections, add shares to user without shares, or update shares
397397
if not user_servers or sectionIds:
@@ -435,7 +435,7 @@ def user(self, username):
435435
return user
436436

437437
elif (user.username and user.email and user.id and username.lower() in
438-
(user.username.lower(), user.email.lower(), str(user.id))):
438+
(user.username.lower(), user.email.lower(), str(user.id))):
439439
return user
440440

441441
raise NotFound('Unable to find user %s' % username)
@@ -622,21 +622,21 @@ def history(self, maxresults=9999999, mindate=None):
622622
def videoOnDemand(self):
623623
""" Returns a list of VOD Hub items :class:`~plexapi.library.Hub`
624624
"""
625-
req = requests.get(self.VOD + 'hubs/', headers={'X-Plex-Token':self._token})
625+
req = requests.get(self.VOD + 'hubs/', headers={'X-Plex-Token': self._token})
626626
elem = ElementTree.fromstring(req.text)
627627
return self.findItems(elem)
628628

629629
def webShows(self):
630630
""" Returns a list of Webshow Hub items :class:`~plexapi.library.Hub`
631-
"""
632-
req = requests.get(self.WEBSHOWS + 'hubs/', headers={'X-Plex-Token':self._token})
631+
"""
632+
req = requests.get(self.WEBSHOWS + 'hubs/', headers={'X-Plex-Token': self._token})
633633
elem = ElementTree.fromstring(req.text)
634634
return self.findItems(elem)
635635

636636
def news(self):
637637
""" Returns a list of News Hub items :class:`~plexapi.library.Hub`
638-
"""
639-
req = requests.get(self.NEWS + 'hubs/sections/all', headers={'X-Plex-Token':self._token})
638+
"""
639+
req = requests.get(self.NEWS + 'hubs/sections/all', headers={'X-Plex-Token': self._token})
640640
elem = ElementTree.fromstring(req.text)
641641
return self.findItems(elem)
642642

plexapi/video.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# -*- coding: utf-8 -*-
2+
import os
3+
24
from plexapi import media, utils
3-
from plexapi.exceptions import BadRequest, NotFound
45
from plexapi.base import Playable, PlexPartialObject
56
from plexapi.compat import quote_plus
6-
import os
7+
from plexapi.exceptions import BadRequest, NotFound
78

89

910
class Video(PlexPartialObject):
@@ -281,7 +282,7 @@ def download(self, savepath=None, keep_original_name=False, **kwargs):
281282
else:
282283
self._server.url('%s?download=1' % location.key)
283284
filepath = utils.download(url, self._server._token, filename=name,
284-
savepath=savepath, session=self._server._session)
285+
savepath=savepath, session=self._server._session)
285286
if filepath:
286287
filepaths.append(filepath)
287288
return filepaths
@@ -655,9 +656,8 @@ def _defaultSyncTitle(self):
655656

656657
@utils.registerPlexObject
657658
class Clip(Playable, Video):
658-
""" Represents a single Clip.
659+
""" Represents a single Clip."""
659660

660-
"""
661661
TAG = 'Video'
662662
TYPE = 'clip'
663663
METADATA_TYPE = 'clip'
@@ -676,4 +676,4 @@ def _loadData(self, data):
676676
self.thumbAspectRatio = data.attrib.get('thumbAspectRatio')
677677
self.title = data.attrib.get('title')
678678
self.type = data.attrib.get('type')
679-
self.year = data.attrib.get('year')
679+
self.year = data.attrib.get('year')

0 commit comments

Comments
 (0)