From: Daniele Varrazzo Date: Mon, 13 Apr 2020 08:51:05 +0000 (+1200) Subject: Fixed dispatcher -> dispchar typo X-Git-Tag: 3.0.dev0~563 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba0417378b2f7630f20f2b0990064d7042afe36b;p=thirdparty%2Fpsycopg.git Fixed dispatcher -> dispchar typo --- diff --git a/psycopg3/pq/_pq_ctypes.py b/psycopg3/pq/_pq_ctypes.py index b29218977..454484383 100644 --- a/psycopg3/pq/_pq_ctypes.py +++ b/psycopg3/pq/_pq_ctypes.py @@ -48,7 +48,7 @@ class PQconninfoOption_struct(Structure): ("compiled", c_char_p), ("val", c_char_p), ("label", c_char_p), - ("dispatcher", c_char_p), + ("dispchar", c_char_p), ("dispsize", c_int), ] diff --git a/psycopg3/pq/_pq_ctypes.pyi b/psycopg3/pq/_pq_ctypes.pyi index 1a976fabd..51b332b91 100644 --- a/psycopg3/pq/_pq_ctypes.pyi +++ b/psycopg3/pq/_pq_ctypes.pyi @@ -19,7 +19,7 @@ class PQconninfoOption_struct: compiled: bytes val: bytes label: bytes - dispatcher: bytes + dispchar: bytes dispsize: int def PQhostaddr(arg1: Optional[PGconn_struct]) -> bytes: ... diff --git a/psycopg3/pq/misc.py b/psycopg3/pq/misc.py index e1068ffac..d2dd78329 100644 --- a/psycopg3/pq/misc.py +++ b/psycopg3/pq/misc.py @@ -12,7 +12,7 @@ if TYPE_CHECKING: ConninfoOption = namedtuple( - "ConninfoOption", "keyword envvar compiled val label dispatcher dispsize" + "ConninfoOption", "keyword envvar compiled val label dispchar dispsize" ) diff --git a/psycopg3/pq/pq_ctypes.py b/psycopg3/pq/pq_ctypes.py index 35539c720..6ffa67707 100644 --- a/psycopg3/pq/pq_ctypes.py +++ b/psycopg3/pq/pq_ctypes.py @@ -627,7 +627,7 @@ class Conninfo: cls, opts: Sequence[impl.PQconninfoOption_struct] ) -> List[ConninfoOption]: rv = [] - skws = "keyword envvar compiled val label dispatcher".split() + skws = "keyword envvar compiled val label dispchar".split() for opt in opts: if not opt.keyword: break diff --git a/tests/pq/test_conninfo.py b/tests/pq/test_conninfo.py index ee3d03d63..b08c8c949 100644 --- a/tests/pq/test_conninfo.py +++ b/tests/pq/test_conninfo.py @@ -10,7 +10,7 @@ def test_defaults(pq, tempenv): assert port.compiled == b"5432" assert port.val == b"15432" assert port.label == b"Database-Port" - assert port.dispatcher == b"" + assert port.dispchar == b"" assert port.dispsize == 6 diff --git a/tests/pq/test_pgconn.py b/tests/pq/test_pgconn.py index 9e8ea4fd3..c9601458a 100644 --- a/tests/pq/test_pgconn.py +++ b/tests/pq/test_pgconn.py @@ -74,7 +74,7 @@ def test_info(pq, dsn, pgconn): dbname = [d for d in info if d.keyword == b"dbname"][0] assert dbname.envvar == b"PGDATABASE" assert dbname.label == b"Database-Name" - assert dbname.dispatcher == b"" + assert dbname.dispchar == b"" assert dbname.dispsize == 20 parsed = pq.Conninfo.parse(dsn.encode("utf8"))