force requests to use bundled certifi cacert by default

Author: alanhamlett

wakatime/api.py

@@ -22,6 +22,7 @@
 from .session_cache import SessionCache
 from .utils import get_hostname, get_user_agent
 from .packages import tzlocal
+from .packages import certifi
 
 
 log = logging.getLogger('WakaTime')
@@ -101,16 +102,12 @@ def send_heartbeats(heartbeats, args, configs, use_ntlm_proxy=False):
             should_try_ntlm = '\\' in args.proxy
             proxies['https'] = args.proxy
 
-    ssl_verify = not args.nosslverify
-    if args.ssl_certs_file and ssl_verify:
-        ssl_verify = args.ssl_certs_file
-
     # send request to api
     response, code = None, None
     try:
         response = session.post(api_url, data=request_body, headers=headers,
                                 proxies=proxies, timeout=timeout,
-                                verify=ssl_verify)
+                                verify=_get_verify(args))
     except RequestException:
         if should_try_ntlm:
             return send_heartbeats(heartbeats, args, configs, use_ntlm_proxy=True)
@@ -204,10 +201,6 @@ def get_time_today(args, use_ntlm_proxy=False):
             should_try_ntlm = '\\' in args.proxy
             proxies['https'] = args.proxy
 
-    ssl_verify = not args.nosslverify
-    if args.ssl_certs_file and ssl_verify:
-        ssl_verify = args.ssl_certs_file
-
     params = {
         'start': 'today',
         'end': 'today',
@@ -218,7 +211,7 @@ def get_time_today(args, use_ntlm_proxy=False):
     try:
         response = session.get(url, params=params, headers=headers,
                                proxies=proxies, timeout=timeout,
-                               verify=ssl_verify)
+                               verify=_get_verify(args))
     except RequestException:
         if should_try_ntlm:
             return get_time_today(args, use_ntlm_proxy=True)
@@ -282,6 +275,16 @@ def get_time_today(args, use_ntlm_proxy=False):
         return None, API_ERROR
 
 
+def _get_verify(args):
+    verify = not args.nosslverify
+    if verify:
+        if args.ssl_certs_file:
+            verify = args.ssl_certs_file
+        else:
+            verify = certifi.where()
+    return verify
+
+
 def _process_server_results(heartbeats, code, content, results, args, configs):
     log.debug({
         'response_code': code,