some fixes

Author: fchapoton

src/sage/ext_data/magma/sage/basic.m

@@ -155,11 +155,11 @@ intrinsic SageNamesHelper(X::.) -> MonStgElt
   i := NumberOfNames(X);
   if "$" in Sprint(X.i) then
     /* unnamed variables */
-    return "(" * (&* [ Sprintf("'x%o', ", j) : j in [ 1..i ] ]) * ")"
+    return "(" * (&* [ Sprintf("'x%o', ", j) : j in [ 1..i ] ]) * ")";
   else
     /* named variables */
-    return "(" * (&* [ Sprintf("'%o', ", X.j) : j in [ 1..i ] ]) * ")"
-  end if:
+    return "(" * (&* [ Sprintf("'%o', ", X.j) : j in [ 1..i ] ]) * ")";
+  end if;
 end intrinsic;
 
 intrinsic Sage(X::RngUPol) -> MonStgElt, BoolElt

src/sage/interfaces/magma.py

@@ -214,7 +214,7 @@
 #
 #                  https://www.gnu.org/licenses/
 # ****************************************************************************
-from __future__ import annotations
+from pathlib import Path
 import re
 import sys
 import os
@@ -463,7 +463,7 @@ def _post_process_from_file(self, s) -> str:
             return ''
         return s[i + 1:]
 
-    def __getattr__(self, attrname) -> MagmaFunction:
+    def __getattr__(self, attrname):
         """
         Return a formal wrapper around a Magma function, or raise an
         :exc:`AttributeError` if attrname starts with an underscore.
@@ -656,7 +656,7 @@ def objgens(self, value, gens):
 
             sage: R = magma.objgens('PolynomialRing(Rationals(),2)', 'alpha,beta')    # optional - magma
             sage: R.gens()          # optional - magma
-            [alpha, beta]
+            (alpha, beta)
 
         Because of how Magma works you can use this to change the variable
         names of the generators of an object::
@@ -912,16 +912,15 @@ def cputime(self, t=None):
             sage: # optional - magma
             sage: type(magma.cputime())
             <... 'float'>
-            sage: magma.cputime()
+            sage: magma.cputime()  # random
             1.9399999999999999
             sage: t = magma.cputime()
-            sage: magma.cputime(t)
+            sage: magma.cputime(t)  # random
             0.02
         """
         if t:
             return float(self.eval('Cputime(%s)' % t))
-        else:
-            return float(self.eval('Cputime()'))
+        return float(self.eval('Cputime()'))
 
     def chdir(self, dir):
         """
@@ -1004,7 +1003,7 @@ def load(self, filename):
 
         Loading a file in Magma makes all the functions and procedures in
         the file available. The file should not contain any intrinsics (or
-        you'll get errors). It also runs code in the file, which can
+        you will get errors). It also runs code in the file, which can
         produce output.
 
         INPUT:
@@ -1019,14 +1018,15 @@ def load(self, filename):
             sage: with NTF(mode='w+t', suffix='.m') as f:  # optional - magma
             ....:     _ = f.write('function f(n) return n^2; end function;\nprint "hi";')
             ....:     print(magma.load(f.name))
-            Loading ".../a.m"
+            Loading "....m"
             hi
             sage: magma('f(12)')  # optional - magma
             144
         """
-        return self.eval('load "%s"' % filename)
+        p = Path(filename)
+        return self.eval('load "%s"' % p.absolute())
 
-    def _next_var_name(self):
+    def _next_var_name(self) -> str:
         """
         Return the next available variable name in Magma.
 
@@ -2072,14 +2072,14 @@ def AssignNames(self, names):
 
     def gen(self, n):
         """
-        Return the `n`-th generator of this Magma element. Note that
-        generators are 1-based in Magma rather than 0-based!
+        Return the `n`-th generator of this Magma element.
+
+        Note that generators are 1-based in Magma rather than 0-based!
 
         INPUT:
 
         - ``n`` -- *positive* integer
 
-
         OUTPUT: :class:`MagmaElement`
 
         EXAMPLES::
@@ -2102,7 +2102,7 @@ def gen(self, n):
             sage: m.gen(4)                # optional -- magma
             Traceback (most recent call last):
             ...
-            IndexError: list index out of range
+            IndexError: tuple index out of range
         """
         if n <= 0:
             raise IndexError("index must be positive since Magma indexes are 1-based")
@@ -2114,7 +2114,7 @@ def gens(self) -> tuple:
 
         If ``self`` is named X in Magma, this function evaluates X.1, X.2,
         etc., in Magma until an error occurs. It then returns a Sage tuple
-        of the resulting X.i. Note - I don't think there is a Magma command
+        of the resulting X.i. Note - I do not think there is a Magma command
         that returns the list of valid X.i. There are numerous ad hoc
         functions for various classes but nothing systematic. This function
         gets around that problem. Again, this is something that should
@@ -2296,15 +2296,15 @@ def _polynomial_(self, R):
             sage: R.<x> = QQ[]
             sage: f = magma(x^2 + 2/3*x + 5)                 # optional - magma
             sage: f                                          # optional - magma
-            t^2 + 2/3*t + 5
+            x^2 + 2/3*x + 5
             sage: f.Type()                                   # optional - magma
             RngUPolElt
             sage: f._polynomial_(R)                          # optional - magma
             x^2 + 2/3*x + 5
         """
         return R(list(self.Eltseq()))
 
-    def _latex_(self):
+    def _latex_(self) -> str:
         r"""
         Return latex representation of ``self``.
 
@@ -2856,6 +2856,7 @@ def write(self, s):
             sage: P.<x,y,z> = GF(32003)[]
             sage: I = sage.rings.ideal.Katsura(P)
             sage: _ = I.groebner_basis('magma',prot=True) # indirect doctest, optional - magma
+            ...
             ********************
             FAUGERE F4 ALGORITHM
             ********************