Skip to content
This repository was archived by the owner on Mar 31, 2026. It is now read-only.

Commit f43cbd2

Browse files
asthamohtaasthamohta
authored
Merge branch 'main' into change-region
2 parents a518d2b + 828df62 commit f43cbd2

File tree

7 files changed

+51
-56
lines changed

7 files changed

+51
-56
lines changed

‎.github/.OwlBot.lock.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
docker:
22
image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
3-
digest: sha256:39ad8c0570e4f5d2d3124a509de4fe975e799e2b97e0f58aed88f8880d5a8b60
3+
digest: sha256:0e18b9475fbeb12d9ad4302283171edebb6baf2dfca1bd215ee3b34ed79d95d7

‎.github/CODEOWNERS‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
#
44
# For syntax help see:
55
# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
6+
# Note: This file is autogenerated. To make changes to the codeowner team, please update .repo-metadata.json.
67

8+
# @googleapis/yoshi-python @googleapis/api-spanner-python are the default owners for changes in this repo
9+
* @googleapis/yoshi-python @googleapis/api-spanner-python
710

8-
# The api-spanner-python team is the default owner for anything not
9-
# explicitly taken by someone else.
10-
* @googleapis/api-spanner-python @googleapis/yoshi-python
11-
/samples/ @googleapis/api-spanner-python @googleapis/python-samples-owners
11+
# @googleapis/python-samples-owners @googleapis/api-spanner-python are the default owners for samples changes
12+
/samples/ @googleapis/python-samples-owners @googleapis/api-spanner-python

‎google/cloud/spanner_v1/_helpers.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
import math
2020
import json
2121

22-
import six
23-
2422
from google.protobuf.struct_pb2 import ListValue
2523
from google.protobuf.struct_pb2 import Value
2624

@@ -140,7 +138,7 @@ def _make_value_pb(value):
140138
return Value(list_value=_make_list_value_pb(value))
141139
if isinstance(value, bool):
142140
return Value(bool_value=value)
143-
if isinstance(value, six.integer_types):
141+
if isinstance(value, int):
144142
return Value(string_value=str(value))
145143
if isinstance(value, float):
146144
if math.isnan(value):
@@ -157,10 +155,10 @@ def _make_value_pb(value):
157155
return Value(string_value=_datetime_to_rfc3339(value, ignore_zone=False))
158156
if isinstance(value, datetime.date):
159157
return Value(string_value=value.isoformat())
160-
if isinstance(value, six.binary_type):
158+
if isinstance(value, bytes):
161159
value = _try_to_coerce_bytes(value)
162160
return Value(string_value=value)
163-
if isinstance(value, six.text_type):
161+
if isinstance(value, str):
164162
return Value(string_value=value)
165163
if isinstance(value, ListValue):
166164
return Value(list_value=value)

‎google/cloud/spanner_v1/database.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
from google.cloud.exceptions import NotFound
2828
from google.api_core.exceptions import Aborted
2929
from google.api_core import gapic_v1
30-
import six
3130

3231
from google.cloud.spanner_admin_database_v1 import CreateDatabaseRequest
3332
from google.cloud.spanner_admin_database_v1 import Database as DatabasePB
@@ -1219,7 +1218,7 @@ def _check_ddl_statements(value):
12191218
if elements in ``value`` are not strings, or if ``value`` contains
12201219
a ``CREATE DATABASE`` statement.
12211220
"""
1222-
if not all(isinstance(line, six.string_types) for line in value):
1221+
if not all(isinstance(line, str) for line in value):
12231222
raise ValueError("Pass a list of strings")
12241223

12251224
if any("create database" in line.lower() for line in value):

‎google/cloud/spanner_v1/pool.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
"""Pools managing shared Session objects."""
1616

1717
import datetime
18-
19-
from six.moves import queue
18+
import queue
2019

2120
from google.cloud.exceptions import NotFound
2221
from google.cloud.spanner_v1._helpers import _metadata_with_prefix
@@ -189,7 +188,7 @@ def get(self, timeout=None):
189188
:rtype: :class:`~google.cloud.spanner_v1.session.Session`
190189
:returns: an existing session from the pool, or a newly-created
191190
session.
192-
:raises: :exc:`six.moves.queue.Empty` if the queue is empty.
191+
:raises: :exc:`queue.Empty` if the queue is empty.
193192
"""
194193
if timeout is None:
195194
timeout = self.default_timeout
@@ -210,7 +209,7 @@ def put(self, session):
210209
:type session: :class:`~google.cloud.spanner_v1.session.Session`
211210
:param session: the session being returned.
212211
213-
:raises: :exc:`six.moves.queue.Full` if the queue is full.
212+
:raises: :exc:`queue.Full` if the queue is full.
214213
"""
215214
self._sessions.put_nowait(session)
216215

@@ -383,7 +382,7 @@ def get(self, timeout=None):
383382
:rtype: :class:`~google.cloud.spanner_v1.session.Session`
384383
:returns: an existing session from the pool, or a newly-created
385384
session.
386-
:raises: :exc:`six.moves.queue.Empty` if the queue is empty.
385+
:raises: :exc:`queue.Empty` if the queue is empty.
387386
"""
388387
if timeout is None:
389388
timeout = self.default_timeout
@@ -408,7 +407,7 @@ def put(self, session):
408407
:type session: :class:`~google.cloud.spanner_v1.session.Session`
409408
:param session: the session being returned.
410409
411-
:raises: :exc:`six.moves.queue.Full` if the queue is full.
410+
:raises: :exc:`queue.Full` if the queue is full.
412411
"""
413412
self._sessions.put_nowait((_NOW() + self._delta, session))
414413

@@ -500,7 +499,7 @@ def put(self, session):
500499
:type session: :class:`~google.cloud.spanner_v1.session.Session`
501500
:param session: the session being returned.
502501
503-
:raises: :exc:`six.moves.queue.Full` if the queue is full.
502+
:raises: :exc:`queue.Full` if the queue is full.
504503
"""
505504
if self._sessions.full():
506505
raise queue.Full

‎tests/unit/test__helpers.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,9 @@ def test_w_bool(self):
146146
self.assertEqual(value_pb.bool_value, True)
147147

148148
def test_w_int(self):
149-
import six
150149
from google.protobuf.struct_pb2 import Value
151150

152-
for int_type in six.integer_types: # include 'long' on Python 2
153-
value_pb = self._callFUT(int_type(42))
151+
value_pb = self._callFUT(42)
154152
self.assertIsInstance(value_pb, Value)
155153
self.assertEqual(value_pb.string_value, "42")
156154

‎tests/unit/test_pool.py‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -191,37 +191,37 @@ def test_get_expired(self):
191191
self.assertFalse(pool._sessions.full())
192192

193193
def test_get_empty_default_timeout(self):
194-
from six.moves.queue import Empty
194+
import queue
195195

196196
pool = self._make_one(size=1)
197-
queue = pool._sessions = _Queue()
197+
session_queue = pool._sessions = _Queue()
198198

199-
with self.assertRaises(Empty):
199+
with self.assertRaises(queue.Empty):
200200
pool.get()
201201

202-
self.assertEqual(queue._got, {"block": True, "timeout": 10})
202+
self.assertEqual(session_queue._got, {"block": True, "timeout": 10})
203203

204204
def test_get_empty_explicit_timeout(self):
205-
from six.moves.queue import Empty
205+
import queue
206206

207207
pool = self._make_one(size=1, default_timeout=0.1)
208-
queue = pool._sessions = _Queue()
208+
session_queue = pool._sessions = _Queue()
209209

210-
with self.assertRaises(Empty):
210+
with self.assertRaises(queue.Empty):
211211
pool.get(timeout=1)
212212

213-
self.assertEqual(queue._got, {"block": True, "timeout": 1})
213+
self.assertEqual(session_queue._got, {"block": True, "timeout": 1})
214214

215215
def test_put_full(self):
216-
from six.moves.queue import Full
216+
import queue
217217

218218
pool = self._make_one(size=4)
219219
database = _Database("name")
220220
SESSIONS = [_Session(database)] * 4
221221
database._sessions.extend(SESSIONS)
222222
pool.bind(database)
223223

224-
with self.assertRaises(Full):
224+
with self.assertRaises(queue.Full):
225225
pool.put(_Session(database))
226226

227227
self.assertTrue(pool._sessions.full())
@@ -481,37 +481,37 @@ def test_get_hit_w_ping_expired(self):
481481
self.assertFalse(pool._sessions.full())
482482

483483
def test_get_empty_default_timeout(self):
484-
from six.moves.queue import Empty
484+
import queue
485485

486486
pool = self._make_one(size=1)
487-
queue = pool._sessions = _Queue()
487+
session_queue = pool._sessions = _Queue()
488488

489-
with self.assertRaises(Empty):
489+
with self.assertRaises(queue.Empty):
490490
pool.get()
491491

492-
self.assertEqual(queue._got, {"block": True, "timeout": 10})
492+
self.assertEqual(session_queue._got, {"block": True, "timeout": 10})
493493

494494
def test_get_empty_explicit_timeout(self):
495-
from six.moves.queue import Empty
495+
import queue
496496

497497
pool = self._make_one(size=1, default_timeout=0.1)
498-
queue = pool._sessions = _Queue()
498+
session_queue = pool._sessions = _Queue()
499499

500-
with self.assertRaises(Empty):
500+
with self.assertRaises(queue.Empty):
501501
pool.get(timeout=1)
502502

503-
self.assertEqual(queue._got, {"block": True, "timeout": 1})
503+
self.assertEqual(session_queue._got, {"block": True, "timeout": 1})
504504

505505
def test_put_full(self):
506-
from six.moves.queue import Full
506+
import queue
507507

508508
pool = self._make_one(size=4)
509509
database = _Database("name")
510510
SESSIONS = [_Session(database)] * 4
511511
database._sessions.extend(SESSIONS)
512512
pool.bind(database)
513513

514-
with self.assertRaises(Full):
514+
with self.assertRaises(queue.Full):
515515
pool.put(_Session(database))
516516

517517
self.assertTrue(pool._sessions.full())
@@ -522,7 +522,7 @@ def test_put_non_full(self):
522522
from google.cloud.spanner_v1 import pool as MUT
523523

524524
pool = self._make_one(size=1)
525-
queue = pool._sessions = _Queue()
525+
session_queue = pool._sessions = _Queue()
526526

527527
now = datetime.datetime.utcnow()
528528
database = _Database("name")
@@ -531,8 +531,8 @@ def test_put_non_full(self):
531531
with _Monkey(MUT, _NOW=lambda: now):
532532
pool.put(session)
533533

534-
self.assertEqual(len(queue._items), 1)
535-
ping_after, queued = queue._items[0]
534+
self.assertEqual(len(session_queue._items), 1)
535+
ping_after, queued = session_queue._items[0]
536536
self.assertEqual(ping_after, now + datetime.timedelta(seconds=3000))
537537
self.assertIs(queued, session)
538538

@@ -690,39 +690,39 @@ def test_bind_w_timestamp_race(self):
690690
self.assertTrue(pool._pending_sessions.empty())
691691

692692
def test_put_full(self):
693-
from six.moves.queue import Full
693+
import queue
694694

695695
pool = self._make_one(size=4)
696696
database = _Database("name")
697697
SESSIONS = [_Session(database) for _ in range(4)]
698698
database._sessions.extend(SESSIONS)
699699
pool.bind(database)
700700

701-
with self.assertRaises(Full):
701+
with self.assertRaises(queue.Full):
702702
pool.put(_Session(database))
703703

704704
self.assertTrue(pool._sessions.full())
705705

706706
def test_put_non_full_w_active_txn(self):
707707
pool = self._make_one(size=1)
708-
queue = pool._sessions = _Queue()
708+
session_queue = pool._sessions = _Queue()
709709
pending = pool._pending_sessions = _Queue()
710710
database = _Database("name")
711711
session = _Session(database)
712712
txn = session.transaction()
713713

714714
pool.put(session)
715715

716-
self.assertEqual(len(queue._items), 1)
717-
_, queued = queue._items[0]
716+
self.assertEqual(len(session_queue._items), 1)
717+
_, queued = session_queue._items[0]
718718
self.assertIs(queued, session)
719719

720720
self.assertEqual(len(pending._items), 0)
721721
txn.begin.assert_not_called()
722722

723723
def test_put_non_full_w_committed_txn(self):
724724
pool = self._make_one(size=1)
725-
queue = pool._sessions = _Queue()
725+
session_queue = pool._sessions = _Queue()
726726
pending = pool._pending_sessions = _Queue()
727727
database = _Database("name")
728728
session = _Session(database)
@@ -731,7 +731,7 @@ def test_put_non_full_w_committed_txn(self):
731731

732732
pool.put(session)
733733

734-
self.assertEqual(len(queue._items), 0)
734+
self.assertEqual(len(session_queue._items), 0)
735735

736736
self.assertEqual(len(pending._items), 1)
737737
self.assertIs(pending._items[0], session)
@@ -740,14 +740,14 @@ def test_put_non_full_w_committed_txn(self):
740740

741741
def test_put_non_full(self):
742742
pool = self._make_one(size=1)
743-
queue = pool._sessions = _Queue()
743+
session_queue = pool._sessions = _Queue()
744744
pending = pool._pending_sessions = _Queue()
745745
database = _Database("name")
746746
session = _Session(database)
747747

748748
pool.put(session)
749749

750-
self.assertEqual(len(queue._items), 0)
750+
self.assertEqual(len(session_queue._items), 0)
751751
self.assertEqual(len(pending._items), 1)
752752
self.assertIs(pending._items[0], session)
753753

@@ -924,13 +924,13 @@ def full(self):
924924
return len(self._items) >= self._size
925925

926926
def get(self, **kwargs):
927-
from six.moves.queue import Empty
927+
import queue
928928

929929
self._got = kwargs
930930
try:
931931
return self._items.pop()
932932
except IndexError:
933-
raise Empty()
933+
raise queue.Empty()
934934

935935
def put(self, item, **kwargs):
936936
self._put = kwargs

0 commit comments

Comments
 (0)