From 09cae0a9e5abe1d5836db97ed9854e6e2f9c19f5 Mon Sep 17 00:00:00 2001
From: "John H. Palmieri" <palmieri@math.washington.edu>
Date: Tue, 25 Apr 2017 20:59:59 -0700
Subject: [PATCH] trac 22871 fix some typos and omissions

---
 src/sage/crypto/mq/sbox.py                      | 1 +
 src/sage/monoids/free_abelian_monoid_element.py | 2 +-
 src/sage/monoids/string_monoid_element.py       | 2 +-
 src/sage/schemes/elliptic_curves/constructor.py | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/sage/crypto/mq/sbox.py b/src/sage/crypto/mq/sbox.py
index 2ca7a87ce4b..fe83e4f36ca 100644
--- a/src/sage/crypto/mq/sbox.py
+++ b/src/sage/crypto/mq/sbox.py
@@ -3,6 +3,7 @@
 """
 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 e04b2954834..0c7d859068d 100644
--- a/src/sage/monoids/free_abelian_monoid_element.py
+++ b/src/sage/monoids/free_abelian_monoid_element.py
@@ -78,7 +78,7 @@ def __init__(self, F, x):
         """
         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 503b56f8c00..1173827469d 100644
--- a/src/sage/monoids/string_monoid_element.py
+++ b/src/sage/monoids/string_monoid_element.py
@@ -83,7 +83,7 @@ def __init__(self, S, x, check=True):
         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 c6375ad6329..c2f38de010b 100644
--- a/src/sage/schemes/elliptic_curves/constructor.py
+++ b/src/sage/schemes/elliptic_curves/constructor.py
@@ -421,7 +421,7 @@ def create_key_and_extra_args(self, x=None, y=None, j=None, minimal_twist=True,
 
         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