apply requested changes regarding formatting and code refactoring

Author: Dr-Blank

plexapi/base.py

@@ -54,8 +54,8 @@ class PlexObject:
             initpath (str): Relative path requested when retrieving specified `data` (optional).
             parent (:class:`~plexapi.base.PlexObject`): The parent object that this object is built from (optional).
     """
-    TAG: Optional[str] = None      # xml element tag
-    TYPE: Optional[str] = None     # xml element type
+    TAG: Optional[str] = None  # xml element tag
+    TYPE: Optional[str] = None  # xml element type
     key: Optional[str] = None  # plex relative url
     _INCLUDES = {
         'checkFiles': 1,

plexapi/utils.py

@@ -171,21 +171,22 @@ def cast(
             func (func): Callback function to used cast to type (int, bool, float).
             value (any): value to be cast and returned.
     """
-    if value is None:
-        return value
-    if func == bool:
-        if value in (1, True, "1", "true"):
-            return True
-        if value in (0, False, "0", "false"):
-            return False
-        raise ValueError(value)
-
-    if func in (int, float):
-        try:
-            return func(value)
-        except ValueError:
-            return float('nan')
-    return func(value)
+    if value is not None:
+        if func == bool:
+            if value in (1, True, "1", "true"):
+                return True
+            elif value in (0, False, "0", "false"):
+                return False
+            else:
+                raise ValueError(value)
+
+        elif func in (int, float):
+            try:
+                return func(value)
+            except ValueError:
+                return float('nan')
+        return func(value)
+    return value
 
 
 def joinArgs(args):