fix: use six string_types and integer_types for all isinstance() checks (#323)

cguardia · web-flow · commit 133acf87b2a2 · 2020-02-06T15:19:15.000-06:00
* fix: use six string_types and integer_types for all isinstance() checks.
diff --git a/google/cloud/ndb/_gql.py b/google/cloud/ndb/_gql.py
@@ -1,4 +1,5 @@
 import re
+import six
 
 from google.cloud.ndb import exceptions
 from google.cloud.ndb import query as query_module
@@ -659,7 +660,7 @@ def _args_to_val(self, func, args):
         """
         vals = []
         for arg in args:
-            if isinstance(arg, (int, str)):
+            if isinstance(arg, six.string_types + six.integer_types):
                 val = query_module.Parameter(arg)
             else:
                 val = arg.Get()
diff --git a/google/cloud/ndb/context.py b/google/cloud/ndb/context.py
@@ -17,6 +17,7 @@
 
 import collections
 import contextlib
+import six
 import threading
 
 from google.cloud.ndb import _eventloop
@@ -459,7 +460,7 @@ def set_global_cache_timeout_policy(self, policy):
         if policy is None:
             policy = _default_global_cache_timeout_policy
 
-        elif isinstance(policy, int):
+        elif isinstance(policy, six.integer_types):
             timeout = policy
 
             def policy(key):
diff --git a/google/cloud/ndb/key.py b/google/cloud/ndb/key.py
@@ -1421,7 +1421,7 @@ def _clean_flat_path(flat):
         if isinstance(kind, type):
             kind = kind._get_kind()
             flat[i] = kind
-        if not isinstance(kind, str):
+        if not isinstance(kind, six.string_types):
             raise TypeError(
                 "Key kind must be a string or Model class; "
                 "received {!r}".format(kind)
diff --git a/google/cloud/ndb/model.py b/google/cloud/ndb/model.py
@@ -1061,7 +1061,7 @@ def _verify_name(name):
             TypeError: If the ``name`` is not a string.
             ValueError: If the name contains a ``.``.
         """
-        if not isinstance(name, str):
+        if not isinstance(name, six.string_types):
             raise TypeError("Name {!r} is not a string".format(name))
 
         if "." in name:
@@ -2334,7 +2334,7 @@ def _validate(self, value):
             .BadValueError: If ``value`` is not a :class:`float` or convertible
                 to one.
         """
-        if not isinstance(value, (float, int)):
+        if not isinstance(value, six.integer_types + (float,)):
             raise exceptions.BadValueError(
                 "Expected float, got {!r}".format(value)
             )
@@ -4871,7 +4871,7 @@ def _fix_up_properties(cls):
                 an underscore.
         """
         kind = cls._get_kind()
-        if not isinstance(kind, str):
+        if not isinstance(kind, six.string_types):
             raise KindError(
                 "Class {} defines a ``_get_kind()`` method that returns "
                 "a non-string ({!r})".format(cls.__name__, kind)
@@ -5653,7 +5653,7 @@ def _get_or_insert_async(
             tasklets.Future: Model: The entity that was either just retrieved
                 or created.
         """
-        if not isinstance(name, str):
+        if not isinstance(name, six.string_types):
             raise TypeError(
                 "'name' must be a string; received {!r}".format(name)
             )
diff --git a/google/cloud/ndb/query.py b/google/cloud/ndb/query.py
@@ -308,7 +308,7 @@ class Parameter(ParameterizedThing):
     __slots__ = ("_key",)
 
     def __init__(self, key):
-        if not isinstance(key, (int, str)):
+        if not isinstance(key, six.integer_types + six.string_types):
             raise TypeError(
                 "Parameter key must be an integer or string, not {}".format(
                     key
@@ -1681,7 +1681,7 @@ def _to_property_names(self, properties):
 
         fixed = []
         for prop in properties:
-            if isinstance(prop, str):
+            if isinstance(prop, six.string_types):
                 fixed.append(prop)
             elif isinstance(prop, model.Property):
                 fixed.append(prop._name)
@@ -1704,7 +1704,7 @@ def _to_property_orders(self, order_by):
             elif isinstance(order, model.Property):
                 # use the sign to turn it into a PropertyOrder
                 orders.append(+order)
-            elif isinstance(order, str):
+            elif isinstance(order, six.string_types):
                 name = order
                 reverse = False
                 if order.startswith("-"):
diff --git a/tests/unit/test_key.py b/tests/unit/test_key.py
@@ -49,6 +49,20 @@ def test_constructor_default():
         )
         assert key._reference is None
 
+    @staticmethod
+    @pytest.mark.usefixtures("in_context")
+    def test_constructor_with_unicode():
+        """Regression test for #322.
+
+        https://github.com/googleapis/python-ndb/issues/322
+        """
+        key = key_module.Key(u"Kind", 42)
+
+        assert key._key == google.cloud.datastore.Key(
+            u"Kind", 42, project="testing"
+        )
+        assert key._reference is None
+
     @staticmethod
     @pytest.mark.usefixtures("in_context")
     def test_constructor_with_different_namespace(context):
