Merge pull request #177 from antonio-rojas/cython-3.1

Fix build with Cython 3.1

Author: dimpase

cypari2/convert.pyx

@@ -42,7 +42,7 @@ some bit shuffling.
 from cysignals.signals cimport sig_on, sig_off, sig_error
 
 from cpython.version cimport PY_MAJOR_VERSION
-from cpython.int cimport PyInt_AS_LONG, PyInt_FromLong
+from cpython.long cimport PyLong_AsLong, PyLong_FromLong
 from cpython.longintrepr cimport (_PyLong_New,
                                   digit, PyLong_SHIFT, PyLong_MASK)
 from libc.limits cimport LONG_MIN, LONG_MAX
@@ -353,7 +353,7 @@ cdef PyInt_FromGEN(GEN g):
         reset_avma()
 
     if not signe(g):
-        return PyInt_FromLong(0)
+        return PyLong_FromLong(0)
 
     cdef ulong u
     if PY_MAJOR_VERSION == 2:
@@ -365,10 +365,10 @@ cdef PyInt_FromGEN(GEN g):
             # Check that <long>(u) or <long>(-u) does not overflow
             if signe(g) >= 0:
                 if u <= <ulong>LONG_MAX:
-                    return PyInt_FromLong(u)
+                    return PyLong_FromLong(u)
             else:
                 if u <= -<ulong>LONG_MIN:
-                    return PyInt_FromLong(-u)
+                    return PyLong_FromLong(-u)
 
     # Result does not fit in a C long
     res = PyLong_FromINT(g)
@@ -545,13 +545,9 @@ cdef GEN PyObject_AsGEN(x) except? NULL:
         sig_on()
         g = gp_read_str(<bytes>x)
         sig_off()
-    elif isinstance(x, long):
-        sig_on()
-        g = PyLong_AS_GEN(x)
-        sig_off()
     elif isinstance(x, int):
         sig_on()
-        g = PyInt_AS_GEN(x)
+        g = PyLong_AS_GEN(x)
         sig_off()
     elif isinstance(x, float):
         sig_on()
@@ -609,11 +605,8 @@ def integer_to_gen(x):
     ...     if pari(long(x)) != pari(x) or pari(int(x)) != pari(x):
     ...         print(x)
     """
-    if isinstance(x, long):
-        sig_on()
-        return new_gen(PyLong_AS_GEN(x))
     if isinstance(x, int):
         sig_on()
-        return new_gen(stoi(PyInt_AS_LONG(x)))
+        return new_gen(PyLong_AS_GEN(x))
     raise TypeError("integer_to_gen() needs an int or long "
                     "argument, not {}".format(type(x).__name__))

cypari2/gen.pyx

@@ -1966,35 +1966,6 @@ cdef class Gen(Gen_base):
         from sage.libs.pari.convert_sage import gen_to_sage
         return gen_to_sage(self, locals)
 
-    def __long__(self):
-        """
-        Convert ``self`` to a Python ``long``.
-
-        Examples:
-
-        >>> from cypari2 import Pari
-        >>> pari = Pari()
-        >>> import sys
-
-        >>> if sys.version_info.major == 3:
-        ...     long = int
-        >>> assert isinstance(long(pari(0)), long)
-        >>> assert long(pari(0)) == 0
-        >>> assert long(pari(10)) == 10
-        >>> assert long(pari(-10)) == -10
-        >>> assert long(pari(123456789012345678901234567890)) == 123456789012345678901234567890
-        >>> assert long(pari(-123456789012345678901234567890)) == -123456789012345678901234567890
-        >>> assert long(pari(2**31-1)) == 2147483647
-        >>> assert long(pari(-2**31)) == -2147483648
-        >>> assert long(pari("Pol(10)")) == 10
-        >>> assert long(pari("Mod(2, 7)")) == 2
-        """
-        x = gen_to_integer(self)
-        if isinstance(x, long):
-            return x
-        else:
-            return long(x)
-
     def __float__(self):
         """
         Return Python float.