From 29da539b94c9c4be7734271b11ea7ecb2c154176 Mon Sep 17 00:00:00 2001
From: dpebot <dpebot@google.com>
Date: Mon, 1 Jul 2019 08:41:44 -0700
Subject: [PATCH] Fixes #8545 by removing typing information for kwargs to not
 conflict with type checkers

---
 core/google/cloud/client.py                    | 1 -
 datastore/google/cloud/datastore/client.py     | 2 --
 datastore/google/cloud/datastore/key.py        | 1 -
 monitoring/google/cloud/monitoring_v3/query.py | 2 --
 spanner/google/cloud/spanner_v1/pool.py        | 2 --
 storage/google/cloud/storage/bucket.py         | 1 -
 6 files changed, 9 deletions(-)

diff --git a/core/google/cloud/client.py b/core/google/cloud/client.py
index b03b541974410..2623d030f00ea 100644
--- a/core/google/cloud/client.py
+++ b/core/google/cloud/client.py
@@ -62,7 +62,6 @@ def from_service_account_json(cls, json_credentials_path, *args, **kwargs):
         :type args: tuple
         :param args: Remaining positional arguments to pass to constructor.
 
-        :type kwargs: dict
         :param kwargs: Remaining keyword arguments to pass to constructor.
 
         :rtype: :class:`_ClientFactoryMixin`
diff --git a/datastore/google/cloud/datastore/client.py b/datastore/google/cloud/datastore/client.py
index e0b034fbc9c72..df9ce33a0bdfd 100644
--- a/datastore/google/cloud/datastore/client.py
+++ b/datastore/google/cloud/datastore/client.py
@@ -560,7 +560,6 @@ def batch(self):
     def transaction(self, **kwargs):
         """Proxy to :class:`google.cloud.datastore.transaction.Transaction`.
 
-        :type kwargs: dict
         :param kwargs: Keyword arguments to be passed in.
         """
         return Transaction(self, **kwargs)
@@ -633,7 +632,6 @@ def do_something(entity):
             >>> query_iter.next_page_token is None
             True
 
-        :type kwargs: dict
         :param kwargs: Parameters for initializing and instance of
                        :class:`~google.cloud.datastore.query.Query`.
 
diff --git a/datastore/google/cloud/datastore/key.py b/datastore/google/cloud/datastore/key.py
index f537e9d0fd696..c988eebd80af0 100644
--- a/datastore/google/cloud/datastore/key.py
+++ b/datastore/google/cloud/datastore/key.py
@@ -92,7 +92,6 @@ class Key(object):
     :param path_args: May represent a partial (odd length) or full (even
                       length) key path.
 
-    :type kwargs: dict
     :param kwargs: Keyword arguments to be passed in.
 
     Accepted keyword arguments are
diff --git a/monitoring/google/cloud/monitoring_v3/query.py b/monitoring/google/cloud/monitoring_v3/query.py
index 5a5d44b578d0f..18ea0573515d9 100644
--- a/monitoring/google/cloud/monitoring_v3/query.py
+++ b/monitoring/google/cloud/monitoring_v3/query.py
@@ -247,7 +247,6 @@ def select_resources(self, *args, **kwargs):
             conjunction. If just one is provided and no keyword arguments
             are provided, it can be a disjunction.
 
-        :type kwargs: dict
         :param kwargs: Label filters to include in the conjunction as
             described above.
 
@@ -309,7 +308,6 @@ def select_metrics(self, *args, **kwargs):
             conjunction. If just one is provided and no keyword arguments
             are provided, it can be a disjunction.
 
-        :type kwargs: dict
         :param kwargs: Label filters to include in the conjunction as
             described above.
 
diff --git a/spanner/google/cloud/spanner_v1/pool.py b/spanner/google/cloud/spanner_v1/pool.py
index 5a7dcaa5562d9..823681fbc8649 100644
--- a/spanner/google/cloud/spanner_v1/pool.py
+++ b/spanner/google/cloud/spanner_v1/pool.py
@@ -112,7 +112,6 @@ def _new_session(self):
     def session(self, **kwargs):
         """Check out a session from the pool.
 
-        :type kwargs: dict
         :param kwargs: (optional) keyword arguments, passed through to
                        the returned checkout.
 
@@ -505,7 +504,6 @@ class SessionCheckout(object):
         :class:`~google.cloud.spanner_v1.session.AbstractSessionPool`
     :param pool: Pool from which to check out a session.
 
-    :type kwargs: dict
     :param kwargs: extra keyword arguments to be passed to :meth:`pool.get`.
     """
 
diff --git a/storage/google/cloud/storage/bucket.py b/storage/google/cloud/storage/bucket.py
index 79755897529ce..1bf63ec11ab81 100644
--- a/storage/google/cloud/storage/bucket.py
+++ b/storage/google/cloud/storage/bucket.py
@@ -684,7 +684,6 @@ def get_blob(
         :param generation: Optional. If present, selects a specific revision of
                            this object.
 
-        :type kwargs: dict
         :param kwargs: Keyword arguments to pass to the
                        :class:`~google.cloud.storage.blob.Blob` constructor.