Merge branch 'master' into refactor/type_some_recipes

Author: a-ungurianu

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/release.yml

@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Handle the code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Set up Python 3.10
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: "3.10"
 

.github/workflows/testing.yml

@@ -18,15 +18,15 @@ jobs:
 
     steps:
       - name: Handle the code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: "Set up Python 3.10"
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: "3.10"
 
       - name: Handle pip cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements*.txt') }}
@@ -36,7 +36,7 @@ jobs:
       - name: Install required dependencies
         run: |
           python3 -m pip install --upgrade pip
-          pip install tox tox-wheel
+          pip install tox
 
       - name: Code check
         run: tox -e ${TOX_VENV}
@@ -70,23 +70,23 @@ jobs:
             tox-env: pypy3
     steps:
       - name: Handle the code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 
       - name: Handle pip cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements*.txt') }}
           restore-keys: |
             ${{ runner.os }}-pip-
 
       - name: Handle ZK installation cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: zookeeper
           key: ${{ runner.os }}-zookeeper
@@ -110,4 +110,4 @@ jobs:
           ZOOKEEPER_LIB: "${{ !contains(matrix.zk-version, '3.4') && 'lib' || '' }}"
 
       - name: Publish Codecov report
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v3

kazoo/client.py

@@ -8,8 +8,6 @@
 from typing import TYPE_CHECKING
 import warnings
 
-import six
-
 from kazoo.exceptions import (
     AuthFailedError,
     ConfigurationError,
@@ -69,9 +67,6 @@
 if TYPE_CHECKING:
     from typing import Any
 
-string_types = six.string_types
-bytes_types = (six.binary_type,)
-
 CLOSED_STATES = (
     KeeperState.EXPIRED_SESSION,
     KeeperState.AUTH_FAILED,
@@ -417,10 +412,10 @@ def _reset(self):
 
     def _reset_watchers(self):
         watchers = []
-        for child_watchers in six.itervalues(self._child_watchers):
+        for child_watchers in self._child_watchers.values():
             watchers.extend(child_watchers)
 
-        for data_watchers in six.itervalues(self._data_watchers):
+        for data_watchers in self._data_watchers.values():
             watchers.extend(data_watchers)
 
         self._child_watchers = defaultdict(set)
@@ -823,7 +818,7 @@ def _is_valid(version):
         version = _try_fetch()
         if _is_valid(version):
             return version
-        for _i in six.moves.range(0, retries):
+        for _i in range(0, retries):
             version = _try_fetch()
             if _is_valid(version):
                 return version
@@ -856,9 +851,9 @@ def add_auth_async(self, scheme, credential):
         :rtype: :class:`~kazoo.interfaces.IAsyncResult`
 
         """
-        if not isinstance(scheme, string_types):
+        if not isinstance(scheme, str):
             raise TypeError("Invalid type for 'scheme' (string expected)")
-        if not isinstance(credential, string_types):
+        if not isinstance(credential, str):
             raise TypeError("Invalid type for 'credential' (string expected)")
 
         # we need this auth data to re-authenticate on reconnect
@@ -1036,15 +1031,15 @@ def create_async(
         if acl is None and self.default_acl:
             acl = self.default_acl
 
-        if not isinstance(path, string_types):
+        if not isinstance(path, str):
             raise TypeError("Invalid type for 'path' (string expected)")
         if acl and (
             isinstance(acl, ACL) or not isinstance(acl, (tuple, list))
         ):
             raise TypeError(
                 "Invalid type for 'acl' (acl must be a tuple/list" " of ACL's"
             )
-        if value is not None and not isinstance(value, bytes_types):
+        if value is not None and not isinstance(value, bytes):
             raise TypeError("Invalid type for 'value' (must be a byte string)")
         if not isinstance(ephemeral, bool):
             raise TypeError("Invalid type for 'ephemeral' (bool expected)")
@@ -1207,7 +1202,7 @@ def exists_async(self, path, watch=None):
         :rtype: :class:`~kazoo.interfaces.IAsyncResult`
 
         """
-        if not isinstance(path, string_types):
+        if not isinstance(path, str):
             raise TypeError("Invalid type for 'path' (string expected)")
         if watch and not callable(watch):
             raise TypeError("Invalid type for 'watch' (must be a callable)")
@@ -1250,7 +1245,7 @@ def get_async(self, path, watch=None):
         :rtype: :class:`~kazoo.interfaces.IAsyncResult`
 
         """
-        if not isinstance(path, string_types):
+        if not isinstance(path, str):
             raise TypeError("Invalid type for 'path' (string expected)")
         if watch and not callable(watch):
             raise TypeError("Invalid type for 'watch' (must be a callable)")
@@ -1306,7 +1301,7 @@ def get_children_async(self, path, watch=None, include_data=False):
         :rtype: :class:`~kazoo.interfaces.IAsyncResult`
 
         """
-        if not isinstance(path, string_types):
+        if not isinstance(path, str):
             raise TypeError("Invalid type for 'path' (string expected)")
         if watch and not callable(watch):
             raise TypeError("Invalid type for 'watch' (must be a callable)")
@@ -1348,7 +1343,7 @@ def get_acls_async(self, path):
         :rtype: :class:`~kazoo.interfaces.IAsyncResult`
 
         """
-        if not isinstance(path, string_types):
+        if not isinstance(path, str):
             raise TypeError("Invalid type for 'path' (string expected)")
 
         async_result = self.handler.async_result()
@@ -1391,7 +1386,7 @@ def set_acls_async(self, path, acls, version=-1):
         :rtype: :class:`~kazoo.interfaces.IAsyncResult`
 
         """
-        if not isinstance(path, string_types):
+        if not isinstance(path, str):
             raise TypeError("Invalid type for 'path' (string expected)")
         if isinstance(acls, ACL) or not isinstance(acls, (tuple, list)):
             raise TypeError(
@@ -1449,9 +1444,9 @@ def set_async(self, path, value, version=-1):
         :rtype: :class:`~kazoo.interfaces.IAsyncResult`
 
         """
-        if not isinstance(path, string_types):
+        if not isinstance(path, str):
             raise TypeError("Invalid type for 'path' (string expected)")
-        if value is not None and not isinstance(value, bytes_types):
+        if value is not None and not isinstance(value, bytes):
             raise TypeError("Invalid type for 'value' (must be a byte string)")
         if not isinstance(version, int):
             raise TypeError("Invalid type for 'version' (int expected)")
@@ -1525,7 +1520,7 @@ def delete_async(self, path, version=-1):
         :rtype: :class:`~kazoo.interfaces.IAsyncResult`
 
         """
-        if not isinstance(path, string_types):
+        if not isinstance(path, str):
             raise TypeError("Invalid type for 'path' (string expected)")
         if not isinstance(version, int):
             raise TypeError("Invalid type for 'version' (int expected)")
@@ -1634,11 +1629,11 @@ def reconfig_async(self, joining, leaving, new_members, from_config):
         :rtype: :class:`~kazoo.interfaces.IAsyncResult`
 
         """
-        if joining and not isinstance(joining, string_types):
+        if joining and not isinstance(joining, str):
             raise TypeError("Invalid type for 'joining' (string expected)")
-        if leaving and not isinstance(leaving, string_types):
+        if leaving and not isinstance(leaving, str):
             raise TypeError("Invalid type for 'leaving' (string expected)")
-        if new_members and not isinstance(new_members, string_types):
+        if new_members and not isinstance(new_members, str):
             raise TypeError(
                 "Invalid type for 'new_members' (string " "expected)"
             )
@@ -1692,13 +1687,13 @@ def create(
         if acl is None and self.client.default_acl:
             acl = self.client.default_acl
 
-        if not isinstance(path, string_types):
+        if not isinstance(path, str):
             raise TypeError("Invalid type for 'path' (string expected)")
         if acl and not isinstance(acl, (tuple, list)):
             raise TypeError(
                 "Invalid type for 'acl' (acl must be a tuple/list" " of ACL's"
             )
-        if not isinstance(value, bytes_types):
+        if not isinstance(value, bytes):
             raise TypeError("Invalid type for 'value' (must be a byte string)")
         if not isinstance(ephemeral, bool):
             raise TypeError("Invalid type for 'ephemeral' (bool expected)")
@@ -1724,7 +1719,7 @@ def delete(self, path, version=-1):
         `recursive`.
 
         """
-        if not isinstance(path, string_types):
+        if not isinstance(path, str):
             raise TypeError("Invalid type for 'path' (string expected)")
         if not isinstance(version, int):
             raise TypeError("Invalid type for 'version' (int expected)")
@@ -1735,9 +1730,9 @@ def set_data(self, path, value, version=-1):
         arguments as :meth:`KazooClient.set`.
 
         """
-        if not isinstance(path, string_types):
+        if not isinstance(path, str):
             raise TypeError("Invalid type for 'path' (string expected)")
-        if not isinstance(value, bytes_types):
+        if not isinstance(value, bytes):
             raise TypeError("Invalid type for 'value' (must be a byte string)")
         if not isinstance(version, int):
             raise TypeError("Invalid type for 'version' (int expected)")
@@ -1752,7 +1747,7 @@ def check(self, path, version):
         does not match the specified version.
 
         """
-        if not isinstance(path, string_types):
+        if not isinstance(path, str):
             raise TypeError("Invalid type for 'path' (string expected)")
         if not isinstance(version, int):
             raise TypeError("Invalid type for 'version' (int expected)")

kazoo/handlers/eventlet.py

@@ -1,6 +1,7 @@
 """A eventlet based handler."""
 from __future__ import absolute_import
 
+import atexit
 import contextlib
 import logging
 
@@ -12,7 +13,6 @@
 from eventlet import queue as green_queue
 
 from kazoo.handlers import utils
-import kazoo.python2atexit as python2atexit
 from kazoo.handlers.utils import selector_select
 
 LOG = logging.getLogger(__name__)
@@ -140,15 +140,15 @@ def start(self):
             w = eventlet.spawn(self._process_callback_queue)
             self._workers.append((w, self.callback_queue))
             self._started = True
-            python2atexit.register(self.stop)
+            atexit.register(self.stop)
 
     def stop(self):
         while self._workers:
             w, q = self._workers.pop()
             q.put(_STOP)
             w.wait()
         self._started = False
-        python2atexit.unregister(self.stop)
+        atexit.unregister(self.stop)
 
     def socket(self, *args, **kwargs):
         return utils.create_tcp_socket(green_socket)

kazoo/handlers/gevent.py

@@ -1,6 +1,7 @@
 """A gevent based handler."""
 from __future__ import absolute_import
 
+import atexit
 import logging
 
 import gevent
@@ -13,13 +14,9 @@
 
 from kazoo.handlers.utils import selector_select
 
-try:
-    from gevent.lock import Semaphore, RLock
-except ImportError:
-    from gevent.coros import Semaphore, RLock
+from gevent.lock import Semaphore, RLock
 
 from kazoo.handlers import utils
-from kazoo import python2atexit
 
 _using_libevent = gevent.__version__.startswith("0.")
 
@@ -104,7 +101,7 @@ def start(self):
             for queue in (self.callback_queue,):
                 w = self._create_greenlet_worker(queue)
                 self._workers.append(w)
-            python2atexit.register(self.stop)
+            atexit.register(self.stop)
 
     def stop(self):
         """Stop the greenlet workers and empty all queues."""
@@ -124,7 +121,7 @@ def stop(self):
             # Clear the queues
             self.callback_queue = self.queue_impl()  # pragma: nocover
 
-            python2atexit.unregister(self.stop)
+            atexit.unregister(self.stop)
 
     def select(self, *args, **kwargs):
         return selector_select(