Merge branch 'fix-550'

onlinemediagroup · Jun 17, 2017 · d72efd2 · d72efd2
2 parents 8ab1680 + 991f098
commit d72efd2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/NEWS b/NEWS
@@ -20,6 +20,8 @@ What's new in psycopg 2.7.2
   (:ticket:`#545`).
 - Fixed `~psycopg2.extras.ReplicationCursor.consume_stream()`
   *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`).
 - Parse intervals returned as microseconds from Redshift (:ticket:`#558`).
 - Added `~psycopg2.extras.Json` `!prepare()` method to consider connection

diff --git a/lib/__init__.py b/lib/__init__.py
@@ -65,7 +65,7 @@
 
 # Register default adapters.
 
-import psycopg2.extensions as _ext
+from psycopg2 import extensions as _ext
 _ext.register_adapter(tuple, _ext.SQL_IN)
 _ext.register_adapter(type(None), _ext.NoneAdapter)
 

diff --git a/lib/pool.py b/lib/pool.py
@@ -25,7 +25,7 @@
 # License for more details.
 
 import psycopg2
-import psycopg2.extensions as _ext
+from psycopg2 import extensions as _ext
 
 
 class PoolError(psycopg2.Error):

diff --git a/lib/psycopg1.py b/lib/psycopg1.py
@@ -28,12 +28,12 @@
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 # 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 connection as _2connection
 
 from psycopg2 import *      # noqa
-import psycopg2.extensions as _ext
+from psycopg2 import extensions as _ext
 _2connect = connect