Ticket #2387: sage_init.patch

a/sage/calculus/calculus.py

@@ -1145 +1145 @@
-    def _pari_init_(self):
-        return self._sys_init_('pari')
-
+    def _sage_init_(self):
+        return self._sys_init_('sage')
+
-    def _sys_init_(self, system):
-        return repr(self)
-

a/sage/groups/perm_gps/permgroup.py

@@ -238 +238 @@
-    def _magma_init_(self):
-        g = str(self.gens())[1:-1]
-        return 'PermutationGroup<%s | %s>'%(self.degree(), g)
+
+    def _sage_init_(self):
+        gen = [list(i) for i in self.gens()]
+        return 'PermutationGroup(%s'%str(gen)
-
-    def __cmp__(self, right):
-        """

a/sage/matrix/matrix1.pyx

@@ -162 +162 @@
-        """
-        s = str(self.rows()).replace('(','[').replace(')',']')
-        return "Matrix(%s,%s,%s)"%(self.nrows(), self.ncols(), s)
+
+    def _sage_init_(self):
+        """
+        """
+        K = self._base_ring._sage_init_()
+        if self.is_sparse():
+            entries = self.dict()
+            s = "matrix(%s, %s, sparse=True)"%(K, entries)
+        else:
+            rows = [list(i) for i in self.rows()]
+            s = "matrix(%s, %s)"%(K, rows)
+        return s
+
-
-    def _singular_(self, singular=None):
-        """

a/sage/rings/integer_mod.pyx

@@ -348 +348 @@
-            1
-        """
-        return '%s!%s'%(self.parent()._magma_init_(), self)
+
+    def _sage_init_(self):
+        return "%s(%r)"%(self.parent()._sage_init_(), self)
-
-    def log(self, b=None):
-        r"""

a/sage/rings/integer_mod_ring.py

@@ -865 +865 @@
-        """
-        return 'Integers(%s)'%self.order()
-
+    def _sage_init_(self):
+        """
+        EXAMPLES:
+            sage: Integers(12345678900)._sage_init_()
+            'Integers(12345678900)'
+        """
+        return 'Integers(%d)'%self.order()
+
+
-
-Zmod = IntegerModRing
-Integers = IntegerModRing

a/sage/rings/integer_ring.pyx

@@ -643 +643 @@
-        """
-        return 'IntegerRing()'
-
+    def _sage_init_(self):
+        """
+        EXAMPLES:
+            sage: ZZ._sage_init_()
+            'ZZ'
+        """
+        return 'ZZ'
+
-ZZ = IntegerRing_class()
-Z = ZZ
-

a/sage/rings/polynomial/multi_polynomial_ring_generic.pyx

@@ -282 +282 @@
-            B = self.base_ring()._magma_init_()
-        R = 'PolynomialRing(%s, %s, %s)'%(B, self.ngens(),self.term_order().magma_str())
-        return R
+    
+    def _sage_init_(self):
+        """
+        Return a string representation of self that Sage can understand.
+
+        """
+        generators = ','.join([repr(i) for i in self.gens()])
+        return "PolynomialRing(%s, '%s', order='%s')"%(self.base_ring()._sage_init_(), generators, self.term_order().sage_str())
-    
-    def is_finite(self):
-        if self.ngens() == 0:

a/sage/rings/polynomial/polynomial_element.pyx

@@ -2620 +2620 @@
-            'Polynomial(IntegerRing(), [5,-17,0,1])'        
-        """
-        return 'Polynomial(%s, [%s])'%(self.base_ring()._magma_init_(), ','.join([a._magma_init_() for a in self.list()]))
+
+    def _sage_init_(self):
+        """
+        Return a string that represents self in a way that Sage understands.
+
+        """
+        return "%s(%r)"%(self.parent()._sage_init_(), self)
-
-    def _magma_(self, G=None):
-        """

a/sage/rings/polynomial/polynomial_ring.py

@@ -331 +331 @@
-
-    def _magma_init_(self):
-        return 'PolynomialRing(%s)'%(self.base_ring()._magma_init_())
+
+    def _sage_init_(self):
+        return "PolynomialRing(%s, '%s')"%(self.base_ring()._sage_init_(), self.gen())
+
-
-    def _gap_(self, G=None):
-        """

a/sage/rings/polynomial/term_order.py

@@ -714 +714 @@
-        """
-        return self.__magma_str
-
+    def sage_str(self):
+        """
+        """
+        return self.__name
+
-    def __cmp__(self, other):
-        if not isinstance(other, TermOrder):
-            if isinstance(other, str):

a/sage/rings/rational_field.py

@@ -638 +638 @@
-            Rational Field
-        """
-        return 'RationalField()'
+    
+    def _sage_init_(self):
+        return 'QQ'
+
-
-
-QQ = RationalField()

a/sage/rings/ring.pyx

@@ -1204 +1204 @@
-        p = self.polynomial()
-        return "ext< %s | %s >"%(B._magma_init_(),p._magma_init_())
-    
+    def _sage_init_(self):
+        """
+        Return a string representation of self that Sage can understand.
+        
+        EXAMPLES:
+            sage: GF(97, 'a')._sage_init_()
+            "GF(97)"
+            sage: GF(9,'a')._sage_init_()
+            "GF(9,'a')"
+        """
+        if self.degree() == 1:
+            return 'GF(%d)'%self.order()
+        return "GF(%d, '%r')"%(self.order(), self.gen())
+        
+
-    cdef int _cmp_c_impl(left, Parent right) except -2:
-        """
-        Compares this finite field with other.

a/sage/structure/sage_object.pyx

@@ -325 +325 @@
-        return self._interface_(G)
-
-    def _magma_init_(self):
+        return self._interface_init_()
+
+    def _sage_init_(self):
-        return self._interface_init_()
-
-    def _macaulay2_(self, G=None):