From bba2015d9b6797f8eca94fef6dbd964c27734891 Mon Sep 17 00:00:00 2001 From: Alan Hamlett Date: Mon, 24 Aug 2015 10:58:42 -0700 Subject: [PATCH] encode certfile path as utf-8 in python3 for Windows systems not using utf-8 as default filesystem encoding --- wakatime/packages/requests/certs.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/wakatime/packages/requests/certs.py b/wakatime/packages/requests/certs.py index 47cc228..5463f38 100644 --- a/wakatime/packages/requests/certs.py +++ b/wakatime/packages/requests/certs.py @@ -21,12 +21,8 @@ except ImportError: """Return the preferred certificate bundle.""" # vendored bundle inside Requests is_py3 = (sys.version_info[0] == 3) - certdir = os.path.dirname( - __file__ - if is_py3 else - __file__.decode(sys.getfilesystemencoding()) - ) - return os.path.join(certdir, 'cacert.pem') + cacert = os.path.join(os.path.dirname(__file__), 'cacert.pem') + return cacert.encode('utf-8') if is_py3 else cacert if __name__ == '__main__': print(where())