py3: use six.integer_types (step 1/2)

[fchapoton]

in some calls to isinstance (inside .py files)

part of #16072

There will remain to handle the "rings" and "modular" folders.

Also "src/sage/misc/sage_input.py" will need separate care.

CC: @tscrim @jdemeyer @a-andre @jm58660

Component: python3

Author: Frédéric Chapoton

Branch: 7b44396

Reviewer: John Palmieri

Issue created by migration from https://trac.sagemath.org/ticket/22871

[fchapoton]

Branch: u/chapoton/22871

[fchapoton]

Commit: 3dee3a3

[fchapoton]

New commits:

3dee3a3

use six integer_types in some isinstance

[sagetrac-git]

Changed commit from 3dee3a3 to 038d406

[sagetrac-git]

Branch pushed to git repo; I updated commit sha1. New commits:

038d406

trac 22871 typo

[sagetrac-git]

Branch pushed to git repo; I updated commit sha1. New commits:

088dceb

py3 (trac 22871) more cases of integer_types (outside rings and modular)

[sagetrac-git]

Changed commit from 038d406 to 088dceb

[sagetrac-git]

Changed commit from 088dceb to 0561183

[sagetrac-git]

Branch pushed to git repo; I updated commit sha1. New commits:

0561183

trac 22871 two more uses of integer_types

[sagetrac-git]

Branch pushed to git repo; I updated commit sha1. New commits:

8c223ad

trac 22871 typo

[sagetrac-git]

Changed commit from 0561183 to 8c223ad

[jhpalmieri]

comment:8

After I made the following changes, doctests passed:

diff --git a/src/sage/crypto/mq/sbox.py b/src/sage/crypto/mq/sbox.py
index 2ca7a87ce4..fe83e4f36c 100644
--- a/src/sage/crypto/mq/sbox.py
+++ b/src/sage/crypto/mq/sbox.py
@@ -3,6 +3,7 @@ S-Boxes and Their Algebraic Representations
 """
 from __future__ import print_function, division
 from six.moves import range
+from six import integer_types
 
 from sage.combinat.integer_vector import IntegerVectors
 from sage.crypto.boolean_function import BooleanFunction
diff --git a/src/sage/monoids/free_abelian_monoid_element.py b/src/sage/monoids/free_abelian_monoid_element.py
index e04b295483..0c7d859068 100644
--- a/src/sage/monoids/free_abelian_monoid_element.py
+++ b/src/sage/monoids/free_abelian_monoid_element.py
@@ -78,7 +78,7 @@ class FreeAbelianMonoidElement(MonoidElement):
         """
         MonoidElement.__init__(self, F)
         n = F.ngens()
-        if isinstance(x, integer_types, + (Integer,)) and x == 1:
+        if isinstance(x, integer_types + (Integer,)) and x == 1:
             self._element_vector = tuple([0]*n)
         elif isinstance(x, (list, tuple)):
             if len(x) != n:
diff --git a/src/sage/monoids/string_monoid_element.py b/src/sage/monoids/string_monoid_element.py
index 503b56f8c0..1173827469 100644
--- a/src/sage/monoids/string_monoid_element.py
+++ b/src/sage/monoids/string_monoid_element.py
@@ -83,7 +83,7 @@ class StringMonoidElement(FreeMonoidElement):
         if isinstance(x, list):
             if check:
                 for b in x:
-                    if not isinstance(b, integer_types + (Intger,)):
+                    if not isinstance(b, integer_types + (Integer,)):
                         raise TypeError(
                             "x (= %s) must be a list of integers." % x)
             self._element_list = list(x) # make copy
diff --git a/src/sage/schemes/elliptic_curves/constructor.py b/src/sage/schemes/elliptic_curves/constructor.py
index c6375ad632..c2f38de010 100644
--- a/src/sage/schemes/elliptic_curves/constructor.py
+++ b/src/sage/schemes/elliptic_curves/constructor.py
@@ -421,7 +421,7 @@ class EllipticCurveFactory(UniqueFactory):
 
         if R is None:
             R = Sequence(x).universe()
-            if R in (rings.ZZ, integer_types):
+            if R in (rings.ZZ,) + integer_types:
                 R = rings.QQ
 
         return (R, tuple(R(a) for a in x)), kwds

[jhpalmieri]

Changed branch from u/chapoton/22871 to u/jhpalmieri/22871

[fchapoton]

Changed commit from 8c223ad to 09cae0a

[fchapoton]

comment:10

Thank you. It was all hand-made, I had no time to compile sage, and I was tired..

---

New commits:

09cae0a

trac 22871 fix some typos and omissions

[fchapoton]

comment:11

I just found two other places needing corrections

---

New commits:

7b44396

trac 22871 two more changes with integer_types

[fchapoton]

Changed branch from u/jhpalmieri/22871 to u/chapoton/22871

[fchapoton]

Changed commit from 09cae0a to 7b44396

[jhpalmieri]

Reviewer: John Pamieri

[jhpalmieri]

comment:13

Okay, looks good. I haven't searched to see if this is every instance, but we can fix more on another ticket if necessary.

[fchapoton]

comment:14

(see the sequel in #22879)

[fchapoton]

comment:15

Thanks, John.

After this and #22879, there remains at least

src/sage/arith/misc.py:    if U is ZZ or U is int or U is long:# ZZ.has_coerce_map_from(U):

and

src/sage/rings/number_field/order.py:        return R is ZZ or R is int or R is long

to be done later in another ticket.

[vbraun]

Changed branch from u/chapoton/22871 to 7b44396

[jdemeyer]

Changed commit from 7b44396 to none

[jdemeyer]

Changed reviewer from John Pamieri to John Palmieri