diff --git a/CHANGES.md b/CHANGES.md index 8ad0cb50..c38527ac 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -29,6 +29,7 @@ * Fix Config Post Processing "Anime name pattern" custom javascript validation * Add check that SSLv3 is available before use by requests lib * Update Requests library 2.3.0 to 2.4.3 (9dc6602) +* Change suppress HTTPS verification InsecureRequestWarning as many sites use self-certified certificates. [develop changelog] diff --git a/HACKS.txt b/HACKS.txt index 94812d46..b1e6363d 100644 --- a/HACKS.txt +++ b/HACKS.txt @@ -2,3 +2,4 @@ Libs with customisations... /tornado /lib/requests/packages/urllib3/contrib/pyopenssl.py +/lib/requests/packages/urllib3/connectionpool.py diff --git a/lib/cachecontrol/compat.py b/lib/cachecontrol/compat.py index cb6e1b0b..aa117d02 100644 --- a/lib/cachecontrol/compat.py +++ b/lib/cachecontrol/compat.py @@ -21,6 +21,6 @@ except ImportError: # Handle the case where the requests has been patched to not have urllib3 # bundled as part of it's source. try: - from requests.packages.urllib3.response import HTTPResponse + from lib.requests.packages.urllib3.response import HTTPResponse except ImportError: from urllib3.response import HTTPResponse diff --git a/lib/requests/packages/urllib3/connectionpool.py b/lib/requests/packages/urllib3/connectionpool.py index 9cc2a955..e693bbd8 100644 --- a/lib/requests/packages/urllib3/connectionpool.py +++ b/lib/requests/packages/urllib3/connectionpool.py @@ -721,6 +721,7 @@ class HTTPSConnectionPool(HTTPConnectionPool): if not getattr(conn, 'sock', None): # AppEngine might not have `.sock` conn.connect() + """ if not conn.is_verified: warnings.warn(( 'Unverified HTTPS request is being made. ' @@ -728,6 +729,7 @@ class HTTPSConnectionPool(HTTPConnectionPool): 'https://urllib3.readthedocs.org/en/latest/security.html ' '(This warning will only appear once by default.)'), InsecureRequestWarning) + """ def connection_from_url(url, **kw): diff --git a/lib/tvrage_api/tvrage_api.py b/lib/tvrage_api/tvrage_api.py index ef291aa3..ee1a07e5 100644 --- a/lib/tvrage_api/tvrage_api.py +++ b/lib/tvrage_api/tvrage_api.py @@ -29,7 +29,7 @@ except ImportError: import xml.etree.ElementTree as ElementTree from lib.dateutil.parser import parse -from cachecontrol import CacheControl, caches +from lib.cachecontrol import CacheControl, caches from tvrage_ui import BaseUI from tvrage_exceptions import (tvrage_error, tvrage_userabort, tvrage_shownotfound, diff --git a/sickbeard/helpers.py b/sickbeard/helpers.py index 8388281c..92de6d6b 100644 --- a/sickbeard/helpers.py +++ b/sickbeard/helpers.py @@ -62,7 +62,7 @@ from sickbeard import encodingKludge as ek from sickbeard import notifiers from sickbeard import clients -from cachecontrol import CacheControl, caches +from lib.cachecontrol import CacheControl, caches from itertools import izip, cycle urllib._urlopener = classes.SickBeardURLopener()