psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2024-11-10 19:16:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Mingw and ZPsycopgDA fixes.

Browse Source
This commit is contained in:
Federico Di Gregorio 2005-09-12 02:23:17 +00:00
parent 8d3fd21280
commit f4b52e8cdd
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2005-09-12 Federico Di Gregorio <fog@initd.org>
* ZpsycopgDA/db.py: fixed problem with OperationalError that resulted in
cryptic message to Zope users ("'OperationalError' is not defined".)
2005-08-23 Federico Di Gregorio <fog@debian.org> 2005-08-23 Federico Di Gregorio <fog@debian.org>
* setup.py: applied patch from Daniele Varrazzo to avoid segfaults * setup.py: applied patch from Daniele Varrazzo to avoid segfaults

3
ZPsycopgDA/db.py
View File

@ -29,7 +29,6 @@ import psycopg2
from psycopg2.extensions import INTEGER, LONGINTEGER, FLOAT, BOOLEAN, DATE from psycopg2.extensions import INTEGER, LONGINTEGER, FLOAT, BOOLEAN, DATE
from psycopg2 import NUMBER, STRING, ROWID, DATETIME from psycopg2 import NUMBER, STRING, ROWID, DATETIME
# the DB object, managing all the real query work # the DB object, managing all the real query work
@ -175,7 +174,7 @@ class DB(TM, dbi_db.DB):
c.execute(qs, query_data) c.execute(qs, query_data)
else: else:
c.execute(qs) c.execute(qs)
except OperationalError, e: except psycopg2.OperationalError, e:
try: try:
self.close() self.close()
except: except:

2
psycopg/cursor_type.c
View File

@ -963,7 +963,7 @@ psyco_curs_copy_from(cursorObject *self, PyObject *args, PyObject *kwargs)
char *table_name; char *table_name;
char *sep = "\t", *null = NULL; char *sep = "\t", *null = NULL;
long int bufsize = DEFAULT_COPYSIZE; long int bufsize = DEFAULT_COPYSIZE;
PyObject *file, *res = NULL; PyObject *file, *columns, *res = NULL;
static char *kwlist[] = {"file", "table", "sep", "null", "size", NULL}; static char *kwlist[] = {"file", "table", "sep", "null", "size", NULL};

4
setup.cfg
View File

@ -9,9 +9,9 @@ use_pydatetime=1
# include_dirs is the preferred method for locating postgresql headers, # include_dirs is the preferred method for locating postgresql headers,
# but some extra checks on sys.platform will still be done in setup.py. # but some extra checks on sys.platform will still be done in setup.py.
# the next line is the default as used on psycopg author Debian system: # the next line is the default as used on psycopg author Debian system:
include_dirs=.:/usr/include/postgresql/8.0:/usr/include/postgresql/8.0/server include_dirs=.:/usr/include/postgresql:/usr/include/postgresql/8.0
# uncomment next line on Mandrake 10.x (and comment previous one): # uncomment next line on Mandrake 10.x (and comment previous one):
#include_dirs=.:/usr/include/pgsql:/usr/include/pgsql/server #include_dirs=.:/usr/include/pgsql/8.0:/usr/include/pgsql/8.0/server
# if postgresql is installed somewhere weird (i.e., not in your runtime library # if postgresql is installed somewhere weird (i.e., not in your runtime library
# path like /usr/lib), just add the right path in "library_dir" any extra # path like /usr/lib), just add the right path in "library_dir" any extra