Ticket #2171: sage-trac2171-part2.patch

sage/interfaces/expect.py

@@ -1087 +1087 @@
         return self.eval(var)
 
     def get_using_file(self, var):
-        """
-        Return the string representation of the variable var in self
-        using a file.  Use this if var has a huge string
-        representation.  It'll be way faster.
+        r"""
+        Return the string representation of the variable var in self,
+        possibly using a file.  Use this if var has a huge string
+        representation, since it may be way faster.
+
+        WARNING: In fact unless a special derived class implements
+        this, it will \emph{not} be any faster.  This is the case for
+        this class if you're reading it through introspection and
+        seeing this.
         """
         return self.get(var)
 

sage/interfaces/magma.py

@@ -1158 +1158 @@
             [1 2 3]
             [4 5 6]
         """
-        P = self._check_valid()
-        cmd = "Sage(%s)"%self.name()
-        s = str(P.eval(cmd))
-        return sage.misc.sage_eval.sage_eval(s)
+        z, preparse = self.Sage(nvals = 2)
+        s = str(z)
+        preparse =  str(preparse) == 'true'
+        return sage.misc.sage_eval.sage_eval(s, preparse=preparse)
 
     def AssignNames(self, names):
         """

sage/misc/sage_eval.py

@@ -19 +19 @@
     Sage.  This means calling eval after preparsing and with
     globals equal to everything included in the scope of
     \code{from sage.all import *}.).
+
+    INPUT:
+        source -- a string or object with a _sage_ method
+        locals -- evaluate in namespace of sage.all plus the
+                  locals dictionary
+        cmds   -- string; sequence of commands to be run before
+                  source is evaluated.
+        preparse -- (default: True) if True, preparse the
+                  string expression.
+    
 
     EXAMPLES:
     This example illustrates that preparsing is applied.