psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2024-09-21 19:28:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-550'

Browse Source
This commit is contained in:
Daniele Varrazzo 2017-06-17 01:58:11 +01:00
commit d72efd2fa8
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -20,6 +20,8 @@ What's new in psycopg 2.7.2
(:ticket:`#545`). (:ticket:`#545`).
- Fixed `~psycopg2.extras.ReplicationCursor.consume_stream()` - Fixed `~psycopg2.extras.ReplicationCursor.consume_stream()`
*keepalive_interval* argument (:ticket:`#547`). *keepalive_interval* argument (:ticket:`#547`).
- Maybe fixed random import error on Python 3.6 in multiprocess
environment (:ticket:`#550`).
- Fixed random `!SystemError` upon receiving abort signal (:ticket:`#551`). - Fixed random `!SystemError` upon receiving abort signal (:ticket:`#551`).
- Parse intervals returned as microseconds from Redshift (:ticket:`#558`). - Parse intervals returned as microseconds from Redshift (:ticket:`#558`).
- Added `~psycopg2.extras.Json` `!prepare()` method to consider connection - Added `~psycopg2.extras.Json` `!prepare()` method to consider connection

2
lib/__init__.py
View File

@ -65,7 +65,7 @@ from psycopg2 import tz # noqa
# Register default adapters. # Register default adapters.
import psycopg2.extensions as _ext from psycopg2 import extensions as _ext
_ext.register_adapter(tuple, _ext.SQL_IN) _ext.register_adapter(tuple, _ext.SQL_IN)
_ext.register_adapter(type(None), _ext.NoneAdapter) _ext.register_adapter(type(None), _ext.NoneAdapter)

2
lib/pool.py
View File

@ -25,7 +25,7 @@ This module implements thread-safe (and not) connection pools.
# License for more details. # License for more details.
import psycopg2 import psycopg2
import psycopg2.extensions as _ext from psycopg2 import extensions as _ext
class PoolError(psycopg2.Error): class PoolError(psycopg2.Error):

4
lib/psycopg1.py
View File

@ -28,12 +28,12 @@ old code while porting to psycopg 2. Import it as follows::
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public # FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
# License for more details. # License for more details.
import psycopg2._psycopg as _2psycopg # noqa from psycopg2 import _psycopg as _2psycopg # noqa
from psycopg2.extensions import cursor as _2cursor from psycopg2.extensions import cursor as _2cursor
from psycopg2.extensions import connection as _2connection from psycopg2.extensions import connection as _2connection
from psycopg2 import * # noqa from psycopg2 import * # noqa
import psycopg2.extensions as _ext from psycopg2 import extensions as _ext
_2connect = connect _2connect = connect