chore: Clean up python 2 legacy

kazoo/client.py

@@ -142,7 +142,7 @@ class KazooRetryParams(TypedDict, total=False):
     interrupt: Callable[[], bool]
 
 
-class KazooClient(object):
+class KazooClient:
     """An Apache Zookeeper Python client supporting alternate callback
     handlers and high-level functionality.
 
@@ -989,7 +989,7 @@ def _try_fetch() -> tuple[int, ...] | None:
                 1
             )
             try:
-                return tuple([int(d) for d in version_digits.split(".")])
+                return tuple(int(d) for d in version_digits.split("."))
             except ValueError:
                 return None
 
@@ -1966,7 +1966,7 @@ def reconfig_async(
         return async_result
 
 
-class TransactionRequest(object):
+class TransactionRequest:
     """A Zookeeper Transaction Request
 
     A Transaction provides a builder object that can be used to

kazoo/handlers/eventlet.py

@@ -1,7 +1,6 @@
 """A eventlet based handler."""
 
 from __future__ import annotations
-from __future__ import absolute_import
 
 import atexit
 import contextlib
@@ -59,15 +58,15 @@ class AsyncResult(utils.AsyncResult):
     """A one-time event that stores a value or an exception"""
 
     def __init__(self, handler: IHandler):
-        super(AsyncResult, self).__init__(
+        super().__init__(
             handler,
             green_threading.Condition,  # type: ignore[attr-defined]
             TimeoutError,
         )
 
 
 # FIXME This should inherit from IHandler
-class SequentialEventletHandler(object):
+class SequentialEventletHandler:
     """Eventlet handler for sequentially executing callbacks.
 
     This handler executes callbacks in a sequential manner. A queue is

kazoo/handlers/gevent.py

@@ -1,7 +1,6 @@
 """A gevent based handler."""
 
 from __future__ import annotations
-from __future__ import absolute_import
 
 import atexit
 import logging
@@ -47,7 +46,7 @@
 # CallbackQueue = gevent.queue.Queue[Callable[..., None]]
 
 
-class SequentialGeventHandler(object):
+class SequentialGeventHandler:
     """Gevent handler for sequentially executing callbacks.
 
     This handler executes callbacks in a sequential manner. A queue is

kazoo/handlers/threading.py

@@ -12,7 +12,6 @@
 """
 
 from __future__ import annotations
-from __future__ import absolute_import
 
 import atexit
 import logging
@@ -71,9 +70,7 @@ class AsyncResult(utils.AsyncResult):
     """A one-time event that stores a value or an exception"""
 
     def __init__(self, handler: Any) -> None:
-        super(AsyncResult, self).__init__(
-            handler, threading.Condition, KazooTimeoutError
-        )
+        super().__init__(handler, threading.Condition, KazooTimeoutError)
 
 
 class SequentialThreadingHandler(IHandler):

kazoo/handlers/utils.py

@@ -305,21 +305,11 @@ def create_tcp_connection(
                 # otherwise there is no timeout set and we'll call it as such
                 sock = module.create_connection(address, timeout_at)
                 break
-            except Exception as ex:
-                # FIXME The check for ex[0] is for compatibility with python 2
-                # and should be removed. Instead we should just catch
-                # InterruptedError and continue. Even this is unnecessary, at
-                # least for 'socket', since PEP475 was adopted in python 3.5
-                # but I'm not entirely sure about the gevent and eventlet
-                # libraries.
-                errnum = (
-                    ex.errno
-                    if isinstance(ex, OSError)
-                    else ex[0]  # type: ignore
-                )
-                if errnum == errno.EINTR:
-                    continue
-                raise
+            except InterruptedError:
+                # Retry on an interrupted connect attempt. This is a
+                # standard Python 3 socket behavior and is enough for the
+                # supported Python versions in this project.
+                continue
 
     if sock is None:
         raise module.error

kazoo/protocol/connection.py

@@ -102,7 +102,7 @@ def buffer(obj: Buffer, offset: int = 0) -> memoryview:
     return memoryview(obj)[offset:]
 
 
-class RWPinger(object):
+class RWPinger:
     """A Read/Write Server Pinger Iterable
 
     This object is initialized with the hosts iterator object and the
@@ -180,7 +180,7 @@ class RWServerAvailable(Exception):
 ReturnValue = TypeVar("ReturnValue")
 
 
-class ConnectionHandler(object):
+class ConnectionHandler:
     """Zookeeper connection handler"""
 
     def __init__(

kazoo/recipe/barrier.py

@@ -19,7 +19,7 @@
     from kazoo.client import KazooClient
 
 
-class Barrier(object):
+class Barrier:
     """Kazoo Barrier
 
     Implements a barrier to block processing of a set of nodes until
@@ -83,7 +83,7 @@ def wait_for_clear(event: WatchedEvent) -> None:
         return cleared.is_set()
 
 
-class DoubleBarrier(object):
+class DoubleBarrier:
     """Kazoo Double Barrier
 
     Double barriers are used to synchronize the beginning and end of

kazoo/recipe/cache.py

@@ -12,7 +12,6 @@
 """
 
 from __future__ import annotations
-from __future__ import absolute_import
 
 import contextlib
 import functools
@@ -46,7 +45,7 @@
 ReturnValue = TypeVar("ReturnValue")
 
 
-class TreeCache(object):
+class TreeCache:
     """The cache of a ZooKeeper subtree.
 
     :param client: A :class:`~kazoo.client.KazooClient` instance.
@@ -274,7 +273,7 @@ def __call__(self, path: str, watch: WatchFunc | None) -> IAsyncResult:
         ...
 
 
-class TreeNode(object):
+class TreeNode:
     """The tree node record.
 
     :param tree: A :class:`~kazoo.recipe.cache.TreeCache` instance.

kazoo/recipe/counter.py

@@ -20,7 +20,7 @@
 Number = Union[int, float]
 
 
-class Counter(object):
+class Counter:
     """Kazoo Counter
 
     A shared counter of either int or float values. Changes to the

kazoo/recipe/election.py

@@ -18,7 +18,7 @@
 GenericArgs = ParamSpec("GenericArgs")
 
 
-class Election(object):
+class Election:
     """Kazoo Basic Leader Election
 
     Example usage with a :class:`~kazoo.client.KazooClient` instance::

kazoo/recipe/lease.py

@@ -25,7 +25,7 @@ class Lease(TypedDict):
     end: str
 
 
-class NonBlockingLease(object):
+class NonBlockingLease:
     """Exclusive lease that does not block.
 
     An exclusive lease ensures that only one client at a time owns the lease.
@@ -133,7 +133,7 @@ def __bool__(self) -> bool:
         return self.obtained
 
 
-class MultiNonBlockingLease(object):
+class MultiNonBlockingLease:
     """Exclusive lease for multiple clients.
 
     This type of lease is useful when a limited set of hosts should run a

kazoo/recipe/lock.py

@@ -45,7 +45,7 @@
     from kazoo.client import KazooClient
 
 
-class _Watch(object):
+class _Watch:
     def __init__(self, duration: float | None = None):
         self.duration = duration
         self.started_at: float | None = None
@@ -70,7 +70,7 @@ def leftover(self) -> float | None:
             return max(0, self.duration - elapsed)
 
 
-class Lock(object):
+class Lock:
     """Kazoo Lock
 
     Example usage with a :class:`~kazoo.client.KazooClient` instance:
@@ -503,7 +503,7 @@ class ReadLock(Lock):
     _EXCLUDE_NAMES = ["__lock__"]
 
 
-class Semaphore(object):
+class Semaphore:
     """A Zookeeper-based Semaphore
 
     This synchronization primitive operates in the same manner as the

kazoo/recipe/party.py

@@ -19,7 +19,7 @@
     from kazoo.client import KazooClient
 
 
-class BaseParty(object):
+class BaseParty:
     """Base implementation of a party."""
 
     def __init__(

kazoo/recipe/queue.py

@@ -23,7 +23,7 @@
     from kazoo.client import KazooClient
 
 
-class BaseQueue(object):
+class BaseQueue:
     """A common base class for queue implementations."""
 
     def __init__(self, client: KazooClient, path: str):
@@ -74,12 +74,12 @@ def __init__(self, client: KazooClient, path: str):
         :param client: A :class:`~kazoo.client.KazooClient` instance.
         :param path: The queue path to use in ZooKeeper.
         """
-        super(Queue, self).__init__(client, path)
+        super().__init__(client, path)
         self._children: list[str] = []
 
     def __len__(self) -> int:
         """Return queue size."""
-        return super(Queue, self).__len__()
+        return super().__len__()
 
     def get(self) -> bytes | None:
         """
@@ -162,7 +162,7 @@ def __init__(self, client: KazooClient, path: str):
         :param client: A :class:`~kazoo.client.KazooClient` instance.
         :param path: The queue path to use in ZooKeeper.
         """
-        super(LockingQueue, self).__init__(client, path)
+        super().__init__(client, path)
         self.id = uuid.uuid4().hex.encode()
         self.processing_element: tuple[str, bytes] | None = None
         self._lock_path = self.path + self.lock
@@ -174,7 +174,7 @@ def __len__(self) -> int:
 
         :returns: queue size (includes locked entries count).
         """
-        return super(LockingQueue, self).__len__()
+        return super().__len__()
 
     def put(self, value: bytes, priority: int = 100) -> None:
         """Put an entry into the queue.

kazoo/recipe/watchers.py

@@ -66,7 +66,7 @@ def wrapper(*args: GenericArgs.args, **kwargs: GenericArgs.kwargs) -> None:
 ]
 
 
-class DataWatch(object):
+class DataWatch:
     """Watches a node for data updates and calls the specified
     function each time it changes
 
@@ -302,7 +302,7 @@ def _session_watcher(self, state: KazooState) -> None:
 ]
 
 
-class ChildrenWatch(object):
+class ChildrenWatch:
     """Watches a node for children updates and calls the specified
     function each time it changes
 
@@ -465,7 +465,7 @@ def _session_watcher(self, state: KazooState) -> None:
             self._client.handler.spawn(self._get_children)
 
 
-class PatientChildrenWatch(object):
+class PatientChildrenWatch:
     """Patient Children Watch that returns values after the children
     of a node don't change for a period of time
 

kazoo/retry.py

@@ -31,7 +31,7 @@ class InterruptedError(RetryFailedError):
     function"""
 
 
-class KazooRetry(object):
+class KazooRetry:
     """Helper for retrying a method in the face of retry-able
     exceptions"""
 

kazoo/security.py

@@ -51,7 +51,7 @@ def __repr__(self) -> str:
         )
 
 
-class Permissions(object):
+class Permissions:
     READ = 1
     WRITE = 2
     CREATE = 4

kazoo/testing/common.py

@@ -80,7 +80,7 @@ def to_java_compatible_path(path: str) -> str:
 )
 
 
-class ManagedZooKeeper(object):
+class ManagedZooKeeper:
     """Class to manage the running of a ZooKeeper instance for testing.
 
     Note: no attempt is made to probe the ZooKeeper instance is
@@ -350,13 +350,13 @@ def destroy(self) -> None:
     def get_logs(self, num_lines: int = 100) -> list[str]:
         log_path = pathlib.Path(self.working_path, "zookeeper.log")
         if log_path.exists():
-            log_file = log_path.open("r")
-            lines = log_file.readlines()
+            with log_path.open("r") as log_file:
+                lines = log_file.readlines()
             return lines[-num_lines:]
         return []
 
 
-class ZookeeperCluster(object):
+class ZookeeperCluster:
     def __init__(
         self,
         install_path: str,

kazoo/testing/harness.py

@@ -67,7 +67,7 @@ def get_global_cluster() -> ZookeeperCluster:
     if "-" in ZK_VERSION_STR:
         # Ignore pre-release markers like -alpha
         ZK_VERSION_STR = ZK_VERSION_STR.split("-")[0]
-    ZK_VERSION = tuple([int(n) for n in ZK_VERSION_STR.split(".")])
+    ZK_VERSION = tuple(int(n) for n in ZK_VERSION_STR.split("."))
     ZK_OBSERVER_START_ID = int(  # type: ignore[call-overload]
         cluster_conf.get("ZOOKEEPER_OBSERVER_START_ID")
     )
@@ -173,7 +173,7 @@ def test_something_else(self) -> None:
     DEFAULT_CLIENT_TIMEOUT = 15
 
     def __init__(self, *args: Any, **kw: Any):
-        super(KazooTestHarness, self).__init__(*args, **kw)
+        super().__init__(*args, **kw)
         self._client: KazooClient | None = None
         self._clients: list[KazooClient] = []
 

kazoo/tests/test_cache.py

@@ -63,7 +63,7 @@ def choose_an_installed_handler(
 
 class KazooTreeCacheTests(KazooAdaptiveHandlerTestCase):
     def setUp(self) -> None:
-        super(KazooTreeCacheTests, self).setUp()
+        super().setUp()
         self._event_queue: Queue[TreeEvent] = self.client.handler.queue_impl()
         self._error_queue = self.client.handler.queue_impl()
         self._path: str | None = None
@@ -78,7 +78,7 @@ def tearDown(self) -> None:
         if self._cache is not None:
             self._cache.close()
             self._cache = None
-        super(KazooTreeCacheTests, self).tearDown()
+        super().tearDown()
 
     def make_cache(self) -> TreeCache:
         if self._cache is None: