diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py index 9f1bd233..4a834452 100644 --- a/plexpy/datafactory.py +++ b/plexpy/datafactory.py @@ -354,7 +354,6 @@ class DataFactory(object): 'user': '', 'friendly_name': '', 'platform': '', - 'platform': '', 'live': item['live'], 'guid': item['guid'], 'row_id': item['id'] @@ -1433,7 +1432,7 @@ class DataFactory(object): if rating_key: logger.info("Tautulli DataFactory :: Deleting lookup info for rating_key %s from the database." - % (title, rating_key)) + % rating_key) result_themoviedb = monitor_db.action('DELETE FROM themoviedb_lookup WHERE rating_key = ?', [rating_key]) result_tvmaze = monitor_db.action('DELETE FROM tvmaze_lookup WHERE rating_key = ?', [rating_key]) result_musicbrainz = monitor_db.action('DELETE FROM musicbrainz_lookup WHERE rating_key = ?', [rating_key]) diff --git a/plexpy/helpers.py b/plexpy/helpers.py index 974d0ea8..778186c1 100644 --- a/plexpy/helpers.py +++ b/plexpy/helpers.py @@ -462,7 +462,11 @@ def create_https_certificates(ssl_cert, ssl_key): This code is stolen from SickBeard (http://github.com/midgetspy/Sick-Beard). """ - from OpenSSL import crypto + try: + from OpenSSL import crypto + except ImportError: + logger.error("Unable to generate self-signed certificates: Missing OpenSSL module.") + return False from certgen import createKeyPair, createSelfSignedCertificate, TYPE_RSA serial = timestamp() diff --git a/plexpy/newsletters.py b/plexpy/newsletters.py index 796732fc..23a4b5d6 100644 --- a/plexpy/newsletters.py +++ b/plexpy/newsletters.py @@ -301,7 +301,7 @@ def send_newsletter(newsletter_id=None, subject=None, body=None, message=None, n email_config=newsletter_config['email_config'], subject=subject, body=body, - messsage=message) + message=message) return agent.send() else: logger.debug("Tautulli Newsletters :: Notification requested but no newsletter_id received.")