Skip to content

Commit

Permalink
replace iteritems with items in modified files
Browse files Browse the repository at this point in the history
  • Loading branch information
mantepse committed Oct 5, 2024
1 parent 81f9a96 commit 38904b6
Show file tree
Hide file tree
Showing 12 changed files with 38 additions and 36 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ cdef class FreeAlgebraElement_letterplace(AlgebraElement):
[((0, 0, 0, 1, 0, 0, 0, 1), 2), ((0, 1, 0, 0, 0, 0, 1, 0), 1)]
"""
cdef dict d = self._poly.monomial_coefficients()
yield from d.iteritems()
yield from d.items()

def _repr_(self):
"""
Expand Down
10 changes: 5 additions & 5 deletions src/sage/rings/polynomial/laurent_polynomial_mpair.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ cdef class LaurentPolynomial_mpair(LaurentPolynomial):
if isinstance(x, dict):
self._mon = ETuple({}, int(parent.ngens()))
D = {}
for k, x_k in x.iteritems(): # ETuple-ize keys, set _mon
for k, x_k in x.items(): # ETuple-ize keys, set _mon
if not isinstance(k, (tuple, ETuple)) or len(k) != parent.ngens():
self._mon = ETuple({}, int(parent.ngens()))
break
Expand All @@ -119,7 +119,7 @@ cdef class LaurentPolynomial_mpair(LaurentPolynomial):
else:
x = D
if not self._mon.is_constant(): # factor out _mon
x = {k.esub(self._mon): x_k for k, x_k in x.iteritems()}
x = {k.esub(self._mon): x_k for k, x_k in x.items()}
elif (isinstance(x, LaurentPolynomial_mpair) and
parent.variable_names() == x.parent().variable_names()):
self._mon = ( < LaurentPolynomial_mpair > x)._mon
Expand Down Expand Up @@ -1565,11 +1565,11 @@ cdef class LaurentPolynomial_mpair(LaurentPolynomial):
except ValueError:
# call _derivative() recursively on coefficients
return P({m: c._derivative(var)
for m, c in self.monomial_coefficients().iteritems()})
for m, c in self.monomial_coefficients().items()})

# compute formal derivative with respect to generator
cdef dict d = {}
for m, c in self.monomial_coefficients().iteritems():
for m, c in self.monomial_coefficients().items():
if m[index] != 0:
new_m = [u for u in m]
new_m[index] += -1
Expand Down Expand Up @@ -1650,7 +1650,7 @@ cdef class LaurentPolynomial_mpair(LaurentPolynomial):
if R is None:
R = LaurentPolynomialRing(self.base_ring(), x)

return R({m[i]: c for m, c in self.monomial_coefficients().iteritems()})
return R({m[i]: c for m, c in self.monomial_coefficients().items()})

def monomial_reduction(self):
"""
Expand Down
16 changes: 8 additions & 8 deletions src/sage/rings/polynomial/multi_polynomial.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ cdef class MPolynomial(CommutativePolynomial):
ind = Z.index(var)
except ValueError:
raise ValueError("var must be one of the generators of the parent polynomial ring.")
return R({k: c for k, c in self.monomial_coefficients().iteritems()
return R({k: c for k, c in self.monomial_coefficients().items()
if k[ind] < n})

def _fast_callable_(self, etb):
Expand Down Expand Up @@ -299,7 +299,7 @@ cdef class MPolynomial(CommutativePolynomial):
n = len(x)

expr = etb.constant(self.base_ring().zero())
for m, c in self.monomial_coefficients().iteritems():
for m, c in self.monomial_coefficients().items():
monom = prod([x[i] ** m[i] for i in range(n) if m[i] != 0],
etb.constant(c))
expr = expr + monom
Expand Down Expand Up @@ -426,12 +426,12 @@ cdef class MPolynomial(CommutativePolynomial):
d = self.degree(var)
B = ring.base_ring()
w = {remove_from_tuple(e, ind): val
for e, val in self.monomial_coefficients().iteritems() if not e[ind]}
for e, val in self.monomial_coefficients().items() if not e[ind]}
v = [B(w)] # coefficients that don't involve var
z = var
for i in range(1,d+1):
c = <dict> self.coefficient(z).monomial_coefficients()
w = {remove_from_tuple(e, ind): val for e, val in c.iteritems()}
w = {remove_from_tuple(e, ind): val for e, val in c.items()}
v.append(B(w))
z *= var
return ring(v)
Expand Down Expand Up @@ -511,12 +511,12 @@ cdef class MPolynomial(CommutativePolynomial):
new_map[k] -= m
tmp = [0] * (len(vars) - m)
try:
for ix, a in self.monomial_coefficients().iteritems():
for ix, a in self.monomial_coefficients().items():
for k in range(len(my_vars)):
tmp[new_map[k]] = ix[k]
postfix = ETuple(tmp)
mpoly = <dict> a._mpoly_dict_recursive(prev_vars, base_ring)
for prefix, b in mpoly.iteritems():
for prefix, b in mpoly.items():
D[prefix + postfix] = b
return D

Expand All @@ -527,7 +527,7 @@ cdef class MPolynomial(CommutativePolynomial):
base_ring = None

tmp = [0] * len(vars)
for ix, a in self.monomial_coefficients().iteritems():
for ix, a in self.monomial_coefficients().items():
for k in range(len(my_vars)):
tmp[mapping[k]] = ix[k]
if base_ring is not None:
Expand Down Expand Up @@ -578,7 +578,7 @@ cdef class MPolynomial(CommutativePolynomial):
cdef long result_mon
var_name_hash = [hash(v) for v in self._parent.variable_names()]
cdef long c_hash
for m, c in self.monomial_coefficients().iteritems():
for m, c in self.monomial_coefficients().items():
# I'm assuming (incorrectly) that hashes of zero indicate that the element is 0.
# This assumption is not true, but I think it is true enough for the purposes and it
# it allows us to write fast code that omits terms with 0 coefficients. This is
Expand Down
16 changes: 8 additions & 8 deletions src/sage/rings/polynomial/multi_polynomial_libsingular.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -855,7 +855,7 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base):
if element.parent() == self:
bucket = sBucketCreate(_ring)
try:
for (m,c) in element.element().dict().iteritems():
for m, c in element.element().dict().items():
mon = p_Init(_ring)
p_SetCoeff(mon, sa2si(c, _ring), _ring)
for pos in m.nonzero_positions():
Expand Down Expand Up @@ -893,7 +893,7 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base):
if element.parent().ngens() <= self.ngens():
bucket = sBucketCreate(_ring)
try:
for (m,c) in element.element().dict().iteritems():
for m, c in element.element().dict().items():
if check:
c = base_ring(c)
if not c:
Expand Down Expand Up @@ -923,7 +923,7 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base):
else:
bucket = sBucketCreate(_ring)
try:
for (m,c) in element.iteritems():
for m, c in element.items():
if check:
c = base_ring(c)
if not c:
Expand Down Expand Up @@ -2088,7 +2088,7 @@ cdef class MPolynomial_libsingular(MPolynomial_libsingular_base):
except TypeError:
# give up, evaluate functional
sage_res = parent.base_ring().zero()
for m, c in self.monomial_coefficients().iteritems():
for m, c in self.monomial_coefficients().items():
sage_res += c * mul([x[i] ** m[i] for i in m.nonzero_positions()])
else:
singular_polynomial_call(&res, self._poly, _ring, coerced_x,
Expand Down Expand Up @@ -5272,7 +5272,7 @@ cdef class MPolynomial_libsingular(MPolynomial_libsingular_base):
if base_map is None:
# Just use conversion
base_map = codomain
for m, c in self.monomial_coefficients().iteritems():
for m, c in self.monomial_coefficients().items():
y += base_map(c) * mul([im_gens[i] ** m[i] for i in range(n) if m[i]])
return y

Expand Down Expand Up @@ -5400,7 +5400,7 @@ cdef class MPolynomial_libsingular(MPolynomial_libsingular_base):
v = ETuple({index: 1}, len(gens))

_p = p_ISet(0, _ring)
for exp, coeff in self.monomial_coefficients().iteritems():
for exp, coeff in self.monomial_coefficients().items():
nexp = exp.eadd(v) # new exponent
mon = p_Init(_ring)
p_SetCoeff(mon, sa2si(coeff / (1 + exp[index]), _ring), _ring)
Expand Down Expand Up @@ -5906,9 +5906,9 @@ def unpickle_MPolynomial_libsingular(MPolynomialRing_libsingular R, d):
rChangeCurrRing(r)
bucket = sBucketCreate(r)
try:
for mon,c in d.iteritems():
for mon, c in d.items():
m = p_Init(r)
for i,e in mon.sparse_iter():
for i, e in mon.sparse_iter():
_i = i
if _i >= r.N:
p_Delete(&m, r)
Expand Down
2 changes: 1 addition & 1 deletion src/sage/rings/polynomial/multi_polynomial_ring_base.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ cdef class MPolynomialRing_base(CommutativeRing):
K = self.base_ring()
D = {}
var_range = range(len(self.variable_names()))
for ix, a in x.monomial_coefficients().iteritems():
for ix, a in x.monomial_coefficients().items():
ix = ETuple([0 if name_mapping[t] == -1 else ix[name_mapping[t]]
for t in var_range])
D[ix] = K(a)
Expand Down
2 changes: 1 addition & 1 deletion src/sage/rings/polynomial/plural.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -1403,7 +1403,7 @@ def unpickle_NCPolynomial_plural(NCPolynomialRing_plural R, d):
cdef int _i, _e
p = p_ISet(0,r)
rChangeCurrRing(r)
for mon,c in d.iteritems():
for mon, c in d.items():
m = p_Init(r)
for i,e in mon.sparse_iter():
_i = i
Expand Down
6 changes: 3 additions & 3 deletions src/sage/rings/polynomial/polynomial_element.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -3880,7 +3880,7 @@ cdef class Polynomial(CommutativePolynomial):
cdef dict D = {}
cdef tuple leftovers = (0,) * (len(variables) - len(prev_variables) - 1)
for k in range(len(mpolys)):
for i,a in mpolys[k].iteritems():
for i, a in mpolys[k].items():
j = ETuple((k,) + leftovers)
D[i + j] = a

Expand Down Expand Up @@ -12687,11 +12687,11 @@ cpdef list _dict_to_list(dict x, zero):
if isinstance(n, tuple): # a mpoly dict
n = n[0]
v = [zero] * (n+1)
for i, z in x.iteritems():
for i, z in x.items():
v[i[0]] = z
else:
v = [zero] * (n+1)
for i, z in x.iteritems():
for i, z in x.items():
v[i] = z
return v

Expand Down
4 changes: 2 additions & 2 deletions src/sage/rings/polynomial/polynomial_ring_homomorphism.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ cdef class PolynomialRingHomomorphism_from_base(RingHomomorphism_from_base):
P = self.codomain()
f = self.underlying_map()
if P.is_sparse():
return P({a: f(b) for a, b in x.monomial_coefficients().iteritems()})
return P({a: f(b) for a, b in x.monomial_coefficients().items()})
else:
return P([f(b) for b in x])

Expand Down Expand Up @@ -88,7 +88,7 @@ cdef class PolynomialRingHomomorphism_from_base(RingHomomorphism_from_base):
P = self.codomain()
f = self.underlying_map()
if P.is_sparse():
return P({a: f(b) for a, b in x.monomial_coefficients().iteritems()},
return P({a: f(b) for a, b in x.monomial_coefficients().items()},
*args, **kwds)
else:
return P([f(b) for b in x], *args, **kwds)
Expand Down
4 changes: 2 additions & 2 deletions src/sage/rings/power_series_mpoly.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ cdef class PowerSeries_mpoly(PowerSeries):
d = {}
if isinstance(B, MPolynomialRing_base):
for i in range(len(v)):
for n, c in v[i].monomial_coefficients().iteritems():
for n, c in v[i].monomial_coefficients().items():
d[tuple(n) + (i,)] = c
else:
for i in range(len(v)):
for n, c in v[i].monomial_coefficients().iteritems():
for n, c in v[i].monomial_coefficients().items():
d[(n,i)] = c

self.__f = S(d)
Expand Down
2 changes: 1 addition & 1 deletion src/sage/rings/power_series_ring_element.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -1045,7 +1045,7 @@ cdef class PowerSeries(AlgebraElement):
else:
n = int(n)
v = {}
for k, x in self.monomial_coefficients().iteritems():
for k, x in self.monomial_coefficients().items():
if k >= n:
v[k-n] = x
return self._parent(v, self.prec()-n)
Expand Down
4 changes: 3 additions & 1 deletion src/sage/rings/tate_algebra_element.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -2371,7 +2371,9 @@ cdef class TateAlgebraElement(CommutativeAlgebraElement):
return elt.lift_to_precision(prec)
except PrecisionError:
return elt.lift_to_precision()
ans._poly = PolyDict({ e: lift_without_error(c) for (e,c) in self._poly.__repn.iteritems() }, None)
ans._poly = PolyDict({e: lift_without_error(c)
for e, c in self._poly.__repn.items()},
None)
if prec is None:
prec = self._parent.precision_cap()
ans._prec = max(self._prec, prec)
Expand Down
6 changes: 3 additions & 3 deletions src/sage/symbolic/expression.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -5846,12 +5846,12 @@ cdef class Expression(Expression_abc):

if kwds:
# Ensure that the keys are symbolic variables.
varkwds = {self._parent.var(k): v for k,v in kwds.iteritems()}
varkwds = {self._parent.var(k): v for k,v in kwds.items()}
# Check for duplicate
_dict_update_check_duplicate(sdict, varkwds)

cdef GExMap smap
for k, v in sdict.iteritems():
for k, v in sdict.items():
smap.insert(make_pair((<Expression>self.coerce_in(k))._gobj,
(<Expression>self.coerce_in(v))._gobj))
res = self._gobj.subs_map(smap, 0)
Expand Down Expand Up @@ -5999,7 +5999,7 @@ cdef class Expression(Expression_abc):

if kwds:
# Ensure that the keys are functions.
funkwds = {_find_func(k): v for k,v in kwds.iteritems()}
funkwds = {_find_func(k): v for k,v in kwds.items()}
# Check for duplicate
_dict_update_check_duplicate(sdict, funkwds)

Expand Down

0 comments on commit 38904b6

Please sign in to comment.