Skip to content

Commit 23a5ad6

Browse files
committed
Simplify call
1 parent 6ef1e9c commit 23a5ad6

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

plexapi/client.py

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -202,19 +202,16 @@ def sendCommand(self, command, proxy=None, **params):
202202

203203
proxy = self._proxyThroughServer if proxy is None else proxy
204204

205-
if self.product in ('Plexamp'):
205+
try:
206+
if proxy:
207+
return self._server.query(key, headers=headers)
208+
return self.query(key, headers=headers)
209+
except ElementTree.ParseError:
206210
# Workaround for players which don't return valid XML on successful commands
207211
# - Plexamp: `b'OK'`
208-
try:
209-
if proxy:
210-
return self._server.query(key, headers=headers)
211-
return self.query(key, headers=headers)
212-
except ElementTree.ParseError:
213-
return None
214-
215-
if proxy:
216-
return self._server.query(key, headers=headers)
217-
return self.query(key, headers=headers)
212+
if self.product not in ('Plexamp'):
213+
raise
214+
218215

219216
def url(self, key, includeToken=False):
220217
""" Build a URL string with proper token argument. Token will be appended to the URL

0 commit comments

Comments
 (0)