github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-12 16:22:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'nightly' into python3

Browse source 
# Conflicts:
#	plexpy/datafactory.py
This commit is contained in:
JonnyWong16 2020-04-03 21:10:32 -07:00
commit fb395fc2e9
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plexpy/helpers.py
View file

@ -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()