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

[chapoton]

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.

[chapoton]

New commits:

​3dee3a3

use six integer_types in some isinstance

[git]

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

​038d406

trac 22871 typo

[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)

[git]

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

​0561183

trac 22871 two more uses of integer_types

[git]

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

​8c223ad

trac 22871 typo

[jhpalmieri]

After I made the following changes, doctests passed:

src/sage/crypto/mq/sbox.py

@@ -3 +3 @@
 """
 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

src/sage/monoids/free_abelian_monoid_element.py

@@ -78 +78 @@
         """
         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:

src/sage/monoids/string_monoid_element.py

@@ -83 +83 @@
         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

src/sage/schemes/elliptic_curves/constructor.py

@@ -421 +421 @@
 
         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

[chapoton]

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

[chapoton]

I just found two other places needing corrections

---

New commits:

​7b44396

trac 22871 two more changes with integer_types

[jhpalmieri]

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

[chapoton]

(see the sequel in #22879)

[chapoton]

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.