From 21e85ba9c5eb06e4c32a07830a22b4bd4bd470d0 Mon Sep 17 00:00:00 2001
From: jjlawren <jjlawren@users.noreply.github.com>
Date: Sat, 18 Apr 2020 21:06:05 -0500
Subject: [PATCH] Bump plexapi to 3.4.0, remove workarounds (#34395)

---
 homeassistant/components/plex/const.py        |  3 ---
 homeassistant/components/plex/manifest.json   |  2 +-
 homeassistant/components/plex/media_player.py | 10 +---------
 requirements_all.txt                          |  2 +-
 requirements_test_all.txt                     |  2 +-
 5 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/homeassistant/components/plex/const.py b/homeassistant/components/plex/const.py
index 126c6eb313a..555454e2205 100644
--- a/homeassistant/components/plex/const.py
+++ b/homeassistant/components/plex/const.py
@@ -39,6 +39,3 @@ X_PLEX_DEVICE_NAME = "Home Assistant"
 X_PLEX_PLATFORM = "Home Assistant"
 X_PLEX_PRODUCT = "Home Assistant"
 X_PLEX_VERSION = __version__
-
-COMMAND_MEDIA_TYPE_MUSIC = "music"
-COMMAND_MEDIA_TYPE_VIDEO = "video"
diff --git a/homeassistant/components/plex/manifest.json b/homeassistant/components/plex/manifest.json
index 1c89bf2582a..a458a3585b4 100644
--- a/homeassistant/components/plex/manifest.json
+++ b/homeassistant/components/plex/manifest.json
@@ -3,7 +3,7 @@
   "name": "Plex Media Server",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/plex",
-  "requirements": ["plexapi==3.3.0", "plexauth==0.0.5", "plexwebsocket==0.0.7"],
+  "requirements": ["plexapi==3.4.0", "plexauth==0.0.5", "plexwebsocket==0.0.7"],
   "dependencies": ["http"],
   "codeowners": ["@jjlawren"]
 }
diff --git a/homeassistant/components/plex/media_player.py b/homeassistant/components/plex/media_player.py
index fd61dfce26f..d34899a6213 100644
--- a/homeassistant/components/plex/media_player.py
+++ b/homeassistant/components/plex/media_player.py
@@ -1,7 +1,6 @@
 """Support to interface with the Plex API."""
 import json
 import logging
-from xml.etree.ElementTree import ParseError
 
 import plexapi.exceptions
 import requests.exceptions
@@ -27,8 +26,6 @@ from homeassistant.helpers.entity_registry import async_get_registry
 from homeassistant.util import dt as dt_util
 
 from .const import (
-    COMMAND_MEDIA_TYPE_MUSIC,
-    COMMAND_MEDIA_TYPE_VIDEO,
     COMMON_PLAYERS,
     CONF_SERVER_IDENTIFIER,
     DISPATCHERS,
@@ -563,11 +560,9 @@ class PlexMediaPlayer(MediaPlayerDevice):
         shuffle = src.get("shuffle", 0)
 
         media = None
-        command_media_type = COMMAND_MEDIA_TYPE_VIDEO
 
         if media_type == "MUSIC":
             media = self._get_music_media(library, src)
-            command_media_type = COMMAND_MEDIA_TYPE_MUSIC
         elif media_type == "EPISODE":
             media = self._get_tv_media(library, src)
         elif media_type == "PLAYLIST":
@@ -581,10 +576,7 @@ class PlexMediaPlayer(MediaPlayerDevice):
 
         playqueue = self.plex_server.create_playqueue(media, shuffle=shuffle)
         try:
-            self.device.playMedia(playqueue, type=command_media_type)
-        except ParseError:
-            # Temporary workaround for Plexamp / plexapi issue
-            pass
+            self.device.playMedia(playqueue)
         except requests.exceptions.ConnectTimeout:
             _LOGGER.error("Timed out playing on %s", self.name)
 
diff --git a/requirements_all.txt b/requirements_all.txt
index 3eb11157620..b094a5e71ce 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1044,7 +1044,7 @@ pillow==7.1.1
 pizzapi==0.0.3
 
 # homeassistant.components.plex
-plexapi==3.3.0
+plexapi==3.4.0
 
 # homeassistant.components.plex
 plexauth==0.0.5
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 56e39ca8026..9d4ebf4a2a0 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -404,7 +404,7 @@ pilight==0.1.1
 pillow==7.1.1
 
 # homeassistant.components.plex
-plexapi==3.3.0
+plexapi==3.4.0
 
 # homeassistant.components.plex
 plexauth==0.0.5