Merged changed by JH from head

This commit is contained in:
Federico Di Gregorio 2008-09-24 01:29:20 +02:00
commit b9157c8ba1
2 changed files with 6 additions and 1 deletions

View File

@ -2,6 +2,11 @@
* lib/extras.py: added inet support and related tests. * lib/extras.py: added inet support and related tests.
2008-09-23 James Henstridge <james@jamesh.id.au>
* psycopg/psycopg.h (NotSupportedError_doc): clean up
spelling/grammar a bit, using exception description from the PEP.
2008-09-23 Federico Di Gregorio <fog@initd.org> 2008-09-23 Federico Di Gregorio <fog@initd.org>
* Applied patch from Brian Sutherland that fixes NULL * Applied patch from Brian Sutherland that fixes NULL

View File

@ -174,7 +174,7 @@ HIDDEN size_t qstring_escape(char *to, char *from, size_t len, PGconn *conn);
"Error related to problems with the processed data." "Error related to problems with the processed data."
#define NotSupportedError_doc \ #define NotSupportedError_doc \
"A not supported datbase API was called." "A method or database API was used which is not supported by the database."
#ifdef PSYCOPG_EXTENSIONS #ifdef PSYCOPG_EXTENSIONS
#define QueryCanceledError_doc \ #define QueryCanceledError_doc \