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

Merge branch 'py35' into maint_2_6

Browse Source
This commit is contained in:
Daniele Varrazzo 2016-03-08 05:15:47 +00:00
commit 5aa7588f56
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -14,6 +14,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

2
doc/src/install.rst
View File

@ -18,7 +18,7 @@ The current `!psycopg2` implementation supports:
NOTE: keep consistent with setup.py and the /features/ page. NOTE: keep consistent with setup.py and the /features/ page.
- Python 2 versions from 2.5 to 2.7 - Python 2 versions from 2.5 to 2.7
- Python 3 versions from 3.1 to 3.4 - Python 3 versions from 3.1 to 3.5
- PostgreSQL versions from 7.4 to 9.4 - PostgreSQL versions from 7.4 to 9.4
.. _PostgreSQL: http://www.postgresql.org/ .. _PostgreSQL: http://www.postgresql.org/

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);
} }

1
setup.py
View File

@ -41,6 +41,7 @@ Programming Language :: Python :: 3.1
Programming Language :: Python :: 3.2 Programming Language :: Python :: 3.2
Programming Language :: Python :: 3.3 Programming Language :: Python :: 3.3
Programming Language :: Python :: 3.4 Programming Language :: Python :: 3.4
Programming Language :: Python :: 3.5
Programming Language :: C Programming Language :: C
Programming Language :: SQL Programming Language :: SQL
Topic :: Database Topic :: Database