add api key to omdb and clean tvdb

pytest.ini

@@ -1,6 +1,6 @@
 [pytest]
 norecursedirs = build dist env .tox .eggs
-addopts = --pep8 --flakes --doctest-glob='*.rst'
+#addopts = --pep8 --flakes --doctest-glob='*.rst'
 pep8maxlinelength = 120
 pep8ignore =
     docs/conf.py ALL

subliminal/refiners/omdb.py

@@ -10,11 +10,16 @@
 
 logger = logging.getLogger(__name__)
 
+#: OMDB subliminal API key
+OMDB_API_KEY = '44d5b275'
+
 
 class OMDBClient(object):
     base_url = 'http://www.omdbapi.com'
 
-    def __init__(self, version=1, session=None, headers=None, timeout=10):
+    def __init__(self, apikey=None, version=1, session=None, headers=None, timeout=10):
+        self.apikey = apikey or OMDB_API_KEY
+
         #: Session for the requests
         self.session = session or requests.Session()
         self.session.timeout = timeout
@@ -24,7 +29,7 @@ def __init__(self, version=1, session=None, headers=None, timeout=10):
 
     def get(self, id=None, title=None, type=None, year=None, plot='short', tomatoes=False):
         # build the params
-        params = {}
+        params = {"apikey": self.apikey}
         if id:
             params['i'] = id
         if title:
@@ -105,12 +110,6 @@ def refine(video, apikey=None, **kwargs):
       * :attr:`~subliminal.video.Video.imdb_id`
 
     """
-    if not apikey:
-        logger.warning('No apikey. Skipping omdb refiner.')
-        return
-
-    omdb_client.session.params['apikey'] = apikey
-
     if isinstance(video, Episode):
         # exit if the information is complete
         if video.series_imdb_id:

subliminal/refiners/tvdb.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from functools import wraps
 import logging
 import re
@@ -64,7 +64,7 @@ def __init__(self, apikey=None, username=None, password=None, language='en', ses
         self.password = password
 
         #: Last token acquisition date
-        self.token_date = datetime.utcnow() - self.token_lifespan
+        self.token_date = datetime.now(timezone.utc) - self.token_lifespan
 
         #: Session for the requests
         self.session = session or requests.Session()
@@ -89,11 +89,11 @@ def token(self):
 
     @property
     def token_expired(self):
-        return datetime.utcnow() - self.token_date > self.token_lifespan
+        return datetime.now(timezone.utc) - self.token_date > self.token_lifespan
 
     @property
     def token_needs_refresh(self):
-        return datetime.utcnow() - self.token_date > self.refresh_token_every
+        return datetime.now(timezone.utc) - self.token_date > self.refresh_token_every
 
     def login(self):
         """Login"""
@@ -106,7 +106,7 @@ def login(self):
         self.session.headers['Authorization'] = 'Bearer ' + r.json()['token']
 
         # update token_date
-        self.token_date = datetime.utcnow()
+        self.token_date = datetime.now(timezone.utc)
 
     def refresh_token(self):
         """Refresh token"""
@@ -118,7 +118,7 @@ def refresh_token(self):
         self.session.headers['Authorization'] = 'Bearer ' + r.json()['token']
 
         # update token_date
-        self.token_date = datetime.utcnow()
+        self.token_date = datetime.now(timezone.utc)
 
     @requires_auth
     def search_series(self, name=None, imdb_id=None, zap2it_id=None):