Sage library fixes for binding=True

jdemeyer · jdemeyer · commit d96204097493 · 2018-07-13T11:20:29.000+02:00
diff --git a/src/doc/en/prep/Programming.rst b/src/doc/en/prep/Programming.rst
@@ -102,14 +102,17 @@ Then we do the row\-reduced echelon form.
 It is very important to keep in the parentheses.
 
 .. note::
-   Things that would be legal without them would be called 'attributes',
-   but Sage prefers stylistically to hide them, since math is made of functions
-   and not elements of sets. Or so a category\-theorist would say.
 
-   ::
+    Things that would be legal without them would be called 'attributes',
+    but Sage prefers stylistically to hide them, since math is made of
+    functions and not elements of sets.
+    Or so a category-theorist would say.
+
+    ::
 
-       sage: A.det # Won't work
-       <built-in method det of sage.matrix.matrix_integer_dense.Matrix_integer_dense object at ...>
+        sage: A.det  # Won't work
+        <bound method Matrix_integer_dense.det of [1 2]
+        [3 4]>
 
 This is so useful because we can use the 'tab' key, remember!
 
diff --git a/src/doc/en/prep/Symbolics-and-Basic-Plotting.rst b/src/doc/en/prep/Symbolics-and-Basic-Plotting.rst
@@ -199,7 +199,7 @@ This is a good place for a few reminders of basic help.
 ::
 
     sage: z.simplify
-    <built-in method simplify of sage.symbolic.expression.Expression object at ...>
+    <bound method Expression.simplify of -((x + 1)*sqrt(x - 1) - (x - 1)^(3/2))/sqrt((x + 1)*(x - 1))>
 
 Finally, recall that you can get nicely typeset versions of the output
 in several ways.
diff --git a/src/doc/en/thematic_tutorials/coercion_and_categories.rst b/src/doc/en/thematic_tutorials/coercion_and_categories.rst
@@ -452,7 +452,7 @@ And indeed, ``MS2`` has *more* methods than ``MS1``::
     sage: len([s for s in dir(MS1) if inspect.ismethod(getattr(MS1,s,None))])
     79
     sage: len([s for s in dir(MS2) if inspect.ismethod(getattr(MS2,s,None))])
-    118
+    237
 
 This is because the class of ``MS2`` also inherits from the parent
 class for algebras::
diff --git a/src/sage/__init__.py b/src/sage/__init__.py
@@ -35,10 +35,16 @@ def isfunction(obj):
         sage: from sage.categories.coercion_methods import _mul_parent
         sage: isfunction(_mul_parent)
         True
+        sage: from sage.structure.richcmp import rich_to_bool
+        sage: isfunction(rich_to_bool)
+        True
         sage: isfunction(Integer.digits)     # unbound method
         False
         sage: isfunction(Integer(1).digits)  # bound method
         False
+        sage: from sage.geometry.point_collection import PointCollection
+        sage: isfunction(PointCollection.output_format)  # static method
+        True
 
     Verify that ipywidgets can correctly determine signatures of Cython
     functions::
diff --git a/src/sage/arith/misc.py b/src/sage/arith/misc.py
@@ -1870,9 +1870,9 @@ def get_gcd(order):
     EXAMPLES::
 
         sage: sage.arith.misc.get_gcd(4000)
-        <built-in method gcd_int of sage.rings.fast_arith.arith_int object at ...>
+        <bound method arith_int.gcd_int of <sage.rings.fast_arith.arith_int object at ...>>
         sage: sage.arith.misc.get_gcd(400000)
-        <built-in method gcd_longlong of sage.rings.fast_arith.arith_llong object at ...>
+        <bound method arith_llong.gcd_longlong of <sage.rings.fast_arith.arith_llong object at ...>>
         sage: sage.arith.misc.get_gcd(4000000000)
         <function gcd at ...>
     """
@@ -1891,9 +1891,9 @@ def get_inverse_mod(order):
     EXAMPLES::
 
         sage: sage.arith.misc.get_inverse_mod(6000)
-        <built-in method inverse_mod_int of sage.rings.fast_arith.arith_int object at ...>
+        <bound method arith_int.inverse_mod_int of <sage.rings.fast_arith.arith_int object at ...>>
         sage: sage.arith.misc.get_inverse_mod(600000)
-        <built-in method inverse_mod_longlong of sage.rings.fast_arith.arith_llong object at ...>
+        <bound method arith_llong.inverse_mod_longlong of <sage.rings.fast_arith.arith_llong object at ...>>
         sage: sage.arith.misc.get_inverse_mod(6000000000)
         <function inverse_mod at ...>
     """
diff --git a/src/sage/categories/modules.py b/src/sage/categories/modules.py
@@ -589,6 +589,7 @@ def base_ring(self):
                 :meth:`sage.structure.category_object.CategoryObject.base_ring`::
 
                     sage: H.base_ring.__module__
+                    'sage.structure.category_object'
 
                 Here we call it directly::
 
diff --git a/src/sage/categories/primer.py b/src/sage/categories/primer.py
@@ -913,12 +913,10 @@ class SubcategoryMethods:
     sage: x = S('a')
 
 ``_repr_`` is a technical method which comes with the data structure
-(:class:`ElementWrapper`); since it's implemented in Cython, we need
-to use Sage's introspection tools to recover where it's implemented::
+(:class:`ElementWrapper`)::
 
     sage: x._repr_.__module__
-    sage: sage.misc.sageinspect.sage_getfile(x._repr_)
-    '.../sage/structure/element_wrapper.pyx'
+    'sage.structure.element_wrapper'
 
 ``_pow_int`` is a generic method for all finite semigroups::
 
diff --git a/src/sage/combinat/sf/classical.py b/src/sage/combinat/sf/classical.py
@@ -51,7 +51,7 @@ def init():
         sage: sage.combinat.sf.classical.conversion_functions = {}
         sage: init()
         sage: sage.combinat.sf.classical.conversion_functions[('Schur', 'powersum')]
-        <built-in function t_SCHUR_POWSYM_symmetrica>
+        <cyfunction t_SCHUR_POWSYM_symmetrica at ...>
 
     The following checks if the bug described in :trac:`15312` is fixed. ::
 
diff --git a/src/sage/graphs/strongly_regular_db.pyx b/src/sage/graphs/strongly_regular_db.pyx
@@ -1148,7 +1148,7 @@ def is_RSHCD(int v,int k,int l,int mu):
 
         sage: from sage.graphs.strongly_regular_db import is_RSHCD
         sage: t = is_RSHCD(64,27,10,12); t
-        [<built-in function SRG_from_RSHCD>, 64, 27, 10, 12]
+        [<cyfunction SRG_from_RSHCD at ...>, 64, 27, 10, 12]
         sage: g = t[0](*t[1:]); g
         Graph on 64 vertices
         sage: g.is_strongly_regular(parameters=True)
diff --git a/src/sage/interfaces/sage0.py b/src/sage/interfaces/sage0.py
@@ -556,7 +556,7 @@ def _repr_(self):
         EXAMPLES::
 
             sage: sage0(4).gcd
-            <built-in method gcd of sage.rings.integer.Integer object at 0x...>
+            <bound method Integer.gcd of 4>
         """
         return str(self._obj.parent().eval('%s.%s' % (self._obj._name,
                                                       self._name)))
diff --git a/src/sage/libs/singular/ring.pyx b/src/sage/libs/singular/ring.pyx
@@ -655,7 +655,7 @@ cpdef poison_currRing(frame, event, arg):
         sage: from sage.libs.singular.ring import poison_currRing
         sage: sys.settrace(poison_currRing)
         sage: sys.gettrace()
-        <built-in function poison_currRing>
+        <cyfunction poison_currRing at ...>
         sage: sys.settrace(previous_trace_func)  # switch it off again
     """
     global currRing
diff --git a/src/sage/misc/c3_controlled.pyx b/src/sage/misc/c3_controlled.pyx
@@ -1090,7 +1090,7 @@ class HierarchyElement(object, metaclass=ClasscallMetaclass):
             sage: x._bases
             [5, 2]
             sage: x._key
-            <built-in function identity>
+            <cyfunction identity at ...>
             sage: x._key(10)
             10
 
diff --git a/src/sage/misc/latex.py b/src/sage/misc/latex.py
@@ -557,7 +557,7 @@ def has_latex_attr(x):
         sage: T._latex_()
         Traceback (most recent call last):
         ...
-        TypeError: descriptor '_latex_' of 'sage.matrix.matrix0.Matrix' object needs an argument
+        TypeError: unbound method cython_function_or_method object must be called with Matrix_integer_dense instance as first argument (got nothing instead)
         sage: has_latex_attr(T)
         False
     """
diff --git a/src/sage/misc/lazy_attribute.pyx b/src/sage/misc/lazy_attribute.pyx
@@ -72,7 +72,7 @@ cdef class _lazy_attribute(object):
             sage: Parent.element_class.__name__
             'element_class'
             sage: Parent.element_class.__module__
-            'sage.misc.lazy_attribute'
+            'sage.structure.parent'
         """
         raise NotImplementedError("Only instantiate wrapper python class")
 
diff --git a/src/sage/sets/disjoint_set.pyx b/src/sage/sets/disjoint_set.pyx
@@ -358,14 +358,14 @@ cdef class DisjointSet_of_integers(DisjointSet_class):
 
             sage: d = DisjointSet(5)
             sage: d.__reduce__()
-            (<built-in function DisjointSet>, (5,), [0, 1, 2, 3, 4])
+            (<cyfunction DisjointSet at ...>, (5,), [0, 1, 2, 3, 4])
 
         ::
 
             sage: d.union(2,4)
             sage: d.union(1,3)
             sage: d.__reduce__()
-            (<built-in function DisjointSet>, (5,), [0, 1, 2, 1, 2])
+            (<cyfunction DisjointSet at ...>, (5,), [0, 1, 2, 1, 2])
         """
         return DisjointSet, (self._nodes.degree,), self.__getstate__()
 
@@ -674,7 +674,7 @@ cdef class DisjointSet_of_hashables(DisjointSet_class):
             {{0}, {1}, {2}, {3}, {4}}
             sage: d = _
             sage: d.__reduce__()
-            (<built-in function DisjointSet>,
+            (<cyfunction DisjointSet at ...>,
              ([0, 1, 2, 3, 4],),
              [(0, 0), (1, 1), (2, 2), (3, 3), (4, 4)])
 
@@ -683,7 +683,7 @@ cdef class DisjointSet_of_hashables(DisjointSet_class):
             sage: d.union(2,4)
             sage: d.union(1,3)
             sage: d.__reduce__()
-            (<built-in function DisjointSet>,
+            (<cyfunction DisjointSet at ...>,
              ([0, 1, 2, 3, 4],),
              [(0, 0), (1, 1), (2, 2), (3, 1), (4, 2)])
         """
diff --git a/src/sage/structure/category_object.pyx b/src/sage/structure/category_object.pyx
@@ -598,7 +598,7 @@ cdef class CategoryObject(SageObject):
             sage: F.base_ring()
             Integer Ring
             sage: F.__class__.base_ring
-            <method 'base_ring' of 'sage.structure.category_object.CategoryObject' objects>
+            <unbound method FreeModule_ambient_pid_with_category.base_ring>
 
         Note that the coordinates of the elements of a module can lie
         in a bigger ring, the ``coordinate_ring``::
@@ -618,15 +618,15 @@ cdef class CategoryObject(SageObject):
             sage: F.base_ring()
             Rational Field
             sage: F.__class__.base_ring
-            <method 'base_ring' of 'sage.structure.category_object.CategoryObject' objects>
+            <unbound method FreeAlgebra_generic_with_category.base_ring>
 
             sage: E = CombinatorialFreeModule(ZZ, [1,2,3])
             sage: F = CombinatorialFreeModule(ZZ, [2,3,4])
             sage: H = Hom(E, F)
             sage: H.base_ring()
             Integer Ring
             sage: H.__class__.base_ring
-            <method 'base_ring' of 'sage.structure.category_object.CategoryObject' objects>
+            <unbound method Homset_with_category_with_equality_by_id.base_ring>
 
         .. TODO::
 
diff --git a/src/sage/symbolic/getitem.pyx b/src/sage/symbolic/getitem.pyx
@@ -179,7 +179,7 @@ cdef class OperandsWrapper(SageObject):
         TESTS::
 
             sage: (x^2).op.__reduce__()
-            (<built-in function restore_op_wrapper>, (x^2,))
+            (<cyfunction restore_op_wrapper at ...>, (x^2,))
             sage: loads(dumps((x^2).op))
             Operands of x^2
         """

Original file line number	Diff line number	Diff line change
@@ -452,7 +452,7 @@ And indeed, ``MS2`` has more methods than ``MS1``::
`452`	`452`	`sage: len([s for s in dir(MS1) if inspect.ismethod(getattr(MS1,s,None))])`
`453`	`453`	`79`
`454`	`454`	`sage: len([s for s in dir(MS2) if inspect.ismethod(getattr(MS2,s,None))])`
`455`		`- 118`
	`455`	`+ 237`
`456`	`456`
`457`	`457`	This is because the class of ``MS2`` also inherits from the parent
`458`	`458`	`class for algebras::`