Skip to content

Commit 94a58de

Browse files
jwpjwp
committed
Merge branch 'master' into v1.3
2 parents 52293c8 + 1cd1b44 commit 94a58de

3 files changed

Lines changed: 8 additions & 9 deletions

File tree

‎README.md‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@ interfaces provided by recent versions of Python. Future versions may change thi
1616

1717
### Advisory
1818

19-
In v2.0, support for older versions of PostgreSQL and Python will be removed.
19+
In v2.0, many, potentially breaking, changes are planned.
2020
If you have automated installations using PyPI, make sure that they specify a major version.
2121

22-
In v1.3, `postgresql.driver.dbapi20.connect` will now raise `ClientCannotConnectError` directly.
23-
Exception traps around connect should still function, but the `__context__` attribute
24-
on the error instance will be `None` in the usual failure case as it is no longer
25-
incorrectly chained. Trapping `ClientCannotConnectError` ahead of `Error` should
26-
allow both cases to co-exist in the event that data is being extracted from
27-
the `ClientCannotConnectError`.
22+
- Support for older versions of PostgreSQL and Python will be removed. This will allow the driver
23+
to defer version parsing fixing (https://github.com/python-postgres/fe/issues/109), and better prepare for future versions.
24+
- The connection establishment strategy will be simplified to only performing one attempt. `sslmode`
25+
parameter should be considered deprecated. v1.4 will provide a new security parameter implying `sslmode=require`. See (https://github.com/python-postgres/fe/issues/122) and (https://github.com/python-postgres/fe/issues/75).
26+
- StoredProcedure will be removed. See (https://github.com/python-postgres/fe/issues/80).
2827

2928
### Installation
3029

‎postgresql/port/_optimized/buffer.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ PyTypeObject pq_message_stream_Type = {
587587
sizeof(struct p_buffer), /* tp_basicsize */
588588
0, /* tp_itemsize */
589589
p_dealloc, /* tp_dealloc */
590-
NULL, /* tp_print */
590+
0, /* tp_print */
591591
NULL, /* tp_getattr */
592592
NULL, /* tp_setattr */
593593
NULL, /* tp_compare */

‎postgresql/port/_optimized/wirestate.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ PyTypeObject WireState_Type = {
248248
sizeof(struct wirestate), /* tp_basicsize */
249249
0, /* tp_itemsize */
250250
ws_dealloc, /* tp_dealloc */
251-
NULL, /* tp_print */
251+
0, /* tp_print */
252252
NULL, /* tp_getattr */
253253
NULL, /* tp_setattr */
254254
NULL, /* tp_compare */

0 commit comments

Comments
 (0)