Merge pull request #468 from pkkid/less_deps

reduce deps

Author: Hellowlol

plexapi/alert.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import json
 import threading
-import websocket
+
 from plexapi import log
 
 
@@ -40,6 +40,11 @@ def __init__(self, server, callback=None):
         self._ws = None
 
     def run(self):
+        try:
+            import websocket
+        except ImportError:
+            log.warning("Can't use the AlertListener without websocket")
+            return
         # create the websocket connection
         url = self._server.url(self.key, includeToken=True).replace('http', 'ws')
         log.info('Starting AlertListener: %s', url)

plexapi/compat.py

@@ -44,11 +44,6 @@
 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. """

plexapi/utils.py

@@ -11,7 +11,11 @@
 import requests
 from plexapi import compat
 from plexapi.exceptions import NotFound
-from tqdm import tqdm
+
+try:
+    from tqdm import tqdm
+except ImportError:
+    tqdm = None
 
 log = logging.getLogger('plexapi')
 
@@ -294,17 +298,17 @@ def download(url, token, filename=None, savepath=None, session=None, chunksize=4
 
     # save the file to disk
     log.info('Downloading: %s', fullpath)
-    if showstatus:  # pragma: no cover
+    if showstatus and tqdm:  # pragma: no cover
         total = int(response.headers.get('content-length', 0))
         bar = tqdm(unit='B', unit_scale=True, total=total, desc=filename)
 
     with open(fullpath, 'wb') as handle:
         for chunk in response.iter_content(chunk_size=chunksize):
             handle.write(chunk)
-            if showstatus:
+            if showstatus and tqdm:
                 bar.update(len(chunk))
 
-    if showstatus:  # pragma: no cover
+    if showstatus and tqdm:  # pragma: no cover
         bar.close()
     # check we want to unzip the contents
     if fullpath.endswith('zip') and unpack:

requirements.txt

@@ -3,6 +3,3 @@
 # pip install -r requirements.txt
 #---------------------------------------------------------
 requests
-tqdm
-websocket-client
-mock; python_version < '3.3'

requirements_dev.txt

@@ -15,6 +15,8 @@ sphinx
 sphinxcontrib-napoleon
 tqdm
 websocket-client
+mock; python_version < '3.3'
+
 
 # Installing sphinx-rtd-theme directly from github above is used until a point release
 # above 0.4.3 is released. https://github.com/readthedocs/sphinx_rtd_theme/issues/739

tests/conftest.py

@@ -9,7 +9,6 @@
 import requests
 from plexapi import compat
 from plexapi.client import PlexClient
-from plexapi.compat import MagicMock, patch
 from plexapi.myplex import MyPlexAccount
 from plexapi.server import PlexServer
 

tests/test_server.py

@@ -4,7 +4,6 @@
 
 import pytest
 from PIL import Image, ImageStat
-from plexapi.compat import patch
 from plexapi.exceptions import BadRequest, NotFound
 from plexapi.server import PlexServer
 from plexapi.utils import download
@@ -200,7 +199,7 @@ def test_server_isLatest(plex, mocker):
 
 def test_server_installUpdate(plex, mocker):
     m = mocker.MagicMock(release="aa")
-    with patch("plexapi.server.PlexServer.check_for_update", return_value=m):
+    with utils.patch('plexapi.server.PlexServer.check_for_update', return_value=m):
         with utils.callable_http_patch():
             plex.installUpdate()
 
@@ -215,7 +214,7 @@ def __init__(self, **kwargs):
             self.downloadURL = "http://path-to-update"
             self.state = "downloaded"
 
-    with patch("plexapi.server.PlexServer.check_for_update", return_value=R()):
+    with utils.patch('plexapi.server.PlexServer.check_for_update', return_value=R()):
         rel = plex.check_for_update(force=False, download=True)
         assert rel.download_key == "plex.tv/release/1337"
         assert rel.version == "1337"