Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix cython-lint in convert.pyx #148

Merged
merged 1 commit into from
Jan 30, 2024
Merged

fix cython-lint in convert.pyx #148

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions cypari2/convert.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Because of this difference in bit lengths, converting integers involves
some bit shuffling.
"""

#*****************************************************************************
# ****************************************************************************
# Copyright (C) 2016 Jeroen Demeyer <[email protected]>
# Copyright (C) 2016 Luca De Feo <[email protected]>
# Copyright (C) 2016 Vincent Delecroix <[email protected]>
Expand All @@ -36,26 +36,25 @@ some bit shuffling.
# 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/
# ****************************************************************************

from __future__ import absolute_import, division, print_function

from cysignals.signals cimport sig_on, sig_off, sig_error

from cpython.version cimport PY_MAJOR_VERSION
from cpython.object cimport Py_SIZE
from cpython.int cimport PyInt_AS_LONG, PyInt_FromLong
from cpython.longintrepr cimport (_PyLong_New,
digit, PyLong_SHIFT, PyLong_MASK)
digit, PyLong_SHIFT, PyLong_MASK)
from libc.limits cimport LONG_MIN, LONG_MAX
from libc.math cimport INFINITY

from .paridecl cimport *
from .stack cimport new_gen, reset_avma
from .string_utils cimport to_string, to_bytes
from .pycore_long cimport (ob_digit, _PyLong_IsZero, _PyLong_IsNegative,
_PyLong_IsPositive, _PyLong_DigitCount, _PyLong_SetSignAndDigitCount)
from .pycore_long cimport (ob_digit, _PyLong_IsZero, _PyLong_IsPositive,
_PyLong_DigitCount, _PyLong_SetSignAndDigitCount)

########################################################################
# Conversion PARI -> Python
Expand Down Expand Up @@ -331,8 +330,9 @@ cdef PyObject_FromGEN(GEN g):
lc = lg(g)
if lc <= 1:
return [[]]
lr = lg(gel(g,1))
return [[PyObject_FromGEN(gcoeff(g, i, j)) for j in range(1, lc)] for i in range(1, lr)]
lr = lg(gel(g, 1))
return [[PyObject_FromGEN(gcoeff(g, i, j)) for j in range(1, lc)]
for i in range(1, lr)]
elif t == t_INFINITY:
if inf_get_sign(g) >= 0:
return INFINITY
Expand Down Expand Up @@ -390,10 +390,10 @@ cdef GEN gtoi(GEN g0) except NULL:
sig_on()
g = simplify_shallow(g0)
if typ(g) == t_COMPLEX:
if gequal0(gel(g,2)):
g = gel(g,1)
if gequal0(gel(g, 2)):
g = gel(g, 1)
if typ(g) == t_INTMOD:
g = gel(g,2)
g = gel(g, 2)
g = trunc_safe(g)
if typ(g) != t_INT:
sig_error()
Expand Down Expand Up @@ -614,8 +614,8 @@ def integer_to_gen(x):
if isinstance(x, long):
sig_on()
return new_gen(PyLong_AS_GEN(x))
elif isinstance(x, int):
if isinstance(x, int):
sig_on()
return new_gen(stoi(PyInt_AS_LONG(x)))
else:
raise TypeError("integer_to_gen() needs an int or long argument, not {}".format(type(x).__name__))
raise TypeError("integer_to_gen() needs an int or long "
"argument, not {}".format(type(x).__name__))
Loading