Pierre-Yves David
--- a/swh/core/db/__init__.py
+++ b/swh/core/db/__init__.py
    @staticmethod
-    def adapt_conn(conn: psycopg2.extensions.connection):
-        """Makes psycopg2 use 'bytes' to decode bytea instead of
+    def adapt_conn(conn: psycopg.Connection[Any]):
+        """Makes psycopg use 'bytes' to decode bytea instead of
        'memoryview', for this connection."""
-        t_bytes = psycopg2.extensions.new_type((17,), "bytea", typecast_bytea)
-        psycopg2.extensions.register_type(t_bytes, conn)
+        # XXX-psycophg3: deal with this
+        # t_bytes = psycopg.extensions.new_type((17,), "bytea", typecast_bytea)
+        # psycopg.extensions.register_type(t_bytes, conn)

-        t_bytes_array = psycopg2.extensions.new_array_type((1001,), "bytea[]", t_bytes)
-        psycopg2.extensions.register_type(t_bytes_array, conn)
+        # t_bytes_array = psycopg.extensions.new_array_type((1001,), "bytea[]", t_bytes)
+        # psycopg.extensions.register_type(t_bytes_array, conn)
--- a/swh/core/tests/test_config.py
+++ b/swh/core/tests/test_config.py
 ls: list, of, strings
 li: 1, 2, 3, 4
 """
-    conffile.open("w").write(conf_contents)
+    with open(conffile, "w") as f:
+        f.write(conf_contents)
--- a/swh/core/db/common.py
+++ b/swh/core/db/common.py
        cursor.execute("SHOW %s" % option)
        old_value = cursor.fetchall()[0][0]
        if old_value != value:
-            cursor.execute("SET LOCAL %s TO %%s" % option, (value,))
+            # XXX-psycopg3: use SQL oriented formatting instead
+            cursor.execute(
+                "SELECT set_config(%s::text, %s::text, true)", (option, value)
-                "SELECT set_config(%s::text, %s::text, true)", (option, value)
+                "SELECT set_config(%s, %s, true)", (str(option), str(value))
--- a/swh/core/db/db_utils.py
+++ b/swh/core/db/db_utils.py

 def parse_dsn_or_dbname(dsn_or_dbname: str) -> Dict[str, str]:
-    """Parse a psycopg2 dsn, falling back to supporting plain database names as well"""
+    """Parse a psycopg dsn, falling back to supporting plain database names as well"""
    try:
-        return _parse_dsn(dsn_or_dbname)
-    except psycopg2.ProgrammingError:
-        # psycopg2 failed to parse the DSN; it's probably a database name,
+        d = conninfo_to_dict(dsn_or_dbname)
+    except psycopg.ProgrammingError:
+        # psycopg failed to parse the DSN; it's probably a database name,
        # handle it as such
-        return _parse_dsn(f"dbname={dsn_or_dbname}")
+        d = conninfo_to_dict(f"dbname={dsn_or_dbname}")
+    # typing note: we don't pass **kwargs to conninfo_to_dict, so we don't get
+    # "int/None" as value and can safely cast to `Dict[str, str]`
-    # typing note: we don't pass **kwargs to conninfo_to_dict, so we don't get
-    # "int/None" as value and can safely cast to `Dict[str, str]`
+    # conninfo_to_dict only returns non-str values when given keyword arguments
--- a/requirements-test.txt
+++ b/requirements-test.txt
 hypothesis >= 3.11.0
+psycopg_pool