summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS5
-rw-r--r--lib/pool.py4
2 files changed, 5 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 3ba60de..651b74c 100644
--- a/NEWS
+++ b/NEWS
@@ -20,8 +20,9 @@ What's new in psycopg 2.6.2
^^^^^^^^^^^^^^^^^^^^^^^^^^^
- Report the server response status on errors (such as :ticket:`#281`).
-- Raise NotSupportedError on unhandled server response status
+- Raise `!NotSupportedError` on unhandled server response status
(:ticket:`#352`).
+- Fixed `!PersistentConnectionPool` on Python 3 (:ticket:`#348`).
What's new in psycopg 2.6.1
@@ -30,7 +31,7 @@ What's new in psycopg 2.6.1
- Lists consisting of only `None` are escaped correctly (:ticket:`#285`).
- Fixed deadlock in multithread programs using OpenSSL (:ticket:`#290`).
- Correctly unlock the connection after error in flush (:ticket:`#294`).
-- Fixed ``MinTimeLoggingCursor.callproc()`` (:ticket:`#309`).
+- Fixed `!MinTimeLoggingCursor.callproc()` (:ticket:`#309`).
- Added support for MSVC 2015 compiler (:ticket:`#350`).
diff --git a/lib/pool.py b/lib/pool.py
index 4f858ab..8d7c4af 100644
--- a/lib/pool.py
+++ b/lib/pool.py
@@ -204,8 +204,8 @@ class PersistentConnectionPool(AbstractConnectionPool):
# we we'll need the thread module, to determine thread ids, so we
# import it here and copy it in an instance variable
- import thread
- self.__thread = thread
+ import thread as _thread # work around for 2to3 bug - see ticket #348
+ self.__thread = _thread
def getconn(self):
"""Generate thread id and return a connection."""