chore: drop six (#587)

google/cloud/spanner_v1/_helpers.py

@@ -19,8 +19,6 @@
 import math
 import json
 
-import six
-
 from google.protobuf.struct_pb2 import ListValue
 from google.protobuf.struct_pb2 import Value
 
@@ -140,7 +138,7 @@ def _make_value_pb(value):
         return Value(list_value=_make_list_value_pb(value))
     if isinstance(value, bool):
         return Value(bool_value=value)
-    if isinstance(value, six.integer_types):
+    if isinstance(value, int):
         return Value(string_value=str(value))
     if isinstance(value, float):
         if math.isnan(value):
@@ -157,10 +155,10 @@ def _make_value_pb(value):
         return Value(string_value=_datetime_to_rfc3339(value, ignore_zone=False))
     if isinstance(value, datetime.date):
         return Value(string_value=value.isoformat())
-    if isinstance(value, six.binary_type):
+    if isinstance(value, bytes):
         value = _try_to_coerce_bytes(value)
         return Value(string_value=value)
-    if isinstance(value, six.text_type):
+    if isinstance(value, str):
         return Value(string_value=value)
     if isinstance(value, ListValue):
         return Value(list_value=value)

google/cloud/spanner_v1/database.py

@@ -27,7 +27,6 @@
 from google.cloud.exceptions import NotFound
 from google.api_core.exceptions import Aborted
 from google.api_core import gapic_v1
-import six
 
 from google.cloud.spanner_admin_database_v1 import CreateDatabaseRequest
 from google.cloud.spanner_admin_database_v1 import Database as DatabasePB
@@ -1219,7 +1218,7 @@ def _check_ddl_statements(value):
         if elements in ``value`` are not strings, or if ``value`` contains
         a ``CREATE DATABASE`` statement.
     """
-    if not all(isinstance(line, six.string_types) for line in value):
+    if not all(isinstance(line, str) for line in value):
         raise ValueError("Pass a list of strings")
 
     if any("create database" in line.lower() for line in value):

google/cloud/spanner_v1/pool.py

@@ -15,8 +15,7 @@
 """Pools managing shared Session objects."""
 
 import datetime
-
-from six.moves import queue
+import queue
 
 from google.cloud.exceptions import NotFound
 from google.cloud.spanner_v1._helpers import _metadata_with_prefix
@@ -189,7 +188,7 @@ def get(self, timeout=None):
         :rtype: :class:`~google.cloud.spanner_v1.session.Session`
         :returns: an existing session from the pool, or a newly-created
                   session.
-        :raises: :exc:`six.moves.queue.Empty` if the queue is empty.
+        :raises: :exc:`queue.Empty` if the queue is empty.
         """
         if timeout is None:
             timeout = self.default_timeout
@@ -210,7 +209,7 @@ def put(self, session):
         :type session: :class:`~google.cloud.spanner_v1.session.Session`
         :param session: the session being returned.
 
-        :raises: :exc:`six.moves.queue.Full` if the queue is full.
+        :raises: :exc:`queue.Full` if the queue is full.
         """
         self._sessions.put_nowait(session)
 
@@ -383,7 +382,7 @@ def get(self, timeout=None):
         :rtype: :class:`~google.cloud.spanner_v1.session.Session`
         :returns: an existing session from the pool, or a newly-created
                   session.
-        :raises: :exc:`six.moves.queue.Empty` if the queue is empty.
+        :raises: :exc:`queue.Empty` if the queue is empty.
         """
         if timeout is None:
             timeout = self.default_timeout
@@ -408,7 +407,7 @@ def put(self, session):
         :type session: :class:`~google.cloud.spanner_v1.session.Session`
         :param session: the session being returned.
 
-        :raises: :exc:`six.moves.queue.Full` if the queue is full.
+        :raises: :exc:`queue.Full` if the queue is full.
         """
         self._sessions.put_nowait((_NOW() + self._delta, session))
 
@@ -500,7 +499,7 @@ def put(self, session):
         :type session: :class:`~google.cloud.spanner_v1.session.Session`
         :param session: the session being returned.
 
-        :raises: :exc:`six.moves.queue.Full` if the queue is full.
+        :raises: :exc:`queue.Full` if the queue is full.
         """
         if self._sessions.full():
             raise queue.Full

tests/unit/test__helpers.py

@@ -146,11 +146,9 @@ def test_w_bool(self):
         self.assertEqual(value_pb.bool_value, True)
 
     def test_w_int(self):
-        import six
         from google.protobuf.struct_pb2 import Value
 
-        for int_type in six.integer_types:  # include 'long' on Python 2
-            value_pb = self._callFUT(int_type(42))
+        value_pb = self._callFUT(42)
         self.assertIsInstance(value_pb, Value)
         self.assertEqual(value_pb.string_value, "42")
 

tests/unit/test_pool.py

@@ -191,37 +191,37 @@ def test_get_expired(self):
         self.assertFalse(pool._sessions.full())
 
     def test_get_empty_default_timeout(self):
-        from six.moves.queue import Empty
+        import queue
 
         pool = self._make_one(size=1)
-        queue = pool._sessions = _Queue()
+        session_queue = pool._sessions = _Queue()
 
-        with self.assertRaises(Empty):
+        with self.assertRaises(queue.Empty):
             pool.get()
 
-        self.assertEqual(queue._got, {"block": True, "timeout": 10})
+        self.assertEqual(session_queue._got, {"block": True, "timeout": 10})
 
     def test_get_empty_explicit_timeout(self):
-        from six.moves.queue import Empty
+        import queue
 
         pool = self._make_one(size=1, default_timeout=0.1)
-        queue = pool._sessions = _Queue()
+        session_queue = pool._sessions = _Queue()
 
-        with self.assertRaises(Empty):
+        with self.assertRaises(queue.Empty):
             pool.get(timeout=1)
 
-        self.assertEqual(queue._got, {"block": True, "timeout": 1})
+        self.assertEqual(session_queue._got, {"block": True, "timeout": 1})
 
     def test_put_full(self):
-        from six.moves.queue import Full
+        import queue
 
         pool = self._make_one(size=4)
         database = _Database("name")
         SESSIONS = [_Session(database)] * 4
         database._sessions.extend(SESSIONS)
         pool.bind(database)
 
-        with self.assertRaises(Full):
+        with self.assertRaises(queue.Full):
             pool.put(_Session(database))
 
         self.assertTrue(pool._sessions.full())
@@ -481,37 +481,37 @@ def test_get_hit_w_ping_expired(self):
         self.assertFalse(pool._sessions.full())
 
     def test_get_empty_default_timeout(self):
-        from six.moves.queue import Empty
+        import queue
 
         pool = self._make_one(size=1)
-        queue = pool._sessions = _Queue()
+        session_queue = pool._sessions = _Queue()
 
-        with self.assertRaises(Empty):
+        with self.assertRaises(queue.Empty):
             pool.get()
 
-        self.assertEqual(queue._got, {"block": True, "timeout": 10})
+        self.assertEqual(session_queue._got, {"block": True, "timeout": 10})
 
     def test_get_empty_explicit_timeout(self):
-        from six.moves.queue import Empty
+        import queue
 
         pool = self._make_one(size=1, default_timeout=0.1)
-        queue = pool._sessions = _Queue()
+        session_queue = pool._sessions = _Queue()
 
-        with self.assertRaises(Empty):
+        with self.assertRaises(queue.Empty):
             pool.get(timeout=1)
 
-        self.assertEqual(queue._got, {"block": True, "timeout": 1})
+        self.assertEqual(session_queue._got, {"block": True, "timeout": 1})
 
     def test_put_full(self):
-        from six.moves.queue import Full
+        import queue
 
         pool = self._make_one(size=4)
         database = _Database("name")
         SESSIONS = [_Session(database)] * 4
         database._sessions.extend(SESSIONS)
         pool.bind(database)
 
-        with self.assertRaises(Full):
+        with self.assertRaises(queue.Full):
             pool.put(_Session(database))
 
         self.assertTrue(pool._sessions.full())
@@ -522,7 +522,7 @@ def test_put_non_full(self):
         from google.cloud.spanner_v1 import pool as MUT
 
         pool = self._make_one(size=1)
-        queue = pool._sessions = _Queue()
+        session_queue = pool._sessions = _Queue()
 
         now = datetime.datetime.utcnow()
         database = _Database("name")
@@ -531,8 +531,8 @@ def test_put_non_full(self):
         with _Monkey(MUT, _NOW=lambda: now):
             pool.put(session)
 
-        self.assertEqual(len(queue._items), 1)
-        ping_after, queued = queue._items[0]
+        self.assertEqual(len(session_queue._items), 1)
+        ping_after, queued = session_queue._items[0]
         self.assertEqual(ping_after, now + datetime.timedelta(seconds=3000))
         self.assertIs(queued, session)
 
@@ -690,39 +690,39 @@ def test_bind_w_timestamp_race(self):
         self.assertTrue(pool._pending_sessions.empty())
 
     def test_put_full(self):
-        from six.moves.queue import Full
+        import queue
 
         pool = self._make_one(size=4)
         database = _Database("name")
         SESSIONS = [_Session(database) for _ in range(4)]
         database._sessions.extend(SESSIONS)
         pool.bind(database)
 
-        with self.assertRaises(Full):
+        with self.assertRaises(queue.Full):
             pool.put(_Session(database))
 
         self.assertTrue(pool._sessions.full())
 
     def test_put_non_full_w_active_txn(self):
         pool = self._make_one(size=1)
-        queue = pool._sessions = _Queue()
+        session_queue = pool._sessions = _Queue()
         pending = pool._pending_sessions = _Queue()
         database = _Database("name")
         session = _Session(database)
         txn = session.transaction()
 
         pool.put(session)
 
-        self.assertEqual(len(queue._items), 1)
-        _, queued = queue._items[0]
+        self.assertEqual(len(session_queue._items), 1)
+        _, queued = session_queue._items[0]
         self.assertIs(queued, session)
 
         self.assertEqual(len(pending._items), 0)
         txn.begin.assert_not_called()
 
     def test_put_non_full_w_committed_txn(self):
         pool = self._make_one(size=1)
-        queue = pool._sessions = _Queue()
+        session_queue = pool._sessions = _Queue()
         pending = pool._pending_sessions = _Queue()
         database = _Database("name")
         session = _Session(database)
@@ -731,7 +731,7 @@ def test_put_non_full_w_committed_txn(self):
 
         pool.put(session)
 
-        self.assertEqual(len(queue._items), 0)
+        self.assertEqual(len(session_queue._items), 0)
 
         self.assertEqual(len(pending._items), 1)
         self.assertIs(pending._items[0], session)
@@ -740,14 +740,14 @@ def test_put_non_full_w_committed_txn(self):
 
     def test_put_non_full(self):
         pool = self._make_one(size=1)
-        queue = pool._sessions = _Queue()
+        session_queue = pool._sessions = _Queue()
         pending = pool._pending_sessions = _Queue()
         database = _Database("name")
         session = _Session(database)
 
         pool.put(session)
 
-        self.assertEqual(len(queue._items), 0)
+        self.assertEqual(len(session_queue._items), 0)
         self.assertEqual(len(pending._items), 1)
         self.assertIs(pending._items[0], session)
 
@@ -924,13 +924,13 @@ def full(self):
         return len(self._items) >= self._size
 
     def get(self, **kwargs):
-        from six.moves.queue import Empty
+        import queue
 
         self._got = kwargs
         try:
             return self._items.pop()
         except IndexError:
-            raise Empty()
+            raise queue.Empty()
 
     def put(self, item, **kwargs):
         self._put = kwargs