From bd6382cd52e0ba3393cf7f6fbb9357952082ac79 Mon Sep 17 00:00:00 2001 From: Jonathan Harris Date: Tue, 15 Sep 2015 12:51:15 +0100 Subject: [PATCH] Fix for running on older Linux distros with older verion of python-requests. --- companion.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/companion.py b/companion.py index 5c4c9394..15a4e422 100644 --- a/companion.py +++ b/companion.py @@ -7,7 +7,6 @@ from cookielib import LWPCookieJar import numbers import os from os.path import dirname, join -from requests.packages import urllib3 import sys from sys import platform import time @@ -123,7 +122,13 @@ class Session: self.state = Session.STATE_INIT self.credentials = None - urllib3.disable_warnings() # yuck suppress InsecurePlatformWarning + # yuck suppress InsecurePlatformWarning + try: + from requests.packages import urllib3 + urllib3.disable_warnings() + except: + pass + if platform=='win32' and getattr(sys, 'frozen', False): os.environ['REQUESTS_CA_BUNDLE'] = join(dirname(sys.executable), 'cacert.pem')