remove some py2 / py3 tags

Author: fchapoton

src/sage/cpython/getattr.pyx

@@ -310,8 +310,6 @@ cpdef getattr_from_other_class(self, cls, name):
 
         sage: "__weakref__" in dir(A)
         True
-        sage: "__weakref__" in dir(1)  # py2
-        False
         sage: 1.__weakref__
         Traceback (most recent call last):
         ...

src/sage/docs/instancedoc.pyx

@@ -312,11 +312,7 @@ def instancedoc(cls):
         TypeError: expected type, got 7
 
         sage: class OldStyle: pass
-        sage: instancedoc(OldStyle)  # py2
-        Traceback (most recent call last):
-        ...
-        TypeError: expected type, got <class __main__.OldStyle at ...>
-        sage: instancedoc(OldStyle)  # py3
+        sage: instancedoc(OldStyle)
         Traceback (most recent call last):
         ...
         TypeError: instancedoc requires <class '__main__.OldStyle'> to have an '_instancedoc_' attribute

src/sage/ext/fast_callable.pyx

@@ -372,9 +372,7 @@ def fast_callable(x, domain=None, vars=None,
         sage: K.<x,y,z> = QQ[]
         sage: p = x*y^2 + 1/3*y^2 - x*z - y*z
         sage: fp = fast_callable(p, domain=RDF)
-        sage: fp.op_list() # py2
-        [('load_const', 0.0), ('load_const', -1.0), ('load_arg', 0), ('ipow', 1), ('load_arg', 2), ('ipow', 1), 'mul', 'mul', 'add', ('load_const', 1.0), ('load_arg', 0), ('ipow', 1), ('load_arg', 1), ('ipow', 2), 'mul', 'mul', 'add', ('load_const', 0.3333333333333333), ('load_arg', 1), ('ipow', 2), 'mul', 'add', ('load_const', -1.0), ('load_arg', 1), ('ipow', 1), ('load_arg', 2), ('ipow', 1), 'mul', 'mul', 'add', 'return']
-        sage: fp.op_list() # py3
+        sage: fp.op_list()
         [('load_const', 0.0), ('load_const', 1.0), ('load_arg', 0), ('ipow', 1), ('load_arg', 1), ('ipow', 2), 'mul', 'mul', 'add', ('load_const', 0.3333333333333333), ('load_arg', 1), ('ipow', 2), 'mul', 'add', ('load_const', -1.0), ('load_arg', 0), ('ipow', 1), ('load_arg', 2), ('ipow', 1), 'mul', 'mul', 'add', ('load_const', -1.0), ('load_arg', 1), ('ipow', 1), ('load_arg', 2), ('ipow', 1), 'mul', 'mul', 'add', 'return']
         sage: fp(e, pi, sqrt(2))   # abs tol 3e-14
         21.831120464939584

src/sage/misc/sageinspect.py

@@ -521,15 +521,14 @@ def visit_NameConstant(self, node):
 
         EXAMPLES::
 
-            sage: import ast, sage.misc.sageinspect as sms  # py3
-            sage: visitor = sms.SageArgSpecVisitor()  # py3
-            sage: vis = lambda x: visitor.visit_NameConstant(ast.parse(x).body[0].value)  # py3
-            sage: [vis(n) for n in ['True', 'False', 'None']]  # py3
+            sage: import ast, sage.misc.sageinspect as sms
+            sage: visitor = sms.SageArgSpecVisitor()
+            sage: vis = lambda x: visitor.visit_NameConstant(ast.parse(x).body[0].value)
+            sage: [vis(n) for n in ['True', 'False', 'None']]
             [True, False, None]
-            sage: [type(vis(n)) for n in ['True', 'False', 'None']]  # py3
+            sage: [type(vis(n)) for n in ['True', 'False', 'None']]
             [<class 'bool'>, <class 'bool'>, <class 'NoneType'>]
         """
-
         return node.value
 
     def visit_arg(self, node):
@@ -552,11 +551,11 @@ def visit_arg(self, node):
 
         EXAMPLES::
 
-            sage: import ast, sage.misc.sageinspect as sms  # py3
-            sage: s = "def f(a, b=2, c={'a': [4, 5.5, False]}, d=(None, True)):\n    return"  # py3
-            sage: visitor = sms.SageArgSpecVisitor()  # py3
-            sage: args = ast.parse(s).body[0].args.args  # py3
-            sage: [visitor.visit_arg(n) for n in args]  # py3
+            sage: import ast, sage.misc.sageinspect as sms
+            sage: s = "def f(a, b=2, c={'a': [4, 5.5, False]}, d=(None, True)):\n    return"
+            sage: visitor = sms.SageArgSpecVisitor()
+            sage: args = ast.parse(s).body[0].args.args
+            sage: [visitor.visit_arg(n) for n in args]
             ['a', 'b', 'c', 'd']
         """
         return node.arg
@@ -1570,10 +1569,6 @@ def foo(x, a='\')"', b={not (2+1==3):'bar'}): return
     inspect module does)::
 
         sage: import inspect
-        sage: inspect.getargspec(range)  # py2
-        Traceback (most recent call last):
-        ...
-        TypeError: <built-in function range> is not a Python function
         sage: sage_getargspec(range)
         ArgSpec(args=[], varargs='args', keywords='kwds', defaults=None)
 
@@ -1702,28 +1697,28 @@ def formatannotation(annotation, base_module=None):
 
         sage: from sage.misc.sageinspect import formatannotation
         sage: import inspect
-        sage: def foo(a, *, b:int, **kwargs): # py3
+        sage: def foo(a, *, b:int, **kwargs):
         ....:     pass
-        sage: s = inspect.signature(foo) # py3
+        sage: s = inspect.signature(foo)
 
-        sage: a = s.parameters['a'].annotation # py3
-        sage: a # py3
+        sage: a = s.parameters['a'].annotation
+        sage: a
         <class 'inspect._empty'>
-        sage: formatannotation(a) # py3
+        sage: formatannotation(a)
         'inspect._empty'
 
-        sage: b = s.parameters['b'].annotation # py3
-        sage: b # py3
+        sage: b = s.parameters['b'].annotation
+        sage: b
         <class 'int'>
-        sage: formatannotation(b) # py3
+        sage: formatannotation(b)
         'int'
     """
     if getattr(annotation, '__module__', None) == 'typing':
         return repr(annotation).replace('typing.', '')
     if isinstance(annotation, type):
         if annotation.__module__ in ('builtins', base_module):
             return annotation.__qualname__
-        return annotation.__module__+'.'+annotation.__qualname__
+        return annotation.__module__ + '.' + annotation.__qualname__
     return repr(annotation)
 
 

src/sage/rings/integer.pyx

@@ -1193,20 +1193,9 @@ cdef class Integer(sage.structure.element.EuclideanDomainElement):
             10
             sage: print(Integer(16938402384092843092843098243).hex())
             36bb1e3929d1a8fe2802f083
-
-            sage: hex(Integer(16))  # py2
-            doctest:warning...:
-            DeprecationWarning: use the method .hex instead
-            See https://trac.sagemath.org/26756 for details.
-            '10'
         """
         return self.str(16)
 
-    def __hex__(self):
-        from sage.misc.superseded import deprecation_cython as deprecation
-        deprecation(26756, 'use the method .hex instead')
-        return self.hex()
-
     def oct(self):
         r"""
         Return the digits of ``self`` in base 8.
@@ -1233,34 +1222,20 @@ cdef class Integer(sage.structure.element.EuclideanDomainElement):
             sage: print(Integer(16938402384092843092843098243).oct())
             15535436162247215217705000570203
 
-        Behavior of Sage integers vs. Python integers (Python 2 and Python 3)::
+        Behavior of Sage integers vs. Python integers::
 
             sage: Integer(10).oct()
             '12'
-            sage: oct(Integer(10)) # py2
-            doctest:warning...:
-            DeprecationWarning: use the method .oct instead
-            See https://trac.sagemath.org/26756 for details.
-            '12'
-            sage: oct(int(10))  # py2
-            '012'
-            sage: oct(int(10))  # py3
+            sage: oct(int(10))
             '0o12'
 
             sage: Integer(-23).oct()
             '-27'
-            sage: oct(int(-23)) # py2
-            '-027'
-            sage: oct(int(-23)) # py3
+            sage: oct(int(-23))
             '-0o27'
         """
         return self.str(8)
 
-    def __oct__(self):
-        from sage.misc.superseded import deprecation_cython as deprecation
-        deprecation(26756, 'use the method .oct instead')
-        return self.oct()
-
     def binary(self):
         """
         Return the binary digits of ``self`` as a string.

src/sage/rings/polynomial/polydict.pyx

@@ -174,9 +174,7 @@ cdef class PolyDict:
             sage: p2 = PolyDict({(0,): 2})
             sage: p1 == p2
             False
-            sage: p1 < p2  # py2 - random
-            False
-            sage: p1 < p2  # py3
+            sage: p1 < p2
             Traceback (most recent call last):
             ...
             TypeError: '<' not supported between instances of

src/sage/rings/rational.pyx

@@ -4221,12 +4221,7 @@ cdef class int_to_Q(Morphism):
             sage: f = sage.rings.rational.int_to_Q()
             sage: f(int(4)) # indirect doctest
             4
-            sage: f(4^100)  # py2 - this will crash on Python 3
-            Traceback (most recent call last):
-            ...
-            TypeError: must be a Python int object
         """
-
         cdef Rational rat
 
         if type(a) is not int:

src/sage/rings/real_mpfr.pyx

@@ -2168,19 +2168,6 @@ cdef class RealNumber(sage.structure.element.RingElement):
         mpfr_free_str(s)
         return t
 
-    def __hex__(self):
-        """
-        TESTS::
-
-            sage: hex(RR(-1/3))  # py2
-            doctest:...:
-            DeprecationWarning: use the method .hex instead
-            See http://trac.sagemath.org/24568 for details.
-            '-0x5.5555555555554p-4'
-        """
-        deprecation(24568, 'use the method .hex instead')
-        return self.hex()
-
     def __copy__(self):
         """
         Return copy of ``self`` - since ``self`` is immutable, we just return