Revise Import. Add ZIP import - Part 1.

MANIFEST.in

@@ -1,5 +1,5 @@
 include README.rst
-include CHANGES.rst
+include CHANGES.md
 include ChangeLog
 include COPYING.txt
 include FUTURE.rst

README.rst

@@ -70,5 +70,5 @@ Mathics3 is released under the GNU General Public License Version 3 (GPL3).
 		 :target: https://badge.fury.io/py/Mathics3
 .. |PyPI Installs| image:: https://pepy.tech/badge/Mathics3
 .. |Supported Python Versions| image:: https://img.shields.io/pypi/pyversions/Mathics3.svg
-.. |Packaging status| image:: https://repology.org/badge/vertical-allrepos/mathics.svg
-			    :target: https://repology.org/project/mathics/versions
+.. |Packaging status| image:: https://repology.org/badge/vertical-allrepos/mathics3.svg
+			    :target: https://repology.org/project/mathics3/versions

mathics/autoload/formats/Base64/Export.m → mathics/SystemFiles/Formats/Base64/Export.wl

@@ -1,3 +1,4 @@
+(* ::Package:: *)
 
 Begin["System`Convert`B64Dump`"]
 
@@ -21,6 +22,7 @@
 	FunctionChannels -> {"FileNames"},
 	Options -> {"CharacterEncoding", "ByteOrderMark"},
 	DefaultElement -> "Plaintext",
+	Encoding -> True
 	BinaryFormat -> False
 ]
 

mathics/autoload/formats/Base64/Import.m → mathics/SystemFiles/Formats/Base64/Import.wl

@@ -1,3 +1,5 @@
+(* ::Package:: *)
+
 Begin["System`Convert`B64Dump`"]
 
 
@@ -21,6 +23,7 @@
     FunctionChannels -> {"FileNames"},
     AvailableElements -> {"Data"},
     DefaultElement -> "Data",
+    Encoding -> True
     Options -> {
         "CharacterEncoding"
     }

mathics/autoload/formats/CSV/Export.m → mathics/SystemFiles/Formats/CSV/Export.wl

@@ -1,3 +1,5 @@
+(* ::Package:: *)
+
 (* CSV Exporter *)
 
 Begin["System`Convert`TableDump`"]
@@ -8,7 +10,7 @@
 };
 
 CSVExport[strm_OutputStream, data_, OptionsPattern[]]:=
-    Module[{char, wraplist, sep = OptionValue["FieldSeparators"]},        
+    Module[{char, wraplist, sep = OptionValue["FieldSeparators"]},
         If[strm === $Failed, Return[$Failed]];
         wraplist[x_] := If[Head[x] === List, x, {x}];
         char = Map[ToString, wraplist /@ wraplist[data], {2}];
@@ -21,7 +23,7 @@
     System`Convert`TableDump`CSVExport,
     FunctionChannels -> {"Streams"},
     Options -> {"ByteOrderMark"},
-    DefaultElement -> "Plaintext",
+    DefaultElement -> "Data",
     BinaryFormat -> False,
     Options -> {
         "CharacterEncoding",

mathics/autoload/formats/CSV/Import.m → mathics/SystemFiles/Formats/CSV/Import.wl

@@ -1,3 +1,5 @@
+(* ::Package:: *)
+
 (* CSV Importer *)
 
 Begin["System`Convert`TableDump`"]
@@ -23,12 +25,13 @@
     System`Convert`TableDump`ImportCSV,
     {
         "Data" :> GetData,
-	    "Grid" :> GetGrid
+        "Grid" :> GetGrid
     },
     (* Sources -> ImportExport`DefaultSources["Table"], *)
     FunctionChannels -> {"Streams"},
     AvailableElements -> {"Data", "Grid"},
     DefaultElement -> "Data",
+    BinaryFormat -> False,
     Options -> {
         "CharacterEncoding",
         "FieldSeparators"

mathics/autoload/formats/SVG/Export.m → mathics/SystemFiles/Formats/SVG/Export.wl

@@ -3,8 +3,8 @@
 Begin["System`Convert`TextDump`"]
 
 
-SVGExport[filename_, expr_, opts___] := 
-  Module[{strm, data, p, q, expr2}, 
+SVGExport[filename_, expr_, opts___] :=
+  Module[{strm, data, p, q, expr2},
     strm = OpenWrite[filename];
     If[strm === $Failed, Return[$Failed]];
     expr2 = If[Head[expr]=!=System`Graphics, System`Graphics[{System`Inset[ToString[expr]]}], expr];

mathics/SystemFiles/Formats/ZIP/Import.wl

@@ -0,0 +1,12 @@
+(* ZIP compressed file and file archive Importer *)
+
+Begin["System`ZIP`"]
+ImportExport`RegisterImport[
+    "ZIP",
+    ImportZip,
+    FunctionChannels -> {"Streams"},
+    AvailableElements -> {"FileNames", "Summary"},
+    DefaultElement -> "FileNames"
+]
+
+End[]

mathics/builtin/files_io/files.py

@@ -270,7 +270,6 @@ class FilePrint(Builtin):
     expected_args = (1, 2)
     messages = {
         "zstr": ("The file name cannot be an empty string."),
-        "badfile": ("The specified argument, `1`, should be a valid string."),
     }
 
     options = {
@@ -283,6 +282,7 @@ class FilePrint(Builtin):
     def eval(self, path, evaluation: Evaluation, options: dict):
         "FilePrint[path_, OptionsPattern[FilePrint]]"
 
+        # TODO also check for File.
         if not isinstance(path, String):
             evaluation.message("FilePrint", "badfile", path)
             return
@@ -675,7 +675,7 @@ def eval_input(self, exprs, name, n, evaluation: Evaluation):
         stream = stream_manager.lookup_stream(n.get_int_value())
 
         if stream is None or stream.io.closed:
-            evaluation.message("Put", "openx", get_eval_Expression())
+            evaluation.message("Put", "openx", evaluation.current_expression)
             return
 
         # In Mathics3-server, evaluation.format_output is modified.
@@ -772,7 +772,7 @@ def eval_input(self, exprs, name, n, evaluation: Evaluation):
         stream = stream_manager.lookup_stream(n.get_int_value())
 
         if stream is None or stream.io.closed:
-            evaluation.message("Put", "openx", get_eval_Expression())
+            evaluation.message("Put", "openx", evaluation.current_expression)
             return
 
         text = [
@@ -1187,7 +1187,7 @@ def eval_n(self, file, types, n: Integer, evaluation: Evaluation, options: dict)
 
         py_n = n.value
         if py_n < 0:
-            evaluation.message("ReadList", "intnm", get_eval_Expression())
+            evaluation.message("ReadList", "intnm", evaluation.current_expression)
             return
 
         result = []
@@ -1298,7 +1298,9 @@ def eval_input(self, name, n, m, evaluation):
 
         seekpos = m.to_python()
         if not (isinstance(seekpos, int) or seekpos == float("inf")):
-            evaluation.message("SetStreamPosition", "stmrng", get_eval_Expression(), m)
+            evaluation.message(
+                "SetStreamPosition", "stmrng", evaluation.current_expression, m
+            )
             return
 
         try:

mathics/builtin/files_io/filesystem.py

@@ -9,7 +9,7 @@
 import pathlib
 import re
 import shutil
-from typing import List
+from typing import List, Optional
 
 from mathics.builtin.files_io.files import Mathics3Open
 from mathics.core.atoms import Integer, String
@@ -20,7 +20,7 @@
 from mathics.core.convert.regex import to_regex
 from mathics.core.evaluation import Evaluation
 from mathics.core.expression import Expression
-from mathics.core.streams import create_temporary_file, path_search, urlsave_tmp
+from mathics.core.streams import create_temporary_file, urlsave_tmp
 from mathics.core.symbols import (
     Symbol,
     SymbolFalse,
@@ -36,6 +36,7 @@
 )
 from mathics.eval.directories import DIRECTORY_STACK
 from mathics.eval.files_io.files import eval_Get
+from mathics.eval.files_io.filesystem import eval_FindFile
 from mathics.eval.stackframe import get_eval_Expression
 
 
@@ -62,21 +63,20 @@ def eval(self, name, evaluation):
         py_name = name.to_python()
 
         if not isinstance(py_name, str):
-            evaluation.message("AbsoluteFileName", "fstr", name)
+            evaluation.message("AbsoluteFileName", "badfile", name)
             return
 
         if py_name[0] == py_name[-1] == '"':
             py_name = py_name[1:-1]
 
-        result, _ = path_search(py_name)
-
+        result = eval_FindFile(py_name)
         if result is None:
             evaluation.message(
                 "AbsoluteFileName", "nffil", to_expression("AbsoluteFileName", name)
             )
             return SymbolFailed
 
-        return String(osp.abspath(result))
+        return result
 
 
 class CopyDirectory(Builtin):
@@ -173,7 +173,7 @@ def eval(self, source, dest, evaluation):
         if py_dest[0] == py_dest[-1] == '"':
             py_dest = py_dest[1:-1]
 
-        py_source, _ = path_search(py_source)
+        py_source = eval_FindFile(py_source)
 
         if py_source is None:
             evaluation.message("CopyFile", "filex", source)
@@ -184,7 +184,7 @@ def eval(self, source, dest, evaluation):
             return SymbolFailed
 
         try:
-            shutil.copy(py_source, py_dest)
+            shutil.copy(py_source.value, py_dest)
         except IOError:
             evaluation.message("CopyFile", "nffil", get_eval_Expression())
             return SymbolFailed
@@ -300,12 +300,12 @@ def eval(self, filename, evaluation):
 
             if path[0] == path[-1] == '"':
                 path = path[1:-1]
-            path, _ = path_search(path)
+            resolved_path = eval_FindFile(path)
 
-            if path is None:
+            if resolved_path is None:
                 evaluation.message("DeleteFile", "nffil", get_eval_Expression())
                 return SymbolFailed
-            py_paths.append(path)
+            py_paths.append(resolved_path.value)
 
         for path in py_paths:
             try:
@@ -355,7 +355,6 @@ class DirectoryStack(Builtin):
 
     def eval(self, evaluation):
         "DirectoryStack[]"
-        global DIRECTORY_STACK
         return from_python(DIRECTORY_STACK)
 
 
@@ -504,19 +503,16 @@ class FileExistsQ(Builtin):
     }
     summary_text = "test whether a file exists"
 
-    def eval(self, filename, evaluation):
+    def eval(self, filename, evaluation) -> Optional[Symbol]:
         "FileExistsQ[filename_]"
         path = filename.to_python()
         if not (isinstance(path, str) and path[0] == path[-1] == '"'):
             evaluation.message("FileExistsQ", "fstr", filename)
             return
         path = path[1:-1]
 
-        path, is_temporary_file = path_search(path)
-
-        if path is None:
-            return SymbolFalse
-        return SymbolTrue
+        resolved_path = eval_FindFile(path)
+        return SymbolFalse if resolved_path is None else SymbolTrue
 
 
 class FileExtension(Builtin):
@@ -606,12 +602,10 @@ def eval(self, name, evaluation):
             return
         py_name = py_name[1:-1]
 
-        result, is_temporary_file = path_search(py_name)
-
+        result = eval_FindFile(py_name)
         if result is None:
             return SymbolFailed
-
-        return String(osp.abspath(result))
+        return result
 
 
 class FileNames(Builtin):
@@ -983,9 +977,9 @@ def eval(self, source, dest, evaluation):
         py_source = py_source[1:-1]
         py_dest = py_dest[1:-1]
 
-        py_source, _ = path_search(py_source)
+        resolved_source = eval_FindFile(py_source)
 
-        if py_source is None:
+        if resolved_source is None:
             evaluation.message("RenameFile", "filex", source)
             return SymbolFailed
 
@@ -994,7 +988,7 @@ def eval(self, source, dest, evaluation):
             return SymbolFailed
 
         try:
-            shutil.move(py_source, py_dest)
+            shutil.move(resolved_source.value, py_dest)
         except IOError:
             evaluation.message("RenameFile", "nffil", dest)
             return SymbolFailed