Merge pull request #226 in LCL/wolframclientforpython from bugfix/380061-removing-dependencies to master

* commit '7dde14645418c7f7ab6fc8ccbf09ccb2b06d1ba4':
  automatic code refactor
  Update lock.py
  when pkg_resources are not available we can return a tuple
  using dynamic import
  fixing external libraries
  using asyncio api
  fixing indent
  using dynamic import when calling cProfile

Author: crazyeng

setup.py

@@ -32,7 +32,7 @@
 
 def read(*rellibpath):
     with codecs.open(os.path.join(HERE, *rellibpath), 'r', encoding='utf-8') as fp:
-          return fp.read()
+        return fp.read()
 
 def load_tests():
     import unittest

wolframclient/cli/commands/benchmark.py

@@ -1,6 +1,5 @@
 from __future__ import absolute_import, print_function, unicode_literals
 
-import cProfile
 import decimal
 import os
 import tempfile
@@ -12,6 +11,7 @@
 from wolframclient.utils.debug import timed
 from wolframclient.utils.encoding import force_text
 from wolframclient.utils.functional import first
+from wolframclient.utils.importutils import safe_import_string_and_call
 
 
 def repeat(el, n=1):
@@ -125,6 +125,8 @@ def report(self):
 
     def handle(self, profile, **opts):
         if profile:
-            cProfile.runctx("report()", {"report": self.report}, {})
+            safe_import_string_and_call(
+                "cProfile.runctx", "report()", {"report": self.report}, {}
+            )
         else:
             self.report()

wolframclient/evaluation/base.py

@@ -1,11 +1,11 @@
 from __future__ import absolute_import, print_function, unicode_literals
 
-import asyncio
 import warnings
 
 from wolframclient.language import wlexpr
 from wolframclient.language.expression import WLFunction
 from wolframclient.utils import six
+from wolframclient.utils.api import asyncio
 from wolframclient.utils.functional import map
 
 

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, DEFAULT_CA_PATH
+from wolframclient.evaluation.cloud.server import DEFAULT_CA_PATH, WOLFRAM_PUBLIC_CLOUD_SERVER
 from wolframclient.evaluation.result import (
     WolframAPIResponseBuilder,
     WolframEvaluationWXFResponseAsync,
@@ -70,7 +70,6 @@ def __init__(
         else:
             self._ssl_context = None
 
-
     def duplicate(self):
         return self.__class__(
             credentials=self.credentials,

wolframclient/evaluation/cloud/asyncoauth.py

@@ -1,6 +1,7 @@
 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

wolframclient/evaluation/cloud/server.py

@@ -1,8 +1,10 @@
 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

wolframclient/serializers/encoder.py

@@ -5,10 +5,8 @@
 from collections import defaultdict
 from functools import partial
 
-import pkg_resources
-
 from wolframclient.serializers.utils import safe_len
-from wolframclient.utils.api import multiprocessing
+from wolframclient.utils.api import multithreading, pkg_resources
 from wolframclient.utils.dispatch import Dispatch
 from wolframclient.utils.functional import composition, is_iterable, iterate, map
 from wolframclient.utils.importutils import safe_import_string
@@ -66,7 +64,7 @@ def _update_plugins(self):
     # global lock to avoid multiple dispatcher updating in multithreaded programs.
 
     def update_dispatch(self):
-        with multiprocessing.Lock():
+        with multithreading.Lock():
             self._update_dispatch()
             self._update_plugins()
 

wolframclient/tests/deserializers/wxf_deserialize.py

@@ -148,9 +148,11 @@ def test_bigreal_precision_exponent(self):
         self.assertEqual(res, decimal.Decimal("9.999999999999996843873323328588479844E+999"))
 
     def test_bigreal_precision_negexponent(self):
-            wxf = b'8:RC4.590261537982443550699999999999999999999281`19.66183743091127*^-16'
-            res = binary_deserialize(wxf, consumer=WXFConsumer())
-            self.assertEqual(res, decimal.Decimal('4.590261537982443550699999999999999999999281E-16'))
+        wxf = b"8:RC4.590261537982443550699999999999999999999281`19.66183743091127*^-16"
+        res = binary_deserialize(wxf, consumer=WXFConsumer())
+        self.assertEqual(
+            res, decimal.Decimal("4.590261537982443550699999999999999999999281E-16")
+        )
 
     def test_empty_lists(self):
         value = ((), ((),), (1, ()), ())

wolframclient/tests/evaluation/test_async_cloud.py

@@ -143,6 +143,7 @@ async def test_bad_sak_with(self):
 
     def test_sslcontext(self):
         from wolframclient.evaluation.cloud.server import DEFAULT_CA_PATH
+
         s = WolframCloudAsyncSession()
         if DEFAULT_CA_PATH is None:
             self.assertIsNone(s._ssl_context)

wolframclient/utils/api.py

@@ -138,7 +138,10 @@
     PackedArray="wolframclient.utils.packedarray.PackedArray",
 )
 
-multiprocessing = API(Lock="wolframclient.utils.lock.Lock")
+multithreading = API(Lock="wolframclient.utils.lock.Lock")
+pkg_resources = API(
+    iter_entry_points=("pkg_resources.iter_entry_points", lambda *args, **opts: ())
+)
 
 PIL = API(Image="PIL.Image.Image", fromarray="PIL.Image.fromarray", open="PIL.Image.open")
 
@@ -168,10 +171,7 @@
     StringPayload="aiohttp.StringPayload",
 )
 
-ssl = API(
-    SSLContext="ssl.SSLContext",
-    create_default_context="ssl.create_default_context",
-)
+ssl = API(SSLContext="ssl.SSLContext", create_default_context="ssl.create_default_context")
 
 externalevaluate = API(
     execute_from_file="wolframclient.utils.externalevaluate.execute_from_file",