Preparing 2.0.5.1.2_0_5_1

4 files changed, 29 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 6588a98..b273e20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-09-02  Federico Di Gregorio  <fog@initd.org>
+
+	* Release 2.0.5.1.
+
+	* psycopg/cursor_type.c: applied patch from Jason Erickson to
+	build on MSVC and older gcc.
+
 2006-09-01  Federico Di Gregorio  <fog@initd.org>
 
 	* Release 2.0.5.
diff --git a/NEWS b/NEWS
index 99ae666..2268d4a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,21 @@
+What's new in psycopg 2.0.5.1
+­----------------------------
+
+* Now it really, really builds on MSVC and older gcc versions.
+
+What's new in psycopg 2.0.5
+­--------------------------
+
+* Fixed various buglets such as:
+  - segfault when passing an empty string to Binary()
+  - segfault on null queries
+  - segfault and bad keyword naming in .executemany()
+  - OperationalError in connection objects was always None
+
+* Various changes to ZPsycopgDA to make it more zope2.9-ish.
+
+* connect() now accept both integers and strings as port parameter
+
 What's new in psycopg 2.0.4
 ---------------------------
 
diff --git a/psycopg/cursor_type.c b/psycopg/cursor_type.c
index 58cb76b..73e4de6 100644
--- a/psycopg/cursor_type.c
+++ b/psycopg/cursor_type.c
@@ -1088,13 +1088,13 @@ psyco_curs_copy_from(cursorObject *self, PyObject *args, PyObject *kwargs)
     
     if (columns != NULL && columns != Py_None) {
         PyObject* collistiter = PyObject_GetIter(columns);
-        if (collistiter == NULL) {
-            return NULL;
-        }
         PyObject* col;
         int collistlen = 2;
         int colitemlen;
         char* colname;
+        if (collistiter == NULL) {
+            return NULL;
+        }
         strcpy(columnlist, " (");
         while ((col = PyIter_Next(collistiter)) != NULL) {
             if (!PyString_Check(col)) {
diff --git a/setup.py b/setup.py
index 948cb51..45daed7 100644
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,7 @@ from distutils.command.build_ext import build_ext
 from distutils.sysconfig import get_python_inc
 from distutils.ccompiler import get_default_compiler
 
-PSYCOPG_VERSION = '2.0.5'
+PSYCOPG_VERSION = '2.0.5.1'
 version_flags   = []
 
 # to work around older distutil limitations