Fix conftext to pass flake8

Author: pkkid

plexapi/__init__.py

@@ -14,7 +14,7 @@
 
 # PlexAPI Settings
 PROJECT = 'PlexAPI'
-VERSION = '3.1.0'
+VERSION = '3.2.0'
 TIMEOUT = CONFIG.get('plexapi.timeout', 30, int)
 X_PLEX_CONTAINER_SIZE = CONFIG.get('plexapi.container_size', 100, int)
 X_PLEX_ENABLE_FAST_CONNECT = CONFIG.get('plexapi.enable_fast_connect', False, bool)

plexapi/compat.py

@@ -44,6 +44,11 @@
 except ImportError:
     from xml.etree import ElementTree
 
+try:
+    from unittest.mock import patch, MagicMock
+except ImportError:
+    from mock import patch, MagicMock
+
 
 def makedirs(name, mode=0o777, exist_ok=False):
     """ Mimicks os.makedirs() from Python 3. """

tests/conftest.py

@@ -1,27 +1,17 @@
 # -*- coding: utf-8 -*-
+import plexapi
+import pytest
+import requests
 import time
 from datetime import datetime
 from functools import partial
 from os import environ
-
-import pytest
-import requests
-
 from plexapi.myplex import MyPlexAccount
-
-try:
-    from unittest.mock import patch, MagicMock
-except ImportError:
-    from mock import patch, MagicMock
-
-
-import plexapi
 from plexapi import compat
+from plexapi.compat import patch, MagicMock
 from plexapi.client import PlexClient
-
 from plexapi.server import PlexServer
 
-
 SERVER_BASEURL = plexapi.CONFIG.get('auth.server_baseurl')
 MYPLEX_USERNAME = plexapi.CONFIG.get('auth.myplex_username')
 MYPLEX_PASSWORD = plexapi.CONFIG.get('auth.myplex_password')
@@ -229,7 +219,7 @@ def episode(show):
 def photoalbum(photos):
     try:
         return photos.get('Cats')
-    except:
+    except Exception:
         return photos.get('photo_album1')