Merge branch 'release/B12_1_0' into bugfix/380061-removing-dependencies

Author: crazyeng

wolframclient/utils/api.py

@@ -2,6 +2,15 @@
 
 from wolframclient.utils.importutils import API
 
+ast = API(
+    Module = 'ast.Module',
+    PyCF_ONLY_AST = 'ast.PyCF_ONLY_AST',
+    Expr = 'ast.Expr',
+    Expression = 'ast.Expression',
+    FunctionDef = 'ast.FunctionDef',
+    ClassDef = 'ast.ClassDef',
+)
+
 pytz = API(
     FixedOffset="pytz.FixedOffset",
     timezone="pytz.timezone",

wolframclient/utils/externalevaluate.py

@@ -1,6 +1,5 @@
 from __future__ import absolute_import, print_function, unicode_literals
 
-import ast
 import logging
 import os
 import sys
@@ -11,7 +10,7 @@
 from wolframclient.language.side_effects import side_effect_logger
 from wolframclient.serializers import export
 from wolframclient.utils import six
-from wolframclient.utils.api import zmq
+from wolframclient.utils.api import ast, zmq
 from wolframclient.utils.datastructures import Settings
 from wolframclient.utils.encoding import force_text
 from wolframclient.utils.functional import last
@@ -27,6 +26,22 @@
 
 EXPORT_KWARGS = {"target_format": "wxf", "allow_external_objects": True}
 
+if six.PY_38:
+
+    # https://bugs.python.org/issue35766
+    # https://bugs.python.org/issue35894
+    # https://github.com/ipython/ipython/issues/11590
+    # PY_38 requires type_ignores to be a list, other versions are not accepting a second argument
+
+    def Module(code, type_ignores = []):
+        return ast.Module(code, type_ignores)
+
+
+else:
+
+    def Module(code):
+        return ast.Module(code)
+
 
 def EvaluationEnvironment(code, session_data={}, constants=None, **extra):
 
@@ -70,7 +85,7 @@ def execute_from_string(code, globals={}, **opts):
         result = expressions.pop(-1)
 
     if expressions:
-        exec(compile(ast.Module(expressions), "", "exec"), env)
+        exec(compile(Module(expressions), "", "exec"), env)
 
     if result:
         return eval(compile(ast.Expression(result.value), "", "eval"), env)

wolframclient/utils/six.py

@@ -14,6 +14,7 @@
 PY_35 = sys.version_info >= (3, 5)
 PY_36 = sys.version_info >= (3, 6)
 PY_37 = sys.version_info >= (3, 7)
+PY_38 = sys.version_info >= (3, 8)
 
 WINDOWS = platform.system() == "Windows"
 LINUX = platform.system() == "Linux"