aiohttp based classes now use certifi

for consistency with requests based classes that already used it.

Author: Dorian Birraux

setup.py

@@ -67,6 +67,7 @@ def load_tests():
         'aiohttp',
         'oauthlib',
         'pyzmq',
+        'certifi>=2017.4.17' # for consistency with requests module.
     ],
     classifiers = CLASSIFIERS,
     project_urls={

wolframclient/evaluation/cloud/asynccloudsession.py

@@ -11,7 +11,7 @@
     XAuthAIOHttpAsyncSession as XAuthAsyncSession,
 )
 from wolframclient.evaluation.cloud.base import WolframAPICallBase
-from wolframclient.evaluation.cloud.server import WOLFRAM_PUBLIC_CLOUD_SERVER
+from wolframclient.evaluation.cloud.server import WOLFRAM_PUBLIC_CLOUD_SERVER, DEFAULT_CA_PATH
 from wolframclient.evaluation.result import (
     WolframAPIResponseBuilder,
     WolframEvaluationWXFResponseAsync,
@@ -65,10 +65,12 @@ def __init__(
         if self.server.certificate is not None:
             self._ssl_context = self.ssl_context_class()
             self._ssl_context.load_verify_locations(self.server.certificate)
-            # self._ssl_context = ssl.create_default_context(cafile=self.server.certificate)
+        elif DEFAULT_CA_PATH:
+            self._ssl_context = ssl.create_default_context(cafile=DEFAULT_CA_PATH)
         else:
             self._ssl_context = None
 
+
     def duplicate(self):
         return self.__class__(
             credentials=self.credentials,

wolframclient/evaluation/cloud/asyncoauth.py

@@ -1,8 +1,8 @@
 from __future__ import absolute_import, print_function, unicode_literals
 
 import logging
-
 from wolframclient.evaluation.cloud.base import OAuthAsyncSessionBase, UserIDPassword
+from wolframclient.evaluation.cloud.server import DEFAULT_CA_PATH
 from wolframclient.exception import AuthenticationException
 from wolframclient.utils import six
 from wolframclient.utils.api import aiohttp, oauth, ssl
@@ -35,7 +35,8 @@ def __init__(
         if self.server.certificate is not None:
             self._ssl_context = self.ssl_context_class()
             self._ssl_context.load_verify_locations(self.server.certificate)
-            # self._ssl_context = ssl.create_default_context(cafile=self.server.certificate)
+        elif DEFAULT_CA_PATH:
+            self._ssl_context = ssl.create_default_context(cafile=DEFAULT_CA_PATH)
         else:
             self._ssl_context = None
 

wolframclient/evaluation/cloud/server.py

@@ -1,8 +1,16 @@
 from __future__ import absolute_import, print_function, unicode_literals
 
 from wolframclient.utils import six
+try:
+    import certifi
+    DEFAULT_CA_PATH = certifi.where()
+except ImportError:
+    certifi = None
+    DEFAULT_CA_PATH = None
+    pass
 
-__all__ = ["WolframServer"]
+
+__all__ = ["WolframServer", "DEFAULT_CA_PATH"]
 
 
 class WolframServer(object):