From 79802d120ecdd2c061384e945d4f065bb6495db7 Mon Sep 17 00:00:00 2001 From: marco Date: Mon, 24 Feb 2020 22:43:31 +0100 Subject: [PATCH] workaround per osx --- lib/future/backports/urllib/request.py | 12 +++++++++++- platformcode/xbmc_videolibrary.py | 7 ++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/lib/future/backports/urllib/request.py b/lib/future/backports/urllib/request.py index baee5401..f6646096 100644 --- a/lib/future/backports/urllib/request.py +++ b/lib/future/backports/urllib/request.py @@ -2498,7 +2498,17 @@ def _proxy_bypass_macosx_sysconf(host, proxy_settings): if sys.platform == 'darwin': - from _scproxy import _get_proxy_settings, _get_proxies + try: + from _scproxy import _get_proxy_settings, _get_proxies + except Exception as e: + from platformcode import logger + logger.error(str(e)) + + def _get_proxy_settings(): + return {} + + def _get_proxies(): + return {} def proxy_bypass_macosx_sysconf(host): proxy_settings = _get_proxy_settings() diff --git a/platformcode/xbmc_videolibrary.py b/platformcode/xbmc_videolibrary.py index 3b2506fa..6b444adc 100644 --- a/platformcode/xbmc_videolibrary.py +++ b/platformcode/xbmc_videolibrary.py @@ -2,11 +2,8 @@ # ------------------------------------------------------------ # XBMC Library Tools # ------------------------------------------------------------ -try: - from future import standard_library - standard_library.install_aliases() -except: - pass +from future import standard_library +standard_library.install_aliases() #from builtins import str import sys PY3 = False