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

Fix http_handler for Python 2

Browse source
This commit is contained in:
JonnyWong16 2020-03-23 20:21:54 -07:00
parent 078685a2a3
commit ed07bd374c
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plexpy/http_handler.py
View file

@ -21,6 +21,7 @@ from future import standard_library
standard_library.install_aliases() standard_library.install_aliases()
from past.builtins import basestring from past.builtins import basestring
from builtins import object from builtins import object
from builtins import str
from functools import partial from functools import partial
from multiprocessing.dummy import Pool as ThreadPool from multiprocessing.dummy import Pool as ThreadPool
@ -88,7 +89,7 @@ class HTTPHandler(object):
Output: list Output: list
""" """
self.uri = uri self.uri = str(uri)
self.request_type = request_type.upper() self.request_type = request_type.upper()
self.output_format = output_format.lower() self.output_format = output_format.lower()
self.return_type = return_type self.return_type = return_type
@ -100,7 +101,7 @@ class HTTPHandler(object):
return None return None
if uri: if uri:
request_urls = [urljoin(url, self.uri) for url in self.urls] request_urls = [urljoin(str(url), self.uri) for url in self.urls]
if no_token: if no_token:
self.headers.pop('X-Plex-Token', None) self.headers.pop('X-Plex-Token', None)
@ -128,7 +129,7 @@ class HTTPHandler(object):
chunk = 0 chunk = 0
if self.ssl_verify: if self.ssl_verify:
session = urllib3.PoolManager(cert_reqs='CERT_REQUIRED', ca_certs=certifi.where()) session = urllib3.PoolManager(cert_reqs=2, ca_certs=certifi.where()) # ssl.CERT_REQUIRED = 2
else: else:
urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
session = urllib3.PoolManager() session = urllib3.PoolManager()