Merge pull request #1181 from mathics/fixesimportexportstring

This PR fixes some bugs introduced in M$Windows-compatible tests and makes mathics compatible with IWolfram (I hope).

Author: mmatera

mathics/builtin/files.py

@@ -3705,7 +3705,7 @@ class Compress(Builtin):
 
     """
 
-    attributes = "Protected"
+    attributes = ("Protected",)
 
     options = {
         "Method": "{}",
@@ -3720,9 +3720,9 @@ def apply(self, expr, evaluation, options):
         string = string.encode("utf-8")
 
         # TODO Implement other Methods
+        # Shouldn't be this a ByteArray?
         result = zlib.compress(string)
-        result = base64.encodebytes(result).decode("utf8")
-
+        result = base64.b64encode(result).decode("utf8")
         return String(result)
 
 
@@ -3744,12 +3744,12 @@ class Uncompress(Builtin):
      = x ^ 2 + y Sin[x] + 10 Log[15]
     """
 
-    attributes = "Protected"
+    attributes = ("Protected",)
 
     def apply(self, string, evaluation):
         "Uncompress[string_String]"
-        string = string.get_string_value().encode("utf-8")
-        string = base64.decodebytes(string)
+        string = string.get_string_value() #.encode("utf-8")
+        string = base64.b64decode(string)
         tmp = zlib.decompress(string)
         tmp = tmp.decode("utf-8")
         return evaluation.parse(tmp)

mathics/builtin/importexport.py

@@ -10,8 +10,9 @@ def check_evaluation(str_expr: str, str_expected: str, message=""):
     """Helper function to test that a WL expression against
     its results"""
     result = session.evaluate(str_expr)
+    print("result=",result)
     expected = session.evaluate(str_expected)
-
+    print("expected=",expected)
     print(time.asctime())
     print(message)
     if message:

test/helper.py

@@ -23,11 +23,13 @@ def _evaluate(str_expression):
     def test_non_win32_compress():
         for str_expr, str_expected, message in (
             (
-             'Compress["―"]',
-             "= eJxTetQwVQkABwMCPA=="
+             r'Compress["―"]',
+                '"eJxTetQwVQkABwMCPA=="',
+                ""
              ),
-            ("Uncompress[eJxTUlACAADLAGU=%]",
-             "―"
+            (r'Uncompress["eJxTetQwVQkABwMCPA=="]',
+             r'"―"',
+             ""
              ),
         ):
             check_evaluation(str_expr, str_expected, message)

test/test_files.py

@@ -10,8 +10,9 @@
     def test_non_win32_print():
         for str_expr, str_expected, message in (
             (
-             'Print["\\[Mu]"]',
-             "μ"
+                'Print["\\[Mu]"]',
+                "System`Null",
+                "μ"
             ),
         ):
             check_evaluation(str_expr, str_expected, message)