From 3a4b34972dddfe0b2e70cd2b1b1542fd8b8bfb50 Mon Sep 17 00:00:00 2001 From: Jose Manuel Delicado Date: Thu, 16 Feb 2017 11:30:16 +0100 Subject: [PATCH] The requests fix is applied in non-frozen copies of TWBlue too. In this case, only the proxy is patched --- src/fixes/__init__.py | 4 +++- src/fixes/fix_requests.py | 11 +++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/fixes/__init__.py b/src/fixes/__init__.py index def70c90..354a5875 100644 --- a/src/fixes/__init__.py +++ b/src/fixes/__init__.py @@ -9,5 +9,7 @@ def setup(): fix_arrow.fix() if hasattr(sys, "frozen"): fix_win32com.fix() - fix_requests.fix() + fix_requests.fix(True) + else: + fix_requests.fix(False) fix_urllib3_warnings.fix() \ No newline at end of file diff --git a/src/fixes/fix_requests.py b/src/fixes/fix_requests.py index b9d999bb..ec63e741 100644 --- a/src/fixes/fix_requests.py +++ b/src/fixes/fix_requests.py @@ -7,11 +7,14 @@ orig_session_init=requests.sessions.Session.__init__ def patched_where(): return paths.app_path(u"cacert.pem") -def fix(): - certs.where=patched_where - utils.DEFAULT_CA_BUNDLE_PATH=patched_where() - adapters.DEFAULT_CA_BUNDLE_PATH=patched_where() +def fix(frozen): + if frozen==True: + certs.where=patched_where + utils.DEFAULT_CA_BUNDLE_PATH=patched_where() + adapters.DEFAULT_CA_BUNDLE_PATH=patched_where() requests.sessions.Session.__init__=patched_session_init + requests.Session.__init__=patched_session_init + requests.session.__init__=patched_session_init def patched_session_init(self): orig_session_init(self)