psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2024-11-29 12:23:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed read() exception propagation in copy_from

Browse Source 
Close issue #412.
This commit is contained in:
Daniele Varrazzo 2016-03-08 05:12:06 +00:00
parent 82ef9cfadd
commit 65ec7e8bcb
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -33,6 +33,7 @@ What's new in psycopg 2.6.2
- Added support for setuptools/wheel (:ticket:`#370`). - Added support for setuptools/wheel (:ticket:`#370`).
- Fix build on Windows with Python 3.5, VS 2015 (:ticket:`#380`). - Fix build on Windows with Python 3.5, VS 2015 (:ticket:`#380`).
- Fixed `!errorcodes.lookup` initialization thread-safety (:ticket:`#382`). - Fixed `!errorcodes.lookup` initialization thread-safety (:ticket:`#382`).
- Fixed `!read()` exception propagation in copy_from (:ticket:`#412`).
What's new in psycopg 2.6.1 What's new in psycopg 2.6.1

6
psycopg/pqpath.c
View File

@ -1393,7 +1393,11 @@ _pq_copy_in_v3(cursorObject *curs)
Py_DECREF(str); Py_DECREF(str);
} }
} }
PyErr_Restore(t, ex, tb); /* Clear the Py exception: it will be re-raised from the libpq */
Py_XDECREF(t);
Py_XDECREF(ex);
Py_XDECREF(tb);
PyErr_Clear();
} }
res = PQputCopyEnd(curs->conn->pgconn, buf); res = PQputCopyEnd(curs->conn->pgconn, buf);
} }