merge remote

Author: mmatera

test/test_cellstotex.py

@@ -1,5 +1,5 @@
 import os
-from mathics.core.parser import parse, SingleLineFeeder
+from mathics.core.parser import parse, MathicsSingleLineFeeder
 from mathics.core.definitions import Definitions
 from mathics.core.evaluation import Evaluation
 from mathics.core.expression import Symbol
@@ -27,7 +27,7 @@
 
 
 def _evaluate(str_expression):
-    expr = parse(definitions, SingleLineFeeder(str_expression))
+    expr = parse(definitions, MathicsSingleLineFeeder(str_expression))
     return expr.evaluate(evaluation)
 
 def test_load():
@@ -56,7 +56,6 @@ def test_load():
 def test_load_and_run():
     print("load and run")
     str_expected0 = "None"
-    message0 = "Import::nffil: File not found during Import."
     _evaluate(set_versionnumber)
     result0 = _evaluate(import_url)
     expected0 = _evaluate(str_expected0)