Ticket #7349: trac_7349-6848-port.patch

sagenb/misc/sageinspect.py

@@ -224 +224 @@
 
         sage: from sage.misc.sageinspect import _sage_getargspec_cython
         sage: _sage_getargspec_cython("def init(self, x=None, base=0):")
-        (['self', 'x', 'base'], None, None, ('None', '0'))
+        (['self', 'x', 'base'], None, None, (None, 0)) 
         sage: _sage_getargspec_cython("def __init__(self, x=None, unsigned int base=0):")
-        (['self', 'x', 'base'], None, None, ('None', '0'))
+        (['self', 'x', 'base'], None, None, (None, 0)) 
 
     AUTHOR:
     
@@ -266 +266 @@
             argnames.append(argname)
             if len(s) > 1:
                 defvalue = s[1]
-                # Remove quotes around strings
-                defvalue = defvalue.strip('"').strip("'")
-                argdefs.append(defvalue)
+                # eval defvalue so we aren't just returning strings 
+                argdefs.append(eval(defvalue))
 
         if len(argdefs) > 0:
             argdefs = tuple(argdefs)
@@ -308 +307 @@
     if isclassinstance(obj):
         return inspect.getabsfile(obj.__class__)
     # No go? fall back to inspect.
-    return inspect.getabsfile(obj)    
+    return inspect.getabsfile(obj) 
 
 def sage_getargspec(obj):
     r"""
@@ -390 +389 @@
         sage: sage_getdef(identity_matrix, 'identity_matrix')
         'identity_matrix(ring, n=0, sparse=False)'
 
+    Check that trac #6848 has been fixed:
+
+        sage: sage_getdef(RDF.random_element)
+        '(min=-1, max=1)'
+
     If an exception is generated, None is returned instead and the
     exception is suppressed.
         
@@ -619 +623 @@
         sage: sage_getsource(sage)
         "...all..."
 
-    A cython function with default arguments::
+    A cython function with default arguments (one of which is a string)::
     
         sage: sage_getdef(sage.rings.integer.Integer.factor, obj_name='factor')
-        "factor(algorithm='pari', proof='True', limit='None')"
+        "factor(algorithm='pari', proof=True, limit=None)"
 
     A cython method without an embedded position can lead to surprising errors::
     
@@ -658 +662 @@
     Test _sage_getargspec_cython with multiple default arguments and a type::
     
         sage: _sage_getargspec_cython("def init(self, x=None, base=0):")
-        (['self', 'x', 'base'], None, None, ('None', '0'))
+        (['self', 'x', 'base'], None, None, (None, 0))
         sage: _sage_getargspec_cython("def __init__(self, x=None, base=0):")
-        (['self', 'x', 'base'], None, None, ('None', '0'))
+        (['self', 'x', 'base'], None, None, (None, 0))
         sage: _sage_getargspec_cython("def __init__(self, x=None, unsigned int base=0):")
-        (['self', 'x', 'base'], None, None, ('None', '0'))
+        (['self', 'x', 'base'], None, None, (None, 0))
     
     Test _extract_embedded_position: