refactor: check if cancel safe is implemented via capabilities

diff --git a/psycopg/psycopg/connection.py b/psycopg/psycopg/connection.py
index 9701770d8d800ec13d7e78de997e54007a713a4c..12c06993abea001279d29e86407bad6df170081a 100644 (file)
--- a/psycopg/psycopg/connection.py
+++ b/psycopg/psycopg/connection.py
@@ -32,6 +32,7 @@ from ._encodings import pgconn_encoding
 from .generators import notifies
 from .transaction import Transaction
 from .cursor import Cursor
+from ._capabilities import capabilities
 from .server_cursor import ServerCursor
 from ._connection_base import BaseConnection, CursorRow, Notify
 
@@ -277,8 +278,7 @@ class Connection(BaseConnection[Row]):
         if not self._should_cancel():
             return
 
-        # TODO: replace with capabilities.has_safe_cancel after merging #782
-        if pq.__build_version__ >= 170000:
+        if capabilities.has_cancel_safe():
             try:
                 waiting.wait_conn(
                     self._cancel_gen(timeout=timeout), interval=_WAIT_INTERVAL

diff --git a/psycopg/psycopg/connection_async.py b/psycopg/psycopg/connection_async.py
index beb4c8714dfc1db8b46d3bfb2e8ad166d7b3e5ad..096213a1b96af7b21ba2144d73f80ef83d392d99 100644 (file)
--- a/psycopg/psycopg/connection_async.py
+++ b/psycopg/psycopg/connection_async.py
@@ -29,6 +29,7 @@ from ._encodings import pgconn_encoding
 from .generators import notifies
 from .transaction import AsyncTransaction
 from .cursor_async import AsyncCursor
+from ._capabilities import capabilities
 from .server_cursor import AsyncServerCursor
 from ._connection_base import BaseConnection, CursorRow, Notify
 
@@ -294,8 +295,7 @@ class AsyncConnection(BaseConnection[Row]):
         if not self._should_cancel():
             return
 
-        # TODO: replace with capabilities.has_safe_cancel after merging #782
-        if pq.__build_version__ >= 170000:
+        if capabilities.has_cancel_safe():
             try:
                 await waiting.wait_conn_async(
                     self._cancel_gen(timeout=timeout), interval=_WAIT_INTERVAL