python: backward compatibility

Author: cybergrind

.github/workflows/master.yml

@@ -9,10 +9,10 @@ on:
 jobs:
   run-tests:
     runs-on: ubuntu-latest
-    timeout-minutes: 14
+    timeout-minutes: 10
     steps:
     - uses: actions/checkout@v4
     - uses: astral-sh/setup-uv@v6
-    - run: uv python install 3.9 3.11 3.13
+    - run: uv python install 3.8 3.9 3.11 3.13
     - run: uv run tox
     - run: uv run codecov

aiozk/connection.py

@@ -14,18 +14,17 @@
 version_regex = re.compile(rb'Zookeeper version: (\d+)\.(\d+)\.(\d+)-.*')
 
 # all requests and responses are prefixed with a 32-bit int denoting size
-size_struct = struct.Struct("!i")
+size_struct = struct.Struct('!i')
 # replies are prefixed with an xid, zxid and error code
-reply_header_struct = struct.Struct("!iqi")
+reply_header_struct = struct.Struct('!iqi')
 
 log = logging.getLogger(__name__)
-payload_log = logging.getLogger(__name__ + ".payload")
+payload_log = logging.getLogger(__name__ + '.payload')
 if payload_log.level == logging.NOTSET:
     payload_log.setLevel(logging.INFO)
 
 
 class Connection:
-
     def __init__(self, host, port, watch_handler, read_timeout):
         self.host = host
         self.port = int(port)
@@ -54,27 +53,31 @@ async def _make_handshake(self):
         self.host_ip = self.writer.transport.get_extra_info('peername')[0]
 
         log.debug("Sending 'srvr' command to %s:%d", self.host, self.port)
-        self.writer.write(b"srvr")
+        self.writer.write(b'srvr')
 
         answer = await self.reader.read()
 
-        version_line = answer.split(b"\n")[0]
+        version_line = answer.split(b'\n')[0]
         match = version_regex.match(version_line)
         if match is None:
             raise ConnectionError
         self.version_info = tuple(map(int, match.groups()))
-        self.start_read_only = bool(b"READ_ONLY" in answer)
+        self.start_read_only = bool(b'READ_ONLY' in answer)
 
-        log.debug("Version info: %s", self.version_info)
-        log.debug("Read-only mode: %s", self.start_read_only)
+        log.debug('Version info: %s', self.version_info)
+        log.debug('Read-only mode: %s', self.start_read_only)
 
-        log.debug("Actual connection to server %s:%d", self.host, self.port)
+        log.debug('Actual connection to server %s:%d', self.host, self.port)
 
     async def connect(self):
-        log.debug("Initial connection to server %s:%d", self.host, self.port)
+        log.debug('Initial connection to server %s:%d', self.host, self.port)
 
-        async with asyncio.timeout(self.read_timeout):
-            self.reader, self.writer = await asyncio.open_connection(self.host, self.port)
+        try:
+            self.reader, self.writer = await asyncio.wait_for(
+                asyncio.open_connection(self.host, self.port), timeout=self.read_timeout
+            )
+        except asyncio.TimeoutError:
+            raise TimeoutError(f'Connection to {self.host}:{self.port} timed out after {self.read_timeout} seconds')
 
         try:
             await self._make_handshake()
@@ -85,7 +88,7 @@ async def connect(self):
 
     async def send_connect(self, request):
         # meant to be used before the read_loop starts
-        payload_log.debug("[SEND] (initial) %s", request)
+        payload_log.debug('[SEND] (initial) %s', request)
 
         payload = request.serialize()
         payload = size_struct.pack(len(payload)) + payload
@@ -95,10 +98,10 @@ async def send_connect(self, request):
         try:
             _, zxid, response = await self.read_response(initial_connect=True)
         except Exception:
-            log.exception("Error reading connect response.")
+            log.exception('Error reading connect response.')
             return
 
-        payload_log.debug("[RECV] (initial) %s", response)
+        payload_log.debug('[RECV] (initial) %s', response)
         return zxid, response
 
     def start_read_loop(self):
@@ -115,7 +118,7 @@ def send(self, request, xid=None):
         if request.special_xid:
             xid = request.special_xid
 
-        payload_log.debug("[SEND] (xid: %s) %s", xid, request)
+        payload_log.debug('[SEND] (xid: %s) %s', xid, request)
 
         payload = request.serialize(xid)
         payload = size_struct.pack(len(payload)) + payload
@@ -136,8 +139,7 @@ def send(self, request, xid=None):
         return f
 
     def pending_count(self):
-        return (sum(len(futs) for futs in self.pending_specials.values()) +
-                len(self.pending))
+        return sum(len(futs) for futs in self.pending_specials.values()) + len(self.pending)
 
     async def read_loop(self):
         """
@@ -155,11 +157,11 @@ async def read_loop(self):
             except (ConnectionAbortedError, asyncio.CancelledError):
                 return
             except Exception as e:
-                log.exception("Error reading response.")
+                log.exception('Error reading response.')
                 self.abort()
                 return
 
-            payload_log.debug("[RECV] (xid: %s) %s", xid, response)
+            payload_log.debug('[RECV] (xid: %s) %s', xid, response)
 
             if xid == protocol.WATCH_XID:
                 self.watch_handler(response)
@@ -182,8 +184,7 @@ async def _read(self, size=-1):
         while remaining_size and (time() < end_time):
             remaining_time = end_time - time()
             try:
-                chunk = await asyncio.wait_for(self.reader.read(remaining_size),
-                                               timeout=remaining_time)
+                chunk = await asyncio.wait_for(self.reader.read(remaining_size), timeout=remaining_time)
             except asyncio.TimeoutError:
                 continue
             payload.append(chunk)
@@ -233,7 +234,7 @@ def abort(self, exception=exc.ConnectError):
         the given ``exception`` parameter is used (defaults to
         ``ConnectError``).
         """
-        log.warning("Aborting connection to %s:%s", self.host, self.port)
+        log.warning('Aborting connection to %s:%s', self.host, self.port)
 
         def abort_pending(f):
             exc_info = sys.exc_info()
@@ -272,8 +273,7 @@ async def close(self, timeout):
 
         try:
             if self.pending_count() > 0:
-                log.warning('Pendings: {}; specials: {}'.format(
-                    self.pending, self.pending_specials))
+                log.warning('Pendings: {}; specials: {}'.format(self.pending, self.pending_specials))
                 self.abort(exception=exc.TimeoutError)
         except asyncio.TimeoutError:
             log.warning('ABORT Timeout')

pyproject.toml

@@ -10,7 +10,7 @@ maintainers = [
 ]
 license = { text = 'MIT' }
 readme = 'README.md'
-requires-python = '>=3.9'
+requires-python = '>=3.8'
 keywords = ['zookeeper', 'asyncio', 'async']
 classifiers = [
     'Development Status :: 3 - Alpha',
@@ -23,7 +23,6 @@ classifiers = [
     'Operating System :: Unix',
     'Programming Language :: Python',
     'Programming Language :: Python :: 3',
-    'Programming Language :: Python :: 3.7',
     'Programming Language :: Python :: 3.8',
     'Programming Language :: Python :: 3.9',
     'Programming Language :: Python :: 3.10',
@@ -55,7 +54,7 @@ Repository = 'http://github.com/micro-fan/aiozk'
 [dependency-groups]
 dev = [
     'ruff',
-    'pre-commit>=4.1.0',
+    "pre-commit",
     'uv>=0.6.1',
     'coverage',
     'flake8',

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 #envlist = py{38,39}-django{22,31} #,mypy
-envlist = py3.13,py3.11,py3.9
+envlist = py3.13,py3.11,py3.9,py3.8
 
 [docker:zk]
 image = zookeeper