Trac #32757: last fixes for relint linter

namely

- remove check for sagenb

- remove last traces of {{{__metaclass__}}}

This should allow this linter to turn green.

URL: https://trac.sagemath.org/32757
Reported by: chapoton
Ticket author(s): Frédéric Chapoton
Reviewer(s): Matthias Koeppe

Author: Release Manager

src/.relint.yml

@@ -7,8 +7,8 @@
   hint: |
     # ifilter, imap, izip           # __metaclass__
     Hint: # update raise statements       # except Exception, var
-    Hint: # sagenb                        # six is no longer allowed
-  pattern: '(import.*[, ]ifilter|import.*[, ]imap|import.*[, ]izip|^\s*raise\s*[A-Za-z]*Error\s*,|__metaclass__|except\s*[A-Za-z]\s*,|[^_]sagenb|import six|from six import)'
+    Hint: # six is no longer allowed
+  pattern: '(import.*[, ]ifilter|import.*[, ]imap|import.*[, ]izip|^\s*raise\s*[A-Za-z]*Error\s*,|__metaclass__|except\s*[A-Za-z]\s*,|import six|from six import)'
   filePattern: .*[.](py|pyx|rst)
 
 - name: 'foreign_latex: foreign commands in LaTeX'

src/sage/dynamics/arithmetic_dynamics/endPN_automorphism_group.py

@@ -1790,8 +1790,9 @@ def which_group(list_of_elements):
     else:
         return ['A_5']
 
+
 def conjugating_set_initializer(f, g):
-    """
+    r"""
     Return a conjugation invariant set together with information
     to reduce the combinatorics of checking all possible conjugations.
 

src/sage/misc/bindable_class.py

@@ -1,18 +1,15 @@
 """
 Bindable classes
 """
-
-#*****************************************************************************
+# ****************************************************************************
 #       Copyright (C) 2012 Nicolas M. Thiery <nthiery at users.sf.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 2 of the License, or
 # (at your option) any later version.
-#                  http://www.gnu.org/licenses/
-#*****************************************************************************
-
-
+#                  https://www.gnu.org/licenses/
+# ****************************************************************************
 import functools
 from sage.misc.nested_class import NestedClassMetaclass
 from sage.misc.classcall_metaclass import ClasscallMetaclass
@@ -33,16 +30,12 @@ class BindableClass(metaclass=ClasscallMetaclass):
     Let us consider the following class ``Outer`` with a nested class ``Inner``::
 
         sage: from sage.misc.nested_class import NestedClassMetaclass
-        sage: class Outer:
-        ....:     __metaclass__ = NestedClassMetaclass # just a workaround for Python misnaming nested classes
-        ....:
+        sage: class Outer(metaclass=NestedClassMetaclass):
         ....:     class Inner:
         ....:         def __init__(self, *args):
         ....:             print(args)
-        ....:
         ....:     def f(self, *args):
         ....:         print("{} {}".format(self, args))
-        ....:
         ....:     @staticmethod
         ....:     def f_static(*args):
         ....:         print(args)
@@ -84,9 +77,7 @@ class BindableClass(metaclass=ClasscallMetaclass):
     :class:`BindableClass` gives this binding behavior to all its subclasses::
 
         sage: from sage.misc.bindable_class import BindableClass
-        sage: class Outer:
-        ....:     __metaclass__ = NestedClassMetaclass # just a workaround for Python misnaming nested classes
-        ....:
+        sage: class Outer(metaclass=NestedClassMetaclass):
         ....:     class Inner(BindableClass):
         ....:         " some documentation "
         ....:         def __init__(self, outer, *args):

src/sage/misc/classcall_metaclass.pyx

@@ -217,12 +217,10 @@ cdef class ClasscallMetaclass(NestedClassMetaclass):
         We now show the usage of ``__classcall_private__``::
 
             sage: class FooNoInherits(object, metaclass=ClasscallMetaclass):
-            ....:     __metaclass__ = ClasscallMetaclass
             ....:     @staticmethod
             ....:     def __classcall_private__(cls):
             ....:         print("calling private classcall")
             ....:         return type.__call__(cls)
-            ...
             sage: FooNoInherits()
             calling private classcall
             <__main__.FooNoInherits object at ...>

src/sage/misc/nested_class.pyx

@@ -44,24 +44,16 @@ EXAMPLES::
 
     sage: A1.A2.A3.__name__
     'A3'
-    sage: A1.A2.A3  # py2
-    <class sage.misc.nested_class.A3 at ...>
-    sage: A1.A2.A3  # py3
+    sage: A1.A2.A3
     <class 'sage.misc.nested_class.A1.A2.A3'>
 
-    sage: nested_pickle(A1)  # py2
-    <class sage.misc.nested_class.A1 at ...>
-    sage: nested_pickle(A1)  # py3
+    sage: nested_pickle(A1)
     <class 'sage.misc.nested_class.A1'>
 
-    sage: A1.A2  # py2
-    <class sage.misc.nested_class.A1.A2 at ...>
-    sage: A1.A2  # py3
+    sage: A1.A2
     <class 'sage.misc.nested_class.A1.A2'>
 
-    sage: A1.A2.A3  # py2
-    <class sage.misc.nested_class.A1.A2.A3 at ...>
-    sage: A1.A2.A3  # py3
+    sage: A1.A2.A3
     <class 'sage.misc.nested_class.A1.A2.A3'>
     sage: A1.A2.A3.__name__
     'A1.A2.A3'
@@ -79,22 +71,13 @@ All of this is not perfect. In the following scenario::
     sage: class B1:
     ....:     A2 = A1.A2
 
-    sage: nested_pickle(A1)       # py2
-    <class __main__.A1 at ...>
-    sage: nested_pickle(B1)       # py2
-    <class __main__.B1 at ...>
-    sage: A1.A2                   # py2
-    <class __main__.A1.A2 at ...>
-    sage: B1.A2                   # py2
-    <class __main__.A1.A2 at ...>
-
-    sage: nested_pickle(A1)       # py3
+    sage: nested_pickle(A1)
     <class '__main__.A1'>
-    sage: nested_pickle(B1)       # py3
+    sage: nested_pickle(B1)
     <class '__main__.B1'>
-    sage: A1.A2                   # py3
+    sage: A1.A2
     <class '__main__.A1.A2'>
-    sage: B1.A2                   # py3
+    sage: B1.A2
     <class '__main__.A1.A2'>
 
 The name for ``"A1.A2"`` could potentially be set to ``"B1.A2"``. But that will work anyway.
@@ -161,14 +144,9 @@ cpdef modify_for_nested_pickle(cls, str name_prefix, module, first_run=True):
     Note that the class is now found in the module under both its old and
     its new name::
 
-        sage: getattr(module, 'A.B', 'Not found')   # py2
-        <class '__main__.X.A.B'>
-        sage: getattr(module, 'X.A.B', 'Not found') # py2
-        <class '__main__.X.A.B'>
-
-        sage: getattr(module, 'A.B', 'Not found')   # py3
+        sage: getattr(module, 'A.B', 'Not found')
         <class '__main__.A.B'>
-        sage: getattr(module, 'X.A.B', 'Not found') # py3
+        sage: getattr(module, 'X.A.B', 'Not found')
         <class '__main__.A.B'>
 
     TESTS:
@@ -253,9 +231,7 @@ def nested_pickle(cls):
 
         sage: A.B.__name__
         'A.B'
-        sage: getattr(module, 'A.B', 'Not found')  # py2
-        <class __main__.A.B at ...>
-        sage: getattr(module, 'A.B', 'Not found')  # py3
+        sage: getattr(module, 'A.B', 'Not found')
         <class '__main__.A.B'>
 
     In Python 2.6, decorators work with classes; then ``@nested_pickle``
@@ -288,10 +264,8 @@ cdef class NestedClassMetaclass(type):
     derived subclass::
 
         sage: from sage.misc.nested_class import NestedClassMetaclass
-        sage: class ASuperClass(object):                                  # py2
-        ....:     __metaclass__ = NestedClassMetaclass                    # py2
-        sage: class ASuperClass(object, metaclass=NestedClassMetaclass):  # py3
-        ....:     pass                                                    # py3
+        sage: class ASuperClass(object, metaclass=NestedClassMetaclass):
+        ....:     pass
         sage: class A3(ASuperClass):
         ....:     class B(object):
         ....:         pass
@@ -304,16 +278,16 @@ cdef class NestedClassMetaclass(type):
         r"""
         This invokes the nested_pickle on construction.
 
-        sage: from sage.misc.nested_class import NestedClassMetaclass
-        sage: class A(object):
-        ....:     __metaclass__ = NestedClassMetaclass
-        ....:     class B(object):
-        ....:         pass
-        ...
-        sage: A.B
-        <class '__main__.A.B'>
-        sage: getattr(sys.modules['__main__'], 'A.B', 'Not found')
-        <class '__main__.A.B'>
+        EXAMPLES::
+
+            sage: from sage.misc.nested_class import NestedClassMetaclass
+            sage: class A(object, metaclass=NestedClassMetaclass):
+            ....:     class B(object):
+            ....:         pass
+            sage: A.B
+            <class '__main__.A.B'>
+            sage: getattr(sys.modules['__main__'], 'A.B', 'Not found')
+            <class '__main__.A.B'>
         """
         modify_for_nested_pickle(self, self.__name__, sys_modules[self.__module__])
 

src/sage/misc/sageinspect.py

@@ -192,9 +192,9 @@ def loadable_module_extension():
 
 def isclassinstance(obj):
     r"""
-    Checks if argument is instance of non built-in class
+    Check if argument is instance of non built-in class
 
-    INPUT: ``obj`` - object
+    INPUT: ``obj`` -- object
 
     EXAMPLES::
 
@@ -207,12 +207,10 @@ def isclassinstance(obj):
         sage: isclassinstance(myclass)
         False
         sage: class mymetaclass(type): pass
-        sage: class myclass2:
-        ....:     __metaclass__ = mymetaclass
+        sage: class myclass2(metaclass=mymetaclass): pass
         sage: isclassinstance(myclass2)
         False
     """
-
     builtin_mods = set(['__builtin__', 'builtins', 'exceptions'])
 
     return (not inspect.isclass(obj) and
@@ -1630,7 +1628,7 @@ def foo(x, a='\')"', b={not (2+1==3):'bar'}): return
         except (TypeError, AttributeError):
             pass
     if isclassinstance(obj):
-        if hasattr(obj,'_sage_src_'): #it may be a decorator!
+        if hasattr(obj, '_sage_src_'): #it may be a decorator!
             source = sage_getsource(obj)
             try:
                 # we try to find the definition and parse it by
@@ -2384,7 +2382,7 @@ class Element(object):
 
     # Check if we deal with an instance
     if isclassinstance(obj):
-        if isinstance(obj,functools.partial):
+        if isinstance(obj, functools.partial):
             return sage_getsourcelines(obj.func)
         else:
             return sage_getsourcelines(obj.__class__)

src/sage_docbuild/ext/sage_autodoc.py

@@ -1174,8 +1174,7 @@ def import_object(self):
         # by using the metaclass NestedMetaclass, we change the attribute
         # __name__ of the nested class. For example, in
         #
-        #     class A:
-        #        __metaclass__ = NestedClassMetaclass
+        #     class A(metaclass=NestedMetaclass):
         #        class B(object):
         #            pass
         #