Merge pull request #778 from pkkid/account_roles

Fix for accessing Account of non Plex Pass account

Author: JonnyWong16

plexapi/base.py

@@ -295,9 +295,12 @@ def firstAttr(self, *attrs):
             if value is not None:
                 return value
 
-    def listAttrs(self, data, attr, **kwargs):
+    def listAttrs(self, data, attr, rtag=None, **kwargs):
         """ Return a list of values from matching attribute. """
         results = []
+        # rtag to iter on a specific root tag
+        if rtag:
+            data = next(data.iter(rtag), [])
         for elem in data:
             kwargs['%s__exists' % attr] = True
             if self._checkAttrs(elem, **kwargs):

plexapi/myplex.py

@@ -135,11 +135,9 @@ def _loadData(self, data):
         self.subscriptionPlan = subscription.attrib.get('plan')
         self.subscriptionFeatures = self.listAttrs(subscription, 'id', etag='feature')
 
-        roles = data.find('roles')
-        self.roles = self.listAttrs(roles, 'id', etag='role')
+        self.roles = self.listAttrs(data, 'id', rtag='roles', etag='role')
 
-        entitlements = data.find('entitlements')
-        self.entitlements = self.listAttrs(entitlements, 'id', etag='entitlement')
+        self.entitlements = self.listAttrs(data, 'id', rtag='entitlements', etag='entitlement')
 
         # TODO: Fetch missing MyPlexAccount attributes
         self.profile_settings = None