Merge pull request #21 from dapper91/python3.12

- python 3.12 support added.

Author: dapper91

.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.9', '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11', '3.12']
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}

.pre-commit-config.yaml

@@ -25,21 +25,21 @@ repos:
         args:
           - --fix=no
   - repo: https://github.com/asottile/add-trailing-comma
-    rev: v2.4.0
+    rev: v3.1.0
     hooks:
       - id: add-trailing-comma
         stages:
           - commit
   - repo: https://github.com/pre-commit/mirrors-autopep8
-    rev: v2.0.2
+    rev: v2.0.4
     hooks:
       - id: autopep8
         stages:
           - commit
         args:
           - --diff
   - repo: https://github.com/pycqa/flake8
-    rev: 6.0.0
+    rev: 6.1.0
     hooks:
       - id: flake8
   - repo: https://github.com/pycqa/isort
@@ -63,7 +63,7 @@ repos:
           - --multi-line=9
           - --project=generic_connection_pool
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.1.1
+    rev: v1.5.1
     hooks:
       - id: mypy
         stages:

generic_connection_pool/common.py

@@ -6,7 +6,7 @@
 from typing import Dict, Generic, Hashable, Optional, Tuple, TypeVar
 
 from . import exceptions
-from .heap import ExtHeap
+from .rankmap import RankMap
 
 logger = logging.getLogger(__package__)
 
@@ -279,7 +279,7 @@ class BaseEventQueue(Generic[KeyType]):
     """
 
     def __init__(self) -> None:
-        self._queue: ExtHeap[Event[KeyType]] = ExtHeap()
+        self._queue: RankMap[Event[KeyType]] = RankMap()
 
     def _insert(self, timestamp: float, key: KeyType) -> None:
         """

generic_connection_pool/contrib/unix.py

@@ -27,9 +27,7 @@ class CheckSocketAlivenessMixin(Generic[EndpointT]):
 
     def check_aliveness(self, endpoint: EndpointT, conn: socket.socket, timeout: Optional[float] = None) -> bool:
         try:
-            with socket_timeout(conn, timeout):
-                resp = conn.recv(1, socket.MSG_PEEK | socket.MSG_DONTWAIT)
-            if resp == b'':
+            if conn.recv(1, socket.MSG_PEEK | socket.MSG_DONTWAIT) == b'':
                 return False
         except BlockingIOError as exc:
             if exc.errno != errno.EAGAIN:

generic_connection_pool/heap.py generic_connection_pool/rankmap.pygeneric_connection_pool/heap.py renamed to generic_connection_pool/rankmap.py

@@ -13,7 +13,7 @@ class ComparableAndHashable(ComparableP, Protocol, Hashable):
 Item = TypeVar('Item', bound=ComparableAndHashable)
 
 
-class ExtHeap(Generic[Item]):
+class RankMap(Generic[Item]):
     """
     Extended heap data structure implementation.
     Similar to `heapq` but supports remove and replace operations.

pyproject.toml

@@ -14,12 +14,17 @@ classifiers = [
     "Intended Audience :: Developers",
     "Natural Language :: English",
     "License :: Public Domain",
+    "Operating System :: OS Independent",
+    "Topic :: Database",
+    "Topic :: Internet :: WWW/HTTP",
     "Topic :: Software Development :: Libraries",
     "Topic :: System :: Networking",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Typing :: Typed",
 ]
 
 [tool.poetry.dependencies]

tests/test_heap.py

@@ -0,0 +1,141 @@
+import pytest
+
+from generic_connection_pool.rankmap import RankMap
+
+
+def test_heap_top():
+    rm = RankMap()
+
+    rm.insert(3)
+    rm.insert(1)
+    rm.insert(2)
+
+    assert rm.top() == 1
+    rm.pop()
+
+    assert rm.top() == 2
+    rm.pop()
+
+    assert rm.top() == 3
+    rm.pop()
+
+    assert rm.top() is None
+
+
+def test_heap_push_pop():
+    rm = RankMap()
+
+    items = [0, 2, 1, 4, 3, 5, 6, 7, 8, 12, 11, 10, 9]
+    for item in items:
+        rm.insert(item)
+
+    actual_result = []
+    while rm:
+        actual_result.append(rm.pop())
+
+    expected_result = sorted(items)
+    assert actual_result == expected_result
+    assert rm.pop() is None
+    assert len(rm) == 0
+
+
+def test_heap_multiple_push_pop():
+    rm = RankMap()
+
+    rm.insert(0)
+    rm.insert(1)
+    rm.pop()
+    rm.insert(0)
+
+
+def test_heap_replace():
+    rm = RankMap()
+
+    rm.insert(0)
+    rm.replace(0, 1)
+    assert len(rm) == 1
+
+    items = [3, 4, 6, 7, 8]
+    for item in items:
+        rm.insert(item)
+
+    rm.replace(1, 2)
+    rm.replace(4, 5)
+    rm.replace(6, 0)
+    rm.replace(7, 9)
+    rm.replace(8, 1)
+    rm.replace(9, 4)
+
+    actual_result = []
+    while rm:
+        actual_result.append(rm.pop())
+
+    expected_result = [0, 1, 2, 3, 4, 5]
+    assert actual_result == expected_result
+
+
+def test_heap_replace_by_copy():
+    rm = RankMap()
+
+    rm.insert(1)
+    rm.insert_or_replace(1)
+    rm.insert(2)
+    rm.insert_or_replace(2)
+
+    actual_result = []
+    while rm:
+        actual_result.append(rm.pop())
+
+    expected_result = [1, 2]
+    assert actual_result == expected_result
+
+
+def test_heap_remove():
+    rm = RankMap()
+
+    rm.insert(1)
+    rm.remove(1)
+
+    assert len(rm) == 0
+
+    rm.insert(1)
+    rm.insert(2)
+    rm.insert(3)
+    rm.insert(4)
+
+    rm.remove(2)
+    assert rm.pop() == 1
+    assert rm.pop() == 3
+
+    rm.remove(4)
+    assert len(rm) == 0
+
+
+def test_heap_duplicate_error():
+    rm = RankMap()
+
+    rm.insert(1)
+    with pytest.raises(KeyError):
+        rm.insert(1)
+
+    rm.insert(2)
+    with pytest.raises(KeyError):
+        rm.replace(2, 1)
+
+
+def test_heap_clear():
+    rm = RankMap()
+
+    items = [0, 1, 2]
+    for item in items:
+        rm.insert(item)
+
+    rm.clear()
+    assert len(rm) == 0
+
+
+def test_heap_not_found_error():
+    rm = RankMap()
+
+    with pytest.raises(KeyError):
+        rm.replace(1, 2)