chore: Upgrade black version and re-run it (#860)

Author: rwhogg

packages/google-cloud-ndb/google/cloud/ndb/_cache.py

@@ -306,7 +306,7 @@ def global_set(key, value, expires=None, read=False):
 
 
 class _GlobalCacheSetBatch(_GlobalCacheBatch):
-    """Batch for global cache set requests. """
+    """Batch for global cache set requests."""
 
     def __init__(self, options):
         self.expires = options.get("expires")
@@ -408,7 +408,7 @@ def global_set_if_not_exists(key, value, expires=None):
 
 
 class _GlobalCacheSetIfNotExistsBatch(_GlobalCacheSetBatch):
-    """Batch for global cache set_if_not_exists requests. """
+    """Batch for global cache set_if_not_exists requests."""
 
     def add(self, key, value):
         """Add a key, value pair to store in the cache.
@@ -507,7 +507,7 @@ def _global_watch(key, value):
 
 
 class _GlobalCacheWatchBatch(_GlobalCacheSetBatch):
-    """Batch for global cache watch requests. """
+    """Batch for global cache watch requests."""
 
     def make_call(self):
         """Call :method:`GlobalCache.watch`."""
@@ -537,7 +537,7 @@ def global_unwatch(key):
 
 
 class _GlobalCacheUnwatchBatch(_GlobalCacheDeleteBatch):
-    """Batch for global cache unwatch requests. """
+    """Batch for global cache unwatch requests."""
 
     def make_call(self):
         """Call :method:`GlobalCache.unwatch`."""
@@ -574,7 +574,7 @@ def _global_compare_and_swap(key, value, expires=None):
 
 
 class _GlobalCacheCompareAndSwapBatch(_GlobalCacheSetBatch):
-    """Batch for global cache compare and swap requests. """
+    """Batch for global cache compare and swap requests."""
 
     def make_call(self):
         """Call :method:`GlobalCache.compare_and_swap`."""

packages/google-cloud-ndb/google/cloud/ndb/_datastore_query.py

@@ -767,11 +767,11 @@ def __init__(self, result_type, result_pb, order_by=None):
         self.cursor = Cursor(result_pb.cursor)
 
     def __lt__(self, other):
-        """For total ordering. """
+        """For total ordering."""
         return self._compare(other) == -1
 
     def __eq__(self, other):
-        """For total ordering. """
+        """For total ordering."""
         if isinstance(other, _Result) and self.result_pb == other.result_pb:
             return True
 

packages/google-cloud-ndb/google/cloud/ndb/_eventloop.py

@@ -361,13 +361,13 @@ def add_idle(callback, *args, **kwargs):
 
 
 def call_soon(callback, *args, **kwargs):
-    """Calls :method:`EventLoop.call_soon` on current event loop. """
+    """Calls :method:`EventLoop.call_soon` on current event loop."""
     loop = get_event_loop()
     loop.call_soon(callback, *args, **kwargs)
 
 
 def queue_call(delay, callback, *args, **kwargs):
-    """Calls :method:`EventLoop.queue_call` on current event loop. """
+    """Calls :method:`EventLoop.queue_call` on current event loop."""
     loop = get_event_loop()
     loop.queue_call(delay, callback, *args, **kwargs)
 

packages/google-cloud-ndb/noxfile.py

@@ -30,7 +30,7 @@
 MAJOR_INTERPRETERS = "3.8"
 CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute()
 
-BLACK_VERSION = "black==20.8b1"
+BLACK_VERSION = "black==22.3.0"
 
 
 def get_path(*names):

packages/google-cloud-ndb/tests/system/test_query.py

@@ -1605,9 +1605,9 @@ class SomeKind(ndb.Model):
         entity_id,
         **{
             "foo": 1,
-            "bar.one": [u"pish", u"bish"],
-            "bar.two": [u"posh", u"bosh"],
-            "bar.three": [u"pash", u"bash"],
+            "bar.one": ["pish", "bish"],
+            "bar.two": ["posh", "bosh"],
+            "bar.three": ["pash", "bash"],
         }
     )
 
@@ -1617,9 +1617,9 @@ class SomeKind(ndb.Model):
         entity_id,
         **{
             "foo": 2,
-            "bar.one": [u"bish", u"pish"],
-            "bar.two": [u"bosh", u"posh"],
-            "bar.three": [u"bass", u"pass"],
+            "bar.one": ["bish", "pish"],
+            "bar.two": ["bosh", "posh"],
+            "bar.three": ["bass", "pass"],
         }
     )
 
@@ -1629,9 +1629,9 @@ class SomeKind(ndb.Model):
         entity_id,
         **{
             "foo": 3,
-            "bar.one": [u"pish", u"bish"],
-            "bar.two": [u"fosh", u"posh"],
-            "bar.three": [u"fash", u"bash"],
+            "bar.one": ["pish", "bish"],
+            "bar.two": ["fosh", "posh"],
+            "bar.three": ["fash", "bash"],
         }
     )
 
@@ -1640,8 +1640,8 @@ class SomeKind(ndb.Model):
     query = (
         SomeKind.query()
         .filter(
-            SomeKind.bar == OtherKind(one=u"pish", two=u"posh"),
-            SomeKind.bar == OtherKind(two=u"posh", three=u"pash"),
+            SomeKind.bar == OtherKind(one="pish", two="posh"),
+            SomeKind.bar == OtherKind(two="posh", three="pash"),
         )
         .order(SomeKind.foo)
     )
@@ -1668,9 +1668,9 @@ class SomeKind(ndb.Model):
         entity_id,
         **{
             "foo": 1,
-            "b.one": [u"pish", u"bish"],
-            "b.two": [u"posh", u"bosh"],
-            "b.three": [u"pash", u"bash"],
+            "b.one": ["pish", "bish"],
+            "b.two": ["posh", "bosh"],
+            "b.three": ["pash", "bash"],
         }
     )
 
@@ -1680,7 +1680,7 @@ class SomeKind(ndb.Model):
 
     results = query.fetch()
     assert len(results) == 1
-    assert results[0].bar[0].one == u"pish"
+    assert results[0].bar[0].one == "pish"
 
 
 @pytest.mark.usefixtures("client_context")

packages/google-cloud-ndb/tests/unit/test__datastore_query.py

@@ -39,7 +39,7 @@ def test_make_filter():
         op=query_pb2.PropertyFilter.Operator.EQUAL,
         value=entity_pb2.Value(string_value="Harold"),
     )
-    assert _datastore_query.make_filter("harry", "=", u"Harold") == expected
+    assert _datastore_query.make_filter("harry", "=", "Harold") == expected
 
 
 def test_make_composite_and_filter():
@@ -873,11 +873,11 @@ class Test_PostFilterQueryIteratorImpl:
     @staticmethod
     def test_constructor():
         foo = model.StringProperty("foo")
-        query = query_module.QueryOptions(offset=20, limit=10, filters=foo == u"this")
+        query = query_module.QueryOptions(offset=20, limit=10, filters=foo == "this")
         predicate = object()
         iterator = _datastore_query._PostFilterQueryIteratorImpl(query, predicate)
         assert iterator._result_set._query == query_module.QueryOptions(
-            filters=foo == u"this"
+            filters=foo == "this"
         )
         assert iterator._offset == 20
         assert iterator._limit == 10
@@ -1030,11 +1030,11 @@ def test_cursor_after_no_cursor():
     @staticmethod
     def test__more_results_after_limit():
         foo = model.StringProperty("foo")
-        query = query_module.QueryOptions(offset=20, limit=10, filters=foo == u"this")
+        query = query_module.QueryOptions(offset=20, limit=10, filters=foo == "this")
         predicate = object()
         iterator = _datastore_query._PostFilterQueryIteratorImpl(query, predicate)
         assert iterator._result_set._query == query_module.QueryOptions(
-            filters=foo == u"this"
+            filters=foo == "this"
         )
         assert iterator._offset == 20
         assert iterator._limit == 10

packages/google-cloud-ndb/tests/unit/test__legacy_entity_pb.py

@@ -99,7 +99,7 @@ def test_TryMerge_mutable_key_path_not_bytes():
         assert element.has_type()
         assert element.type == "D"
         # Not quite sure how this type could be set from a decoder string
-        element.set_type(u"E")
+        element.set_type("E")
         assert element.type == "E"
 
     @staticmethod

packages/google-cloud-ndb/tests/unit/test_key.py

@@ -52,9 +52,9 @@ def test_constructor_with_unicode():
 
         https://github.com/googleapis/python-ndb/issues/322
         """
-        key = key_module.Key(u"Kind", 42)
+        key = key_module.Key("Kind", 42)
 
-        assert key._key == google.cloud.datastore.Key(u"Kind", 42, project="testing")
+        assert key._key == google.cloud.datastore.Key("Kind", 42, project="testing")
         assert key._reference is None
 
     @staticmethod
@@ -564,7 +564,7 @@ def test_reference_bad_string_id():
     @staticmethod
     @pytest.mark.usefixtures("in_context")
     def test_reference_bad_integer_id():
-        for id_ in (-10, 0, 2 ** 64):
+        for id_ in (-10, 0, 2**64):
             key = key_module.Key("kind", id_, app="app")
             with pytest.raises(ValueError):
                 key.reference()

packages/google-cloud-ndb/tests/unit/test_model.py

@@ -1955,7 +1955,7 @@ def test_repr():
     @staticmethod
     def test__validate():
         prop = model.CompressedTextProperty(name="text")
-        assert prop._validate(u"abc") is None
+        assert prop._validate("abc") is None
 
     @staticmethod
     def test__validate_bad_bytes():
@@ -1979,18 +1979,18 @@ def test__to_base_type():
     def test__to_base_type_converted():
         prop = model.CompressedTextProperty(name="text")
         value = b"\xe2\x98\x83"
-        assert prop._to_base_type(u"\N{snowman}") == value
+        assert prop._to_base_type("\N{snowman}") == value
 
     @staticmethod
     def test__from_base_type():
         prop = model.CompressedTextProperty(name="text")
-        assert prop._from_base_type(u"abc") is None
+        assert prop._from_base_type("abc") is None
 
     @staticmethod
     def test__from_base_type_converted():
         prop = model.CompressedTextProperty(name="text")
         value = b"\xe2\x98\x83"
-        assert prop._from_base_type(value) == u"\N{snowman}"
+        assert prop._from_base_type(value) == "\N{snowman}"
 
     @staticmethod
     def test__from_base_type_cannot_convert():
@@ -2054,24 +2054,24 @@ def test__validate_bad_type():
     @staticmethod
     def test__to_base_type():
         prop = model.TextProperty(name="text")
-        assert prop._to_base_type(u"abc") is None
+        assert prop._to_base_type("abc") is None
 
     @staticmethod
     def test__to_base_type_converted():
         prop = model.TextProperty(name="text")
-        value = u"\N{snowman}"
+        value = "\N{snowman}"
         assert prop._to_base_type(b"\xe2\x98\x83") == value
 
     @staticmethod
     def test__from_base_type():
         prop = model.TextProperty(name="text")
-        assert prop._from_base_type(u"abc") is None
+        assert prop._from_base_type("abc") is None
 
     @staticmethod
     def test__from_base_type_converted():
         prop = model.TextProperty(name="text")
         value = b"\xe2\x98\x83"
-        assert prop._from_base_type(value) == u"\N{snowman}"
+        assert prop._from_base_type(value) == "\N{snowman}"
 
     @staticmethod
     def test__from_base_type_cannot_convert():
@@ -2222,22 +2222,22 @@ def test__validate_incorrect_type():
     @staticmethod
     def test__to_base_type():
         prop = model.JsonProperty(name="json-val")
-        value = [14, [15, 16], {"seventeen": 18}, u"\N{snowman}"]
+        value = [14, [15, 16], {"seventeen": 18}, "\N{snowman}"]
         expected = b'[14,[15,16],{"seventeen":18},"\\u2603"]'
         assert prop._to_base_type(value) == expected
 
     @staticmethod
     def test__from_base_type():
         prop = model.JsonProperty(name="json-val")
         value = b'[14,true,{"a":null,"b":"\\u2603"}]'
-        expected = [14, True, {"a": None, "b": u"\N{snowman}"}]
+        expected = [14, True, {"a": None, "b": "\N{snowman}"}]
         assert prop._from_base_type(value) == expected
 
     @staticmethod
     def test__from_base_type_str():
         prop = model.JsonProperty(name="json-val")
-        value = u'[14,true,{"a":null,"b":"\\u2603"}]'
-        expected = [14, True, {"a": None, "b": u"\N{snowman}"}]
+        value = '[14,true,{"a":null,"b":"\\u2603"}]'
+        expected = [14, True, {"a": None, "b": "\N{snowman}"}]
         assert prop._from_base_type(value) == expected
 
 
@@ -2338,16 +2338,13 @@ def test__from_ds_entity():
 
     @staticmethod
     def test__from_ds_entity_with_user_id():
-        assert (
-            model.User._from_ds_entity(
-                {
-                    "email": "foo@example.com",
-                    "auth_domain": "gmail.com",
-                    "user_id": "12345",
-                }
-            )
-            == model.User("foo@example.com", "gmail.com", "12345")
-        )
+        assert model.User._from_ds_entity(
+            {
+                "email": "foo@example.com",
+                "auth_domain": "gmail.com",
+                "user_id": "12345",
+            }
+        ) == model.User("foo@example.com", "gmail.com", "12345")
 
 
 class TestUserProperty:
@@ -3151,8 +3148,8 @@ class Mine(model.Model):
         mine = Mine(foo="x", bar="y")
         comparison = prop._comparison("=", mine)
         compared = query_module.AND(
-            query_module.FilterNode("baz.bar", "=", u"y"),
-            query_module.FilterNode("baz.foo", "=", u"x"),
+            query_module.FilterNode("baz.bar", "=", "y"),
+            query_module.FilterNode("baz.foo", "=", "x"),
         )
         # Python 2 and 3 order nodes differently, sort them and test each one
         # is in both lists.
@@ -3182,8 +3179,8 @@ class Mine(model.Model):
         conjunction_nodes = sorted(
             conjunction._nodes, key=lambda a: getattr(a, "_name", "z")
         )
-        assert conjunction_nodes[0] == query_module.FilterNode("bar.bar", "=", u"y")
-        assert conjunction_nodes[1] == query_module.FilterNode("bar.foo", "=", u"x")
+        assert conjunction_nodes[0] == query_module.FilterNode("bar.bar", "=", "y")
+        assert conjunction_nodes[1] == query_module.FilterNode("bar.foo", "=", "x")
         assert conjunction_nodes[2].predicate.name == "bar"
         assert sorted(conjunction_nodes[2].predicate.match_keys) == [
             "bar",
@@ -3940,7 +3937,7 @@ def test__validate_indexed_bytes():
     @staticmethod
     def test__validate_indexed_unicode():
         prop = model.GenericProperty(name="generic", indexed=True)
-        assert prop._validate(u"abc") is None
+        assert prop._validate("abc") is None
 
     @staticmethod
     def test__validate_indexed_bad_length():

packages/google-cloud-ndb/tests/unit/test_query.py

@@ -180,7 +180,7 @@ class SubKind(model.Model):
         class SomeKind(model.Model):
             foo = model.StructuredProperty(SubKind, repeated=True)
 
-        match_entity = SubKind(bar=1, baz=u"scoggs")
+        match_entity = SubKind(bar=1, baz="scoggs")
         predicate = query_module.RepeatedStructuredPropertyPredicate(
             "foo", ["bar", "baz"], model._entity_to_protobuf(match_entity)
         )
@@ -191,7 +191,7 @@ class SomeKind(model.Model):
             {
                 "something.else": "whocares",
                 "foo.bar": [2, 1],
-                "foo.baz": [u"matic", u"scoggs"],
+                "foo.baz": ["matic", "scoggs"],
             }
         )