fix: fixing merge conflicts

aakashanandg · aakashanandg · commit b4effdc0cea3 · 2025-01-02T15:34:06.000+05:30
diff --git a/google/cloud/spanner_v1/batch.py b/google/cloud/spanner_v1/batch.py
@@ -166,7 +166,7 @@ def commit(
         request_options=None,
         max_commit_delay=None,
         exclude_txn_from_change_streams=False,
-        **kwargs
+        **kwargs,
     ):
         """Commit mutations to the database.
 
diff --git a/google/cloud/spanner_v1/session.py b/google/cloud/spanner_v1/session.py
@@ -15,15 +15,15 @@
 """Wrapper for Cloud Spanner Session objects."""
 
 from functools import total_ordering
-import random
 import time
 from datetime import datetime
 
 from google.api_core.exceptions import Aborted
 from google.api_core.exceptions import GoogleAPICallError
 from google.api_core.exceptions import NotFound
 from google.api_core.gapic_v1 import method
-from google.rpc.error_details_pb2 import RetryInfo
+from google.cloud.spanner_v1._helpers import _delay_until_retry
+from google.cloud.spanner_v1._helpers import _get_retry_delay
 
 from google.cloud.spanner_v1 import ExecuteSqlRequest
 from google.cloud.spanner_v1 import CreateSessionRequest
diff --git a/tests/unit/test_batch.py b/tests/unit/test_batch.py
@@ -703,7 +703,6 @@ def commit(
         from google.api_core.exceptions import Aborted
 
         max_commit_delay = None
-        print("Spanner commit called")
         if type(request).pb(request).HasField("max_commit_delay"):
             max_commit_delay = request.max_commit_delay
 
