From a680775c7914dd3a50d934efe26c93c43b068f76 Mon Sep 17 00:00:00 2001 From: marco Date: Thu, 6 Feb 2020 21:27:48 +0100 Subject: [PATCH] fix httplib2 su matrix --- lib/httplib2/py3/__init__.py | 2 +- specials/checkhost.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/httplib2/py3/__init__.py b/lib/httplib2/py3/__init__.py index 1f28e964..c705f434 100644 --- a/lib/httplib2/py3/__init__.py +++ b/lib/httplib2/py3/__init__.py @@ -168,7 +168,7 @@ SAFE_METHODS = ("GET", "HEAD", "OPTIONS", "TRACE") REDIRECT_CODES = frozenset((300, 301, 302, 303, 307, 308)) -import certs +from . import certs CA_CERTS = certs.where() # PROTOCOL_TLS is python 3.5.3+. PROTOCOL_SSLv23 is deprecated. diff --git a/specials/checkhost.py b/specials/checkhost.py index 6a4edd81..41f5efbe 100644 --- a/specials/checkhost.py +++ b/specials/checkhost.py @@ -5,8 +5,11 @@ import xbmcaddon import json from platformcode import config, logger import requests -from requests.exceptions import HTTPError -from lib import httplib2 +import sys +if sys.version_info[0] >= 3: + from lib.httplib2 import py3 as httplib2 +else: + from lib.httplib2 import py2 as httplib2 import socket addon = xbmcaddon.Addon()