minor test fixes and cleanup

sagemath · Dec 7, 2018 · e11e438 · e11e438
1 parent e588e7a
commit e11e438
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/sage/libs/gap/element.pyx b/src/sage/libs/gap/element.pyx
@@ -2137,7 +2137,7 @@ cdef class GapElement_String(GapElement):
             sage: s.sage()
             'string'
             sage: type(_)
-            <... 'str'>
+            <type 'str'>
         """
         s = char_to_str(CSTR_STRING(self.value))
         return s
@@ -2903,7 +2903,8 @@ cdef class GapElement_Record(GapElement):
         sage: rec['no_such_element']
         Traceback (most recent call last):
         ...
-        IndexError: libGAP: Error, Record: '<rec>.no_such_element' must have an assigned value
+        IndexError: libGAP: Error, Record Element: '<rec>.no_such_element' must
+        have an assigned value
     """
 
     def __len__(self):
@@ -2937,7 +2938,7 @@ cdef class GapElement_Record(GapElement):
             sage: iter = rec.__iter__()
             sage: type(iter)
             <type 'sage.libs.gap.element.GapElement_RecordIterator'>
-            sage: list(rec)
+            sage: sorted(rec)
             [('a', 123), ('b', 456)]
         """
         return GapElement_RecordIterator(self)
@@ -3041,7 +3042,7 @@ cdef class GapElement_RecordIterator(object):
     EXAMPLES::
 
         sage: rec = libgap.eval('rec(a:=123, b:=456)')
-        sage: list(rec)
+        sage: sorted(rec)
         [('a', 123), ('b', 456)]
         sage: dict(rec)
         {'a': 123, 'b': 456}
@@ -3077,10 +3078,10 @@ cdef class GapElement_RecordIterator(object):
 
             sage: rec = libgap.eval('rec(a:=123, b:=456)')
             sage: iter = rec.__iter__()
-            sage: iter.__next__()
-            ('a', 123)
-            sage: next(iter)
-            ('b', 456)
+            sage: a = iter.__next__()
+            sage: b = next(iter)
+            sage: sorted([a, b])
+            [('a', 123), ('b', 456)]
         """
         cdef UInt i = self.i
         if i>len(self.rec):

diff --git a/src/sage/libs/gap/libgap.pyx b/src/sage/libs/gap/libgap.pyx
@@ -229,6 +229,7 @@ from sage.misc.superseded import deprecated_function_alias
 ### Debugging ##############################################################
 ############################################################################
 
+
 cdef void report(Obj bag):
     print(TNAM_OBJ(bag),  <int>SIZE_OBJ(bag))
 
@@ -237,8 +238,6 @@ cdef void print_gasman_objects():
     CallbackForAllBags(report)
 
 
-
-
 from sage.misc.lazy_import import is_during_startup
 if is_during_startup():
     import sys, traceback

diff --git a/src/sage/libs/gap/util.pyx b/src/sage/libs/gap/util.pyx
@@ -28,12 +28,12 @@ from sage.cpython.string cimport str_to_bytes, char_to_str
 from sage.interfaces.gap_workspace import prepare_workspace_dir
 from sage.env import SAGE_LOCAL, GAP_ROOT_DIR
 
-# these do nothing now
 
 ############################################################################
 ### Hooking into the GAP memory management #################################
 ############################################################################
 
+
 cdef class ObjWrapper(object):
     """
     Wrapper for GAP master pointers