address comments

googleapis · Mar 12, 2020 · d504e8b · d504e8b
1 parent c86f1ad
commit d504e8b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/google/cloud/spanner_v1/client.py b/google/cloud/spanner_v1/client.py
@@ -63,7 +63,7 @@
     "without a scheme: ex %s=localhost:8080."
 ) % ((EMULATOR_ENV_VAR,) * 3)
 SPANNER_ADMIN_SCOPE = "https://www.googleapis.com/auth/spanner.admin"
-OPTIMIZER_VERSION_VAR = "SPANNER_OPTIMIZER_VERSION"
+OPTIMIZER_VERSION_ENV_VAR = "SPANNER_OPTIMIZER_VERSION"
 _USER_AGENT_DEPRECATED = (
     "The 'user_agent' argument to 'Client' is deprecated / unused. "
     "Please pass an appropriate 'client_info' instead."
@@ -75,7 +75,7 @@ def _get_spanner_emulator_host():
 
 
 def _get_spanner_optimizer_version():
-    return os.getenv(OPTIMIZER_VERSION_VAR, "")
+    return os.getenv(OPTIMIZER_VERSION_ENV_VAR, "")
 
 
 class InstanceConfig(object):

diff --git a/google/cloud/spanner_v1/database.py b/google/cloud/spanner_v1/database.py
@@ -372,7 +372,7 @@ def execute_partitioned_dml(
 
         :type query_options:
             :class:`google.cloud.spanner_v1.proto.ExecuteSqlRequest.QueryOptions`
-                or :class:`dict`
+            or :class:`dict`
         :param query_options:
                 (Optional) Query optimizer configuration to use for the given query.
                 If a dict is provided, it must be of the same form as the protobuf
@@ -803,7 +803,7 @@ def generate_query_batches(
 
         :type query_options:
             :class:`google.cloud.spanner_v1.proto.ExecuteSqlRequest.QueryOptions`
-                or :class:`dict`
+            or :class:`dict`
         :param query_options:
                 (Optional) Query optimizer configuration to use for the given query.
                 If a dict is provided, it must be of the same form as the protobuf

diff --git a/google/cloud/spanner_v1/session.py b/google/cloud/spanner_v1/session.py
@@ -228,6 +228,7 @@ def execute_sql(
 
         :type query_options:
             :class:`google.cloud.spanner_v1.proto.ExecuteSqlRequest.QueryOptions`
+            or :class:`dict`
         :param query_options: (Optional) Options that are provided for query plan stability.
 
         :rtype: :class:`~google.cloud.spanner_v1.streamed.StreamedResultSet`

diff --git a/google/cloud/spanner_v1/transaction.py b/google/cloud/spanner_v1/transaction.py
@@ -189,6 +189,7 @@ def execute_update(
 
         :type query_options:
             :class:`google.cloud.spanner_v1.proto.ExecuteSqlRequest.QueryOptions`
+            or :class:`dict`
         :param query_options: (Optional) Options that are provided for query plan stability.
 
         :rtype: int