Merge branch 'master' into feature/preparing-release-1.1.0

Author: Dorian Birraux

wolframclient/cli/commands/refactor.py

@@ -5,7 +5,7 @@
 import sys
 
 from wolframclient.cli.utils import SimpleCommand
-from wolframclient.utils.importutils import module_path
+from wolframclient.utils.importutils import module_path, safe_import_string_and_call
 
 
 class Command(SimpleCommand):
@@ -24,42 +24,40 @@ def _module_args(self, *args):
         for arg in args:
             yield arg
 
-    def handle(self, **opts):
+    def run(self, path, *args):
+        originals = sys.argv
+        sys.argv = list(self._module_args(*args))
+        safe_import_string_and_call(path)
+        sys.argv = originals
 
-        argv = sys.argv
+    def handle(self, **opts):
 
-        from autoflake import main
+        # autoflake is not removing imports if they are in a list
+        # to fix this we first refactor the code using imports in single line
 
-        sys.argv = list(
-            self._module_args(
-                "--in-place",
-                "--remove-duplicate-keys",
-                "--expand-star-import",
-                "--remove-all-unused-imports",
-                "--recursive",
-            )
+        self.run(
+            "isort.main.main",
+            "-rc",
+            "-sl",
+            "-a",
+            "from __future__ import absolute_import, print_function, unicode_literals",
         )
 
-        main()
+        # then we remove all missing imports and we expand star imports
 
-        from isort.main import main
-
-        sys.argv = list(
-            self._module_args(
-                "-rc",
-                "--multi-line",
-                "5",
-                "-a",
-                "from __future__ import absolute_import, print_function, unicode_literals",
-            )
+        self.run(
+            "autoflake.main",
+            "--in-place",
+            "--remove-duplicate-keys",
+            "--expand-star-import",
+            "--remove-all-unused-imports",
+            "--recursive",
         )
 
-        main()
-
-        from black import main
+        # then we use refactor imports again using pretty newline style
 
-        sys.argv = list(self._module_args("--line-length", "95", "--target-version", "py34"))
+        self.run("isort.main.main", "-rc", "--multi-line", "5")
 
-        main()
+        # after that we finally run black to refactor all code
 
-        sys.argv = argv
+        self.run("black.main", "--line-length", "95", "--target-version", "py34")

wolframclient/deserializers/wxf/__init__.py

@@ -24,8 +24,8 @@ def binary_deserialize(wxf_input, consumer=None, **kwargs):
     A stream of :class:`~wolframclient.deserializers.wxf.wxfparser.WXFToken` is generated from the WXF input by a instance
     of :class:`~wolframclient.deserializers.wxf.wxfparser.WXFParser`.
 
-    The consumer must be an instance of :class:`~wolframclient.deserializers.wxf.wxfconsumer.WXFConsumerNumpy`. If none is
-    provided, :class:`~wolframclient.deserializers.wxf.wxfconsumer.WXFConsumer` is used. To disable NumPy array support,
+    The consumer must be an instance of :class:`~wolframclient.deserializers.wxf.wxfconsumer.WXFConsumer`. If none is
+    provided, :class:`~wolframclient.deserializers.wxf.wxfconsumer.WXFConsumerNumpy` is used. To disable NumPy array support,
     use :class:`~wolframclient.deserializers.wxf.wxfconsumer.WXFConsumer`.
 
     Named parameters are passed to the consumer. They can be any valid parameter of

wolframclient/evaluation/__init__.py

@@ -23,19 +23,22 @@
 )
 
 __all__ = [
-    "WolframAPICall",
-    "WolframServer",
-    "WolframCloudSession",
-    "WolframCloudAsyncSession",
-    "WolframAPICall",
     "SecuredAuthenticationKey",
     "UserIDPassword",
-    "WolframLanguageSession",
-    "WolframLanguageAsyncSession",
-    "WolframResult",
-    "WolframKernelEvaluationResult",
+    "WolframAPICall",
+    "WolframAPICall",
+    "WolframAPICallAsync",
     "WolframAPIResponse",
+    "WolframAPIResponseAsync",
+    "WolframCloudAsyncSession",
     "WolframCloudEvaluationJSONResponse",
+    "WolframCloudSession",
+    "WolframEvaluationJSONResponseAsync",
     "WolframEvaluatorPool",
+    "WolframKernelEvaluationResult",
+    "WolframLanguageAsyncSession",
+    "WolframLanguageSession",
+    "WolframResult",
+    "WolframServer",
     "parallel_evaluate",
 ]

wolframclient/language/expression.py

@@ -80,6 +80,9 @@ def __init__(self, head, *args, **opts):
     def __hash__(self):
         return hash((self.head, self.args))
 
+    def __getitem__(self, i):
+        return self.args.__getitem__(i)
+
     def __eq__(self, other):
         return (
             isinstance(other, WLFunction)
@@ -128,7 +131,7 @@ def __init__(self, name=None):
         self.name = name
 
     def __getattr__(self, attr):
-        # summing a tuple with another tuple is returning a new immutable tuple, this operation is always creating a new immutable symbol factory
+        # this operation is always creating a new immutable symbol factory
         return self.__class__(self.name and "%s`%s" % (self.name, attr) or attr)
 
 

wolframclient/serializers/wxf.py

@@ -7,7 +7,6 @@
 from wolframclient.serializers.base import FormatSerializer
 from wolframclient.serializers.utils import py_encode_decimal, safe_len
 from wolframclient.serializers.wxfencoder.constants import (
-    ARRAY_TYPES,
     WXF_CONSTANTS,
     WXF_HEADER_COMPRESS,
     WXF_HEADER_SEPARATOR,
@@ -20,7 +19,6 @@
     numeric_array_to_wxf,
     packed_array_to_wxf,
     varint_bytes,
-    write_varint,
 )
 from wolframclient.utils import six
 from wolframclient.utils.api import zlib

wolframclient/serializers/wxfencoder/wxfexpr.py

@@ -5,11 +5,6 @@
 from wolframclient.serializers.wxfencoder.constants import (
     VALID_PACKED_ARRAY_TYPES,
     WXF_CONSTANTS,
-    StructDouble,
-    StructInt8LE,
-    StructInt16LE,
-    StructInt32LE,
-    StructInt64LE,
 )
 from wolframclient.serializers.wxfencoder.serializer import WXFSerializerException
 from wolframclient.serializers.wxfencoder.utils import (

wolframclient/serializers/wxfencoder/wxfnumpyencoder.py

@@ -2,13 +2,7 @@
 
 from __future__ import absolute_import, print_function, unicode_literals
 
-from wolframclient.serializers.wxfencoder.constants import (
-    ARRAY_TYPES,
-    WXF_CONSTANTS,
-    WXF_HEADER_COMPRESS,
-    WXF_HEADER_SEPARATOR,
-    WXF_VERSION,
-)
+from wolframclient.serializers.wxfencoder.constants import ARRAY_TYPES
 from wolframclient.serializers.wxfencoder.wxfencoder import WXFEncoder
 from wolframclient.serializers.wxfencoder.wxfexpr import (
     WXFExprNumericArray,

wolframclient/tests/configure.py

@@ -4,6 +4,7 @@
 
 import json
 import logging
+import unittest
 
 from wolframclient.utils import six
 from wolframclient.utils.api import os
@@ -109,4 +110,9 @@ def _parse_config(config):
     except IOError:
         raise ValueError("Failed to find json configuration file %s" % _json_config_path)
 
-MSG_JSON_NOT_FOUND = "Environment variable WOLFRAMCLIENT_PY_JSON_CONFIG not set."
+
+skip_for_jython = unittest.skipIf(six.JYTHON, "Currently not supported in jython")
+
+skip_for_missing_config = unittest.skipIf(
+    json_config is None, "Environment variable WOLFRAMCLIENT_PY_JSON_CONFIG not set."
+)

wolframclient/tests/core_functions.py

@@ -4,14 +4,7 @@
 
 from wolframclient.utils import six
 from wolframclient.utils.dispatch import Dispatch
-from wolframclient.utils.functional import (
-    composition,
-    flatten,
-    iterate,
-    map,
-    partition,
-    riffle,
-)
+from wolframclient.utils.functional import composition, flatten, iterate, partition, riffle
 from wolframclient.utils.tests import TestCase as BaseTestCase
 
 

wolframclient/tests/deserializers/wxf_deserialize.py

@@ -4,7 +4,6 @@
 
 import decimal
 import os
-import unittest
 
 from wolframclient.deserializers import (
     WXFConsumer,
@@ -16,6 +15,7 @@
 from wolframclient.exception import WolframParserException
 from wolframclient.serializers import export
 from wolframclient.serializers.wxfencoder.utils import write_varint
+from wolframclient.tests.configure import skip_for_jython
 from wolframclient.utils import six
 from wolframclient.utils.api import numpy
 from wolframclient.utils.tests import TestCase as BaseTestCase
@@ -108,27 +108,27 @@ def test_all_char(self):
         self.assertEqual(res, all_char)
 
     ### INTEGER TESTS
-    @unittest.skipIf(six.JYTHON, None)
+    @skip_for_jython
     def test_integer8(self):
         value = (0, 1, 127, -1, -128)
         self.wxf_assert_roundtrip(value)
 
-    @unittest.skipIf(six.JYTHON, None)
+    @skip_for_jython
     def test_int16(self):
         value = (-(1 << 15), (1 << 15) - 1)
         self.wxf_assert_roundtrip(value)
 
-    @unittest.skipIf(six.JYTHON, None)
+    @skip_for_jython
     def test_int32(self):
         value = (-(1 << 31), (1 << 31) - 1)
         self.wxf_assert_roundtrip(value)
 
-    @unittest.skipIf(six.JYTHON, None)
+    @skip_for_jython
     def test_int64(self):
         value = (-(1 << 63), (1 << 63) - 1)
         self.wxf_assert_roundtrip(value)
 
-    @unittest.skipIf(six.JYTHON, None)
+    @skip_for_jython
     def test_bigint_as_int(self):
         value = 10 ** 20
         self.wxf_assert_roundtrip(value)
@@ -232,7 +232,7 @@ def test_bad_wxf_buffer(self):
             binary_deserialize(wxf, consumer=WXFConsumer())
 
 
-@unittest.skipIf(six.JYTHON, "numpy is not supported in jython")
+@skip_for_jython
 class TestCaseNumPyArray(BaseTestCase):
     def test_numpy_1d_array(self):
         arr = numpy.array([0, 1], "uint8")