Ubuntu
psycopg2 package

Merge lp:~groldster/ubuntu/maverick/psycopg2/merge-611040 into lp:ubuntu/maverick/psycopg2

Maverick (10.10)
merge-611040
Merge into maverick

Proposed by Mikhail Turov on 2010-07-28

Status:	Merged
Merged at revision:	14
Proposed branch:	lp:~groldster/ubuntu/maverick/psycopg2/merge-611040
Merge into:	lp:ubuntu/maverick/psycopg2
Diff against target:	35827 lines (+30180/-2336) 173 files modified ChangeLog (+131/-0) LICENSE (+29/-35) MANIFEST (+76/-6) MANIFEST.in (+6/-3) NEWS-2.0 (+586/-0) NEWS-2.2 (+39/-0) PKG-INFO (+3/-3) README (+13/-9) ZPsycopgDA/DA.py (+17/-19) ZPsycopgDA/__init__.py (+14/-16) ZPsycopgDA/db.py (+17/-19) ZPsycopgDA/pool.py (+17/-19) debian/changelog (+30/-7) debian/control (+3/-12) debian/rules (+0/-2) debian/source/format (+1/-0) doc/COPYING (+676/-0) doc/COPYING.LESSER (+165/-0) doc/Makefile (+23/-0) doc/README (+42/-0) doc/TODO (+0/-33) doc/api-screen.css (+0/-138) doc/async.txt (+0/-67) doc/extensions.rst (+0/-260) doc/html/.buildinfo (+4/-0) doc/html/_sources/advanced.txt (+450/-0) doc/html/_sources/connection.txt (+365/-0) doc/html/_sources/cursor.txt (+473/-0) doc/html/_sources/errorcodes.txt (+76/-0) doc/html/_sources/extensions.txt (+565/-0) doc/html/_sources/extras.txt (+165/-0) doc/html/_sources/faq.txt (+139/-0) doc/html/_sources/index.txt (+62/-0) doc/html/_sources/module.txt (+316/-0) doc/html/_sources/pool.txt (+62/-0) doc/html/_sources/tz.txt (+16/-0) doc/html/_sources/usage.txt (+510/-0) doc/html/_static/basic.css (+417/-0) doc/html/_static/default.css (+230/-0) doc/html/_static/doctools.js (+232/-0) doc/html/_static/jquery.js (+6240/-0) doc/html/_static/psycopg.css (+28/-0) doc/html/_static/pygments.css (+61/-0) doc/html/_static/searchtools.js (+467/-0) doc/html/advanced.html (+434/-0) doc/html/connection.html (+420/-0) doc/html/cursor.html (+534/-0) doc/html/errorcodes.html (+168/-0) doc/html/extensions.html (+743/-0) doc/html/extras.html (+354/-0) doc/html/faq.html (+231/-0) doc/html/genindex.html (+782/-0) doc/html/index.html (+178/-0) doc/html/modindex.html (+120/-0) doc/html/module.html (+414/-0) doc/html/objects.inv (+217/-0) doc/html/pool.html (+181/-0) doc/html/search.html (+97/-0) doc/html/searchindex.js (+1/-0) doc/html/tz.html (+132/-0) doc/html/usage.html (+506/-0) doc/pep-0249.txt (+1005/-0) doc/psycopg2.txt (+2820/-0) doc/src/Makefile (+99/-0) doc/src/_static/psycopg.css (+28/-0) doc/src/advanced.rst (+450/-0) doc/src/conf.py (+257/-0) doc/src/connection.rst (+365/-0) doc/src/cursor.rst (+473/-0) doc/src/errorcodes.rst (+76/-0) doc/src/extensions.rst (+565/-0) doc/src/extras.rst (+165/-0) doc/src/faq.rst (+139/-0) doc/src/index.rst (+62/-0) doc/src/module.rst (+316/-0) doc/src/pool.rst (+62/-0) doc/src/tools/lib/dbapi_extension.py (+52/-0) doc/src/tools/lib/sql_role.py (+21/-0) doc/src/tools/stitch_text.py (+56/-0) doc/src/tz.rst (+16/-0) doc/src/usage.rst (+510/-0) examples/binary.py (+11/-11) examples/copy_from.py (+0/-1) examples/copy_to.py (+0/-1) examples/cursor.py (+11/-11) examples/dict.py (+11/-11) examples/dt.py (+11/-11) examples/encoding.py (+12/-12) examples/fetch.py (+11/-12) examples/lastrowid.py (+11/-11) examples/mogrify.py (+11/-11) examples/myfirstrecipe.py (+26/-22) examples/notify.py (+15/-14) examples/simple.py (+12/-11) examples/threads.py (+11/-11) examples/typecast.py (+11/-11) examples/tz.py (+11/-11) examples/usercast.py (+11/-11) lib/__init__.py (+28/-13) lib/errorcodes.py (+103/-60) lib/extensions.py (+39/-17) lib/extras.py (+88/-44) lib/pool.py (+21/-13) lib/psycopg1.py (+19/-11) lib/tz.py (+29/-16) psycopg/adapter_asis.c (+19/-15) psycopg/adapter_asis.h (+18/-14) psycopg/adapter_binary.c (+20/-16) psycopg/adapter_binary.h (+18/-14) psycopg/adapter_datetime.c (+45/-21) psycopg/adapter_datetime.h (+18/-14) psycopg/adapter_list.c (+18/-14) psycopg/adapter_list.h (+18/-14) psycopg/adapter_mxdatetime.c (+25/-21) psycopg/adapter_mxdatetime.h (+18/-14) psycopg/adapter_pboolean.c (+18/-14) psycopg/adapter_pboolean.h (+18/-14) psycopg/adapter_pdecimal.c (+268/-0) psycopg/adapter_pdecimal.h (+58/-0) psycopg/adapter_pfloat.c (+19/-15) psycopg/adapter_pfloat.h (+18/-14) psycopg/adapter_qstring.c (+18/-14) psycopg/adapter_qstring.h (+18/-14) psycopg/config.h (+18/-14) psycopg/connection.h (+58/-19) psycopg/connection_int.c (+544/-117) psycopg/connection_type.c (+138/-31) psycopg/cursor.h (+32/-18) psycopg/cursor_int.c (+18/-14) psycopg/cursor_type.c (+46/-126) psycopg/green.c (+198/-0) psycopg/green.h (+75/-0) psycopg/lobject.h (+19/-14) psycopg/lobject_int.c (+52/-20) psycopg/lobject_type.c (+48/-14) psycopg/microprotocols.c (+21/-15) psycopg/microprotocols.h (+18/-14) psycopg/microprotocols_proto.c (+18/-14) psycopg/microprotocols_proto.h (+18/-14) psycopg/pqpath.c (+295/-150) psycopg/pqpath.h (+28/-17) psycopg/psycopg.h (+18/-14) psycopg/psycopgmodule.c (+60/-27) psycopg/python.h (+19/-14) psycopg/typecast.c (+51/-16) psycopg/typecast.h (+18/-14) psycopg/typecast_array.c (+21/-17) psycopg/typecast_basic.c (+29/-19) psycopg/typecast_binary.c (+21/-17) psycopg/typecast_binary.h (+18/-14) psycopg/typecast_datetime.c (+21/-17) psycopg/typecast_mxdatetime.c (+21/-17) psycopg/utils.c (+21/-0) psycopg2da/adapter.py (+18/-25) psycopg2da/tests.py (+19/-13) scripts/ext2html.py (+0/-169) scripts/make_errorcodes.py (+115/-0) scripts/makedocs.py (+0/-15) setup.py (+29/-22) tests/__init__.py (+23/-1) tests/bugX000.py (+1/-0) tests/bug_gc.py (+31/-0) tests/extras_dictcursor.py (+12/-11) tests/test_async.py (+410/-0) tests/test_connection.py (+29/-4) tests/test_copy.py (+104/-0) tests/test_dates.py (+128/-3) tests/test_green.py (+76/-0) tests/test_lobject.py (+68/-0) tests/test_notify.py (+100/-0) tests/test_transaction.py (+2/-0) tests/types_basic.py (+52/-18) tests/types_extras.py (+21/-11)
To merge this branch:	bzr merge lp:~groldster/ubuntu/maverick/psycopg2/merge-611040
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Daniel Holbach (community)		2010-07-28	Approve on 2010-08-02
Review via email: mp+31203@code.launchpad.net

Description of the change

merge psycopg2 2.2.1-1 (main) from Debian unstable (main)

Revision history for this message

Daniel Holbach (dholbach) wrote on 2010-08-02:

Good work!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes:

James Westby

Mikhail Turov

 === modified file 'ChangeLog'
 --- ChangeLog	2009-10-12 06:50:00 +0000
 +++ ChangeLog	2010-07-28 20:35:51 +0000
@@ -1,3 +1,134 @@
++2010-05-17  Federico Di Gregorio  <fog@initd.org>
++
++	* Release 2.2.1.
++
++	* Builds again on Windows.
++
++2010-05-16  Federico Di Gregorio  <fog@initd.org>
++
++	* Release 2.2.0.
++
++2010-05-15  Federico Di Gregorio  <fog@initd.org>
++
++	* typecast.c: Fixed problem related to receiving None from Python
++	when a string was expected.
++
++2010-05-07  Daniele Varrazzo  <daniele.varrazzo@gmail.com>
++
++	* psycopg/adapter_datetime.c: Fixed TimestampFromTicks for second
++	values > 59.5.
++
++	Bug reported and fixed by Jozsef Szalay on 2010-05-06 at 14:11:59.999920.
++
++	* psycopg/adapter_datetime.c: Fixed same bug for TimeFromTicks.
++
++2010-05-04  Daniele Varrazzo  <daniele.varrazzo@gmail.com>
++
++	* Added typecasters for arrays of specific MX/Py time-related types.
++
++	* psycopg/adapter_[mx]datetime.c: Explicit cast of the SQL representation
++	of time-related objects.
++
++2010-05-03  Daniele Varrazzo  <daniele.varrazzo@gmail.com>
++
++	* psycopg/adapter_binary.c: Adapt buffer objects using an explicit cast on
++	the string literal (bug reported by Peter Eisentraut)
++
++2010-04-20  Daniele Varrazzo  <daniele.varrazzo@gmail.com>
++
++	* lib/pqpath.c: Fixed reference leak in notify reception.
++
++	* Notifies are collected if available after every query execution.
++
++2010-04-13  Daniele Varrazzo  <daniele.varrazzo@gmail.com>
++
++	* lib/extensions.py: DECIMAL typecaster imported from _psycopg.
++
++	* lib/extensions.py: PY* and MX* time typecaster imported from _psycopg.
++
++2010-04-11  Daniele Varrazzo  <daniele.varrazzo@gmail.com>
++
++	* psycopg/connection_type.c: Correctly parse keywords in connect().
++
++2010-04-07  Daniele Varrazzo  <daniele.varrazzo@gmail.com>
++
++	* psycopg/pqpath.c: Ensure running COPY in blocking mode.
++
++	* psycopg/pqpath.c: Free the GIL in blocking operations in V2 COPY FROM.
++
++	* psycopg/pqpath.c: Evaluate Python objects only once outside the COPY I/O
++	loops.
++
++2010-04-05  Federico Di Gregorio  <fog@initd.org>
++
++	* Fixed problem with asynchronous NOTIFYs.
++
++	* Integrated async pacthes from Jan's git tree.
++
++2010-03-13  Federico Di Gregorio  <fog@initd.org>
++
++	* Release 2.0.14.
++
++2010-03-11  Federico Di Gregorio  <fog@initd.org>
++
++	* setup.py: one-liner from Devrim GÜNDÜZ to build with PostgreSQL
++	alpha.
++
++2010-02-28  Federico Di Gregorio  <fog@initd.org>
++
++	* psycopg/adapt_decimal.c: Python 2.4 decimal type does not support
++	.isfinite() and two different calls to ._isinfinity() and ._isnan() are
++	required. This fixes both a test failure and a segfault.
++
++2010-02-15  Federico Di Gregorio  <fog@initd.org>
++
++	* Added new Decimal adapter that correctly converts NaN and infinity
++	to PostgreSQL NaN numeric values. Also added tests.
++
++2010-02-15  Daniele Varrazzo  <daniele.varrazzo@gmail.com>
++
++	* lib/errorcodes.py: Updated to PostgreSQL 8.4; added lookup() function.
++
++2010-02-12  Daniele Varrazzo  <daniele.varrazzo@gmail.com>
++
++	* Stop the loop variable used to create __all__ leaking in the module.
++
++	* Fixed Inet constructor.
++
++	* Fixed docstring for 'QueryCanceledError' exception.
++
++2010-02-10  Federico Di Gregorio  <fog@initd.org>
++
++	* lib/extensions.py: Binary was not imported from _psycopg; now it is
++
++	* lib/__init__: SQL_IN adapter is now automatically registered.
++
++	* ZPsycopgDA/db.py: removed logging debug calls; psycopg does
++	not depend on the logger module.
++
++2010-02-12  Federico Di Gregorio  <fog@initd.org>
++
++	* License migration: psycopg2 is now LGPL3 + OpenSSL exception.
++
++	* TODO file was never updated so lets remove it.
++
++2010-02-10  Federico Di Gregorio  <fog@initd.org>
++
++	* lib/extras.py: fixed register_tstz_w_secs() error as reported by
++	Karsten Hilbert.
++
++2009-11-25  Federico Di Gregorio  <fog@initd.org>
++
++	* psycopg/microprotocols.c: "can't adapt" message now includes full
++	type information (adapted patch from Eric Chamberlain).
++
++	* tests/types_basic.py: fixed test broken by float precision fix.
++
++2009-11-09  Federico Di Gregorio  <fog@initd.org>
++
++	* psycopg/adapter_pfloat.c: applied patch from Remy Blankto fix float
++	loss of precision.
++
 -10-04  Federico Di Gregorio  <fog@initd.org>
  	* Release 2.0.13.
 === modified file 'LICENSE'
 --- LICENSE	2006-08-09 10:28:30 +0000
 +++ LICENSE	2010-07-28 20:35:51 +0000
@@ -1,24 +1,32 @@
--psycopg and the GPL
--===================
--
--psycopg is free software; you can redistribute it and/or modify
--it under the terms of the GNU General Public License as published by
--the Free Software Foundation; either version 2 of the License, or
--(at your option) any later version. See file COPYING for details.
--
--As a special exception, specific permission is granted for the GPLed
--code in this distribition to be linked to OpenSSL and PostgreSQL libpq
--without invoking GPL clause 2(b).
--
--Note that the GPL was chosen to avoid proprietary adapters based on
--psycopg code. Using psycopg in a proprietary product (even bundling
--psycopg with the proprietary product) is fine as long as:
--
-- 1. psycopg is called from Python only using only the provided API
--    (i.e., no linking with C code and no C modules based on it); and
--
-- 2. all the other points of the GPL are respected (you offer a copy
--    of psycopg's source code, and so on.)
++psycopg2 and the LGPL
++=====================
++
++psycopg2 is free software: you can redistribute it and/or modify it
++under the terms of the GNU Lesser General Public License as published
++by the Free Software Foundation, either version 3 of the License, or
++(at your option) any later version.
++
++psycopg2 is distributed in the hope that it will be useful, but WITHOUT
++ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
++License for more details.
++
++In addition, as a special exception, the copyright holders give
++permission to link this program with the OpenSSL library (or with
++modified versions of OpenSSL that use the same license as OpenSSL),
++and distribute linked combinations including the two.
++
++You must obey the GNU Lesser General Public License in all respects for
++all of the code used other than OpenSSL. If you modify file(s) with this
++exception, you may extend this exception to your version of the file(s),
++but you are not obligated to do so. If you do not wish to do so, delete
++this exception statement from your version. If you delete this exception
++statement from all source files in the program, then also delete it here.
++
++You should have received a copy of the GNU Lesser General Public License
++along with psycopg2 (see the doc/ directory.)
++If not, see <http://www.gnu.org/licenses/>.
++
  Alternative licenses
  ====================
@@ -44,17 +52,3 @@
      be misrepresented as being the original software.
 . This notice may not be removed or altered from any source distribution.
--
--psycopg is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--GNU General Public License for more details.
--
--Proprietary licenses
--====================
--
--A non-exclusive license is available for companies that want to include
--psycopg in their proprietary products without respecting the spirit of the
--GPL. The price of the license is one day of development done by the author,
--at the consulting fee he applies to his usual customers at the day of the
--request.
 === modified file 'MANIFEST'
 --- MANIFEST	2009-10-12 06:50:00 +0000
 +++ MANIFEST	2010-07-28 20:35:51 +0000
@@ -4,6 +4,8 @@
  LICENSE
  MANIFEST
  MANIFEST.in
++NEWS-2.0
++NEWS-2.2
  README
  setup.cfg
  setup.py
@@ -37,13 +39,73 @@
  debian/rules
  debian/watch
  debian/zope-psycopgda2.dzproduct
++doc/COPYING
++doc/COPYING.LESSER
  doc/ChangeLog-1.x
  doc/HACKING
++doc/Makefile
++doc/README
  doc/SUCCESS
--doc/TODO
--doc/api-screen.css
--doc/async.txt
--doc/extensions.rst
++doc/pep-0249.txt
++doc/psycopg2.txt
++doc/html/.buildinfo
++doc/html/advanced.html
++doc/html/connection.html
++doc/html/cursor.html
++doc/html/errorcodes.html
++doc/html/extensions.html
++doc/html/extras.html
++doc/html/faq.html
++doc/html/genindex.html
++doc/html/index.html
++doc/html/modindex.html
++doc/html/module.html
++doc/html/objects.inv
++doc/html/pool.html
++doc/html/search.html
++doc/html/searchindex.js
++doc/html/tz.html
++doc/html/usage.html
++doc/html/_sources/advanced.txt
++doc/html/_sources/connection.txt
++doc/html/_sources/cursor.txt
++doc/html/_sources/errorcodes.txt
++doc/html/_sources/extensions.txt
++doc/html/_sources/extras.txt
++doc/html/_sources/faq.txt
++doc/html/_sources/index.txt
++doc/html/_sources/module.txt
++doc/html/_sources/pool.txt
++doc/html/_sources/tz.txt
++doc/html/_sources/usage.txt
++doc/html/_static/basic.css
++doc/html/_static/default.css
++doc/html/_static/doctools.js
++doc/html/_static/file.png
++doc/html/_static/jquery.js
++doc/html/_static/minus.png
++doc/html/_static/plus.png
++doc/html/_static/psycopg.css
++doc/html/_static/pygments.css
++doc/html/_static/searchtools.js
++doc/src/Makefile
++doc/src/advanced.rst
++doc/src/conf.py
++doc/src/connection.rst
++doc/src/cursor.rst
++doc/src/errorcodes.rst
++doc/src/extensions.rst
++doc/src/extras.rst
++doc/src/faq.rst
++doc/src/index.rst
++doc/src/module.rst
++doc/src/pool.rst
++doc/src/tz.rst
++doc/src/usage.rst
++doc/src/_static/psycopg.css
++doc/src/tools/stitch_text.py
++doc/src/tools/lib/dbapi_extension.py
++doc/src/tools/lib/sql_role.py
  examples/binary.py
  examples/copy_from.py
  examples/copy_to.py
@@ -84,6 +146,8 @@
  psycopg/adapter_mxdatetime.h
  psycopg/adapter_pboolean.c
  psycopg/adapter_pboolean.h
++psycopg/adapter_pdecimal.c
++psycopg/adapter_pdecimal.h
  psycopg/adapter_pfloat.c
  psycopg/adapter_pfloat.h
  psycopg/adapter_qstring.c
@@ -95,6 +159,8 @@
  psycopg/cursor.h
  psycopg/cursor_int.c
  psycopg/cursor_type.c
++psycopg/green.c
++psycopg/green.h
  psycopg/lobject.h
  psycopg/lobject_int.c
  psycopg/lobject_type.c
@@ -129,16 +195,20 @@
  psycopg2da/psycopg2da-configure.zcml
  psycopg2da/tests.py
  scripts/buildtypes.py
--scripts/ext2html.py
--scripts/makedocs.py
++scripts/make_errorcodes.py
  scripts/maketypes.sh
  tests/__init__.py
  tests/bugX000.py
++tests/bug_gc.py
  tests/dbapi20.py
  tests/extras_dictcursor.py
++tests/test_async.py
  tests/test_connection.py
++tests/test_copy.py
  tests/test_dates.py
++tests/test_green.py
  tests/test_lobject.py
++tests/test_notify.py
  tests/test_psycopg2_dbapi20.py
  tests/test_quote.py
  tests/test_transaction.py
 === modified file 'MANIFEST.in'
 --- MANIFEST.in	2007-06-18 22:44:12 +0000
 +++ MANIFEST.in	2010-07-28 20:35:51 +0000
@@ -5,9 +5,12 @@
  recursive-include psycopg2da *
  recursive-include examples *.py somehackers.jpg whereareyou.jpg
  recursive-include debian *
--recursive-include doc TODO HACKING SUCCESS ChangeLog-1.x async.txt
--recursive-include doc *.rst *.css *.html
++recursive-include doc README TODO HACKING SUCCESS COPYING* ChangeLog-1.x pep-0249.txt
++recursive-include doc *.txt *.html *.css *.js Makefile
++recursive-include doc/src *.rst *.py *.css Makefile
++recursive-include doc/html *
++prune doc/src/_build
  recursive-include scripts *.py *.sh
  include scripts/maketypes.sh scripts/buildtypes.py
--include AUTHORS README INSTALL LICENSE ChangeLog
++include AUTHORS README INSTALL LICENSE NEWS-2.0 NEWS-2.2 ChangeLog
  include PKG-INFO MANIFEST.in MANIFEST setup.py setup.cfg
 === added file 'NEWS-2.0'
 --- NEWS-2.0	1970-01-01 00:00:00 +0000
 +++ NEWS-2.0	2010-07-28 20:35:51 +0000
@@ -0,0 +1,586 @@
++What's new in psycopg 2.0.14
++----------------------------
++
++* New features:
++  - Support for adapting tuples to PostgreSQL arrays is now enabled by
++    default and does not require importing psycopg2.extensions anymore.
++  - "can't adapt" error message now includes full type information.
++  - Thank to Daniele Varrazzo (piro) psycopg2's source package now includes
++    full documentation in HTML and plain text format.
++
++* Bug fixes:
++  - No loss of precision when using floats anymore.
++  - decimal.Decimal "nan" and "infinity" correctly converted to PostgreSQL
++    numeric NaN values (note that PostgreSQL numeric type does not support
++    infinity but just NaNs.)
++  - psycopg2.extensions now includes Binary.
++
++* It seems we're good citizens of the free software ecosystem and that big
++  big big companies and people ranting on the pgsql-hackers mailing list
++  we'll now not dislike us. *g* (See LICENSE file for the details.)
++
++
++What's new in psycopg 2.0.13
++----------------------------
++
++* New features:
++  - Support for UUID arrays.
++  - It is now possible to build psycopg linking to a static libpq
++    library.
++
++* Bug fixes:
++  - Fixed a deadlock related to using the same connection with
++    multiple cursors from different threads.
++  - Builds again with MSVC.
++
++
++What's new in psycopg 2.0.12
++----------------------------
++
++* New features:
++  - The connection object now has a reset() method that can be used to
++    reset the connection to its default state.
++
++* Bug fixes:
++  - copy_to() and copy_from() now accept a much larger number of columns.
++  - Fixed PostgreSQL version detection.
++  - Fixed ZPsycopgDA version check.
++  - Fixed regression in ZPsycopgDA that made it behave wrongly when
++    receiving serialization errors: now the query is re-issued as it
++    should be by propagating the correct exception to Zope.
++  - Writing "large" large objects should now work.
++
++
++What's new in psycopg 2.0.11
++----------------------------
++
++* New features:
++  - DictRow and RealDictRow now use less memory. If you inherit on them
++    remember to set __slots__ for your new attributes or be prepare to
++    go back to old memory usage.
++
++* Bug fixes:
++  - Fixed exeception in setup.py.
++  - More robust detection of PostgreSQL development versions.
++  - Fixed exception in RealDictCursor, introduced in 2.0.10.
++
++
++What's new in psycopg 2.0.10
++----------------------------
++
++* New features:
++  - A specialized type-caster that can parse time zones with seconds is
++    now available. Note that after enabling it (see extras.py) "wrong"
++    time zones will be parsed without raising an exception but the
++    result will be rounded.
++  - DictCursor can be used as a named cursor.
++  - DictRow now implements more dict methods.
++  - The connection object now expose PostgreSQL server version as the
++    .server_version attribute and the protocol version used as
++    .protocol_version.
++  - The connection object has a .get_parameter_status() methods that
++    can be used to obtain useful information from the server.
++
++* Bug fixes:
++  - None is now correctly always adapted to NULL.
++  - Two double memory free errors provoked by multithreading and
++    garbage collection are now fixed.
++  - Fixed usage of internal Python code in the notice processor; this
++    should fix segfaults when receiving a lot of notices in
++    multithreaded programs.
++  - Should build again on MSVC and Solaris.
++  - Should build with development versions of PostgreSQL (ones with
++    -devel version string.)
++  - Fixed some tests that failed even when psycopg was right.
++
++
++What's new in psycopg 2.0.9
++---------------------------
++
++* New features:
++  - "import psycopg2.extras" to get some support for handling times
++    and timestamps with seconds in the time zone offset.
++  - DictCursors can now be used as named cursors.
++
++* Bug fixes:
++  - register_type() now accept an explicit None as its second parameter.
++  - psycopg2 should build again on MSVC and Solaris.
++
++
++What's new in psycopg 2.0.9
++---------------------------
++
++* New features:
++  - COPY TO/COPY FROM queries now can be of any size and psycopg will
++    correctly quote separators.
++  - float values Inf and NaN are now correctly handled and can
++    round-trip to the database.
++  - executemany() now return the numer of total INSERTed or UPDATEd
++    rows. Note that, as it has always been, executemany() should not
++    be used to execute multiple SELECT statements and while it will
++    execute the statements without any problem, it will return the
++    wrong value.
++  - copy_from() and copy_to() can now use quoted separators.
++  - "import psycopg2.extras" to get UUID support.
++
++* Bug fixes:
++  - register_type() now works on connection and cursor subclasses.
++  - fixed a memory leak when using lobjects.
++
++
++What's new in psycopg 2.0.8
++---------------------------
++
++* New features:
++  - The connection object now has a get_backend_pid() method that
++    returns the current PostgreSQL connection backend process PID.
++  - The PostgreSQL large object API has been exposed through the
++    Cursor.lobject() method.
++
++* Bug fixes:
++  - Some fixes to ZPsycopgDA have been merged from the Debian package.
++  - A memory leak was fixed in Cursor.executemany().
++  - A double free was fixed in pq_complete_error(), that caused crashes
++    under some error conditions.
++
++What's new in psycopg 2.0.7
++---------------------------
++
++* Improved error handling:
++  - All instances of psycopg2.Error subclasses now have pgerror,
++    pgcode and cursor attributes.  They will be set to None if no
++    value is available.
++  - Exception classes are now chosen based on the SQLSTATE value from
++    the result.  (#184)
++  - The commit() and rollback() methods now set the pgerror and pgcode
++    attributes on exceptions. (#152)
++  - errors from commit() and rollback() are no longer considered
++    fatal. (#194)
++  - If a disconnect is detected during execute(), an exception will be
++    raised at that point rather than resulting in "ProgrammingError:
++    no results to fetch" later on. (#186)
++
++* Better PostgreSQL compatibility:
++  - If the server uses standard_conforming_strings, perform
++    appropriate quoting.
++  - BC dates are now handled if psycopg is compiled with mxDateTime
++    support.  If using datetime, an appropriate ValueError is
++    raised. (#203)
++
++* Other bug fixes:
++  - If multiple sub-interpreters are in use, do not share the Decimal
++    type between them. (#192)
++  - Buffer objects obtained from psycopg are now accepted by psycopg
++    too, without segfaulting. (#209)
++  - A few small changes were made to improve DB-API compatibility.
++    All the dbapi20 tests now pass.
++
++* Miscellaneous:
++  - The PSYCOPG_DISPLAY_SIZE option is now off by default.  This means
++    that display size will always be set to "None" in
++    cursor.description.  Calculating the display size was expensive,
++    and infrequently used so this should improve performance.
++  - New QueryCanceledError and TransactionRollbackError exceptions
++    have been added to the psycopg2.extensions module.  They can be
++    used to detect statement timeouts and deadlocks respectively.
++  - Cursor objects now have a "closed" attribute. (#164)
++  - If psycopg has been built with debug support, it is now necessary
++    to set the PSYCOPG_DEBUG environment variable to turn on debug
++    spew.
++
++What's new in psycopg 2.0.6
++---------------------------
++
++* Better support for PostgreSQL, Python and win32:
++  - full support for PostgreSQL 8.2, including NULLs in arrays
++  - support for almost all existing PostgreSQL encodings
++  - full list of PostgreSQL error codes available by importing the
++    psycopg2.errorcodes module
++  - full support for Python 2.5 and 64 bit architectures
++  - better build support on win32 platform
++
++* Support for per-connection type-casters (used by ZPsycopgDA too, this
++  fixes a long standing bug that made different connections use a random
++  set of date/time type-casters instead of the configured one.)
++
++* Better management of times and dates both from Python and in Zope.
++
++* copy_to and copy_from now take an extra "columns" parameter.
++
++* Python tuples are now adapted to SQL sequences that can be used with
++  the "IN" operator by default if the psycopg2.extensions module is
++  imported (i.e., the SQL_IN adapter was moved from extras to extensions.)
++
++* Fixed some small buglets and build glitches:
++  - removed double mutex destroy
++  - removed all non-constant initializers
++  - fixed PyObject_HEAD declarations to avoid memory corruption
++    on 64 bit architectures
++  - fixed several Python API calls to work on 64 bit architectures
++  - applied compatibility macros from PEP 353
++  - now using more than one argument format raise an error instead of
++    a segfault
++
++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
++---------------------------
++
++* Fixed float conversion bug introduced in 2.0.3.
++
++What's new in psycopg 2.0.3
++---------------------------
++
++* Fixed various buglets and a memory leak (see ChangeLog for details)
++
++What's new in psycopg 2.0.2
++---------------------------
++
++* Fixed a bug in array typecasting that sometimes made psycopg forget about
++  the last element in the array.
++
++* Fixed some minor buglets in string memory allocations.
++
++* Builds again with compilers different from gcc (#warning about PostgreSQL
++  version is issued only if __GCC__ is defined.)
++
++What's new in psycopg 2.0.1
++---------------------------
++
++* ZPsycopgDA now actually loads.
++
++What's new in psycopg 2.0
++-------------------------
++
++* Fixed handle leak on win32.
++
++* If available the new "safe" encoding functions of libpq are used.
++
++* django and tinyerp people, please switch to psycopg 2 _without_
++  using a psycopg 1 compatibility layer (this release was anticipated
++  so that you all stop grumbling about psycopg 2 is still in beta.. :)
++
++What's new in psycopg 2.0 beta 7
++--------------------------------
++
++* Ironed out last problems with times and date (should be quite solid now.)
++
++* Fixed problems with some arrays.
++
++* Slightly better ZPsycopgDA (no more double connection objects in the menu
++  and other minor fixes.)
++
++* ProgrammingError exceptions now have three extra attributes: .cursor
++  (it is possible to access the query that caused the exception using
++  error.cursor.query), .pgerror and .pgcode (PostgreSQL original error
++  text and code.)
++
++* The build system uses pg_config when available.
++
++* Documentation in the doc/ directory! (With many kudos to piro.)
++
++What's new in psycopg 2.0 beta 6
++--------------------------------
++
++* Support for named cursors (see examples/fetch.py).
++
++* Safer parsing of time intervals.
++
++* Better parsing of times and dates, no more locale problems.
++
++* Should now play well with py2exe and similar tools.
++
++* The "decimal" module is now used if available under Python 2.3.
++
++What's new in psycopg 2.0 beta 5
++--------------------------------
++
++* Fixed all known bugs.
++
++* The initial isolation level is now read from the server and
++  .set_isolation_level() now takes values defined in psycopg2.extensions.
++
++* .callproc() implemented as a SELECT of the given procedure.
++
++* Better docstrings for a few functions/methods.
++
++* Some time-related functions like psycopg2.TimeFromTicks() now take the
++  local timezone into account. Also a tzinfo object (as per datetime module
++  specifications) can be passed to the psycopg2.Time and psycopg2.Datetime
++  constructors.
++
++* All classes have been renamed to exist in the psycopg2._psycopg module,
++  to fix problems with automatic documentation generators like epydoc.
++
++* NOTIFY is correctly trapped (see examples/notify.py for example code.)
++
++What's new in psycopg 2.0 beta 4
++--------------------------------
++
++* psycopg module is now named psycopg2.
++
++* No more segfaults when a UNICODE query can't be converted to the
++  backend encoding.
++
++* No more segfaults on empty queries.
++
++* psycopg2.connect() now takes an integer for the port keyword parameter.
++
++* "python setup.py bdist_rpm" now works.
++
++* Fixed lots of small bugs, see ChangeLog for details.
++
++What's new in psycopg 2.0 beta 3
++--------------------------------
++
++* ZPsycopgDA now works (except table browsing.)
++
++* psycopg build again on Python 2.2.
++
++What's new in psycopg 2.0 beta 2
++--------------------------------
++
++* Fixed ZPsycopgDA version check (ZPsycopgDA can now be imported in
++  Zope.)
++
++* psycopg.extras.DictRow works even after a new query on the generating
++  cursor.
++
++* Better setup.py for win32 (should build with MSCV or mingw.)
++
++* Generic fixed and memory leaks plugs.
++
++What's new in psycopg 2.0 beta 1
++--------------------------------
++
++* Officially in beta (i.e., no new features will be added.)
++
++* Array support: list objects can be passed as bound variables and are
++  correctly returned for array columns.
++
++* Added the psycopg.psycopg1 compatibility module (if you want instant
++  psycopg 1 compatibility just "from psycopg import psycopg1 as psycopg".)
++
++* Complete support for BYTEA columns and buffer objects.
++
++* Added error codes to error messages.
++
++* The AsIs adapter is now exported by default (also Decimal objects are
++  adapted using the AsIs adapter (when str() is called on them they
++  already format themselves using the right precision and scale.)
++
++* The connect() function now takes "connection_factory" instead of
++  "factory" as keyword argument.
++
++* New setup.py code to build on win32 using mingw and better error
++  messages on missing datetime headers,
++
++* Internal changes that allow much better user-defined type casters.
++
++* A lot of bugfixes (binary, datetime, 64 bit arches, GIL, .executemany())
++
++What's new in psycopg 1.99.13
++-----------------------------
++
++* Added missing .executemany() method.
++
++* Optimized type cast from PostgreSQL to Python (psycopg should be even
++  faster than before.)
++
++What's new in psycopg 1.99.12
++-----------------------------
++
++* .rowcount should be ok and in sync with psycopg 1.
++
++* Implemented the new COPY FROM/COPY TO code when connection to the
++  backend using libpq protocol 3 (this also removes all asprintf calls:
++  build on win32 works again.) A protocol 3-enabled psycopg *can*
++  connect to an old protocol 2 database and will detect it and use the
++  right code.
++
++* getquoted() called for real by the mogrification code.
++
++What's new in psycopg 1.99.11
++-----------------------------
++
++* 'cursor' argument in .cursor() connection method renamed to
++  'cursor_factory'.
++
++* changed 'tuple_factory' cursor attribute name to 'row_factory'.
++
++* the .cursor attribute is gone and connections and cursors are propely
++  gc-managed.
++
++* fixes to the async core.
++
++What's new in psycopg 1.99.10
++-----------------------------
++
++* The adapt() function now fully supports the adaptation protocol
++  described in PEP 246. Note that the adapters registry now is indexed
++  by (type, protocol) and not by type alone. Change your adapters
++  accordingly.
++
++* More configuration options moved from setup.py to setup.cfg.
++
++* Fixed two memory leaks: one in cursor deallocation and one in row
++  fetching (.fetchXXX() methods.)
++
++What's new in psycopg 1.99.9
++----------------------------
++
++* Added simple pooling code (psycopg.pool module); see the reworked
++  examples/threads.py for example code.
++
++* Added DECIMAL typecaster to convert postgresql DECIMAL and NUMERIC
++  types (i.e, all types with an OID of NUMERICOID.) Note that the
++  DECIMAL typecaster does not set scale and precision on the created
++  objects but uses Python defaults.
++
++* ZPsycopgDA back in and working using the new pooling code.
++
++* Isn't that enough? :)
++
++What's new in psycopg 1.99.8
++----------------------------
++
++* added support for UNICODE queries.
++
++* added UNICODE typecaster; to activate it just do:
++
++    psycopg.extensions.register_type(psycopg.extensions.UNICODE)
++
++  Note that the UNICODE typecaster override the STRING one, so it is
++  not activated by default.
++
++* cursors now really support the iterator protocol.
++
++* solved the rounding errors in time conversions.
++
++* now cursors support .fileno() and .isready() methods, to be used in
++  select() calls.
++
++* .copy_from() and .copy_in() methods are back in (still using the old
++  protocol, will be updated to use new one in next releasae.)
++
++* fixed memory corruption bug reported on win32 platform.
++
++What's new in psycopg 1.99.7
++----------------------------
++
++* added support for tuple factories in cursor objects (removed factory
++  argument in favor of a .tuple_factory attribute on the cursor object);
++  see the new module psycopg.extras for a cursor (DictCursor) that
++  return rows as objects that support indexing both by position and
++  column name.
++
++* added support for tzinfo objects in datetime.timestamp objects: the
++  PostgreSQL type "timestamp with time zone" is converted to
++  datetime.timestamp with a FixedOffsetTimezone initialized as necessary.
++
++What's new in psycopg 1.99.6
++----------------------------
++
++* sslmode parameter from 1.1.x
++
++* various datetime conversion improvements.
++
++* now psycopg should compile without mx or without native datetime
++  (not both, obviously.)
++
++* included various win32/MSVC fixes (pthread.h changes, winsock2
++  library, include path in setup.py, etc.)
++
++* ported interval fixes from 1.1.14/1.1.15.
++
++* the last query executed by a cursor is now available in the
++  .query attribute.
++
++* conversion of unicode strings to backend encoding now uses a table
++  (that still need to be filled.)
++
++* cursors now have a .mogrify() method that return the query string
++  instead of executing it.
++
++* connection objects now have a .dsn read-only attribute that holds the
++  connection string.
++
++* moved psycopg C module to _psycopg and made psycopg a python module:
++  this allows for a neat separation of DBAPI-2.0 functionality and psycopg
++  extensions; the psycopg namespace will be also used to provide
++  python-only extensions (like the pooling code, some ZPsycopgDA support
++  functions and the like.)
++
++What's new in psycopg 1.99.3
++----------------------------
++
++* added support for python 2.3 datetime types (both ways) and made datetime
++  the default set of typecasters when available.
++
++* added example: dt.py.
++
++What's new in psycopg 1.99.3
++----------------------------
++
++* initial working support for unicode bound variables: UTF-8 and latin-1
++  backend encodings are natively supported (and the encoding.py example even
++  works!)
++
++* added .set_client_encoding() method on the connection object.
++
++* added examples: encoding.py, binary.py, lastrowid.py.
++
++What's new in psycopg 1.99.2
++----------------------------
++
++* better typecasting:
++  - DateTimeDelta used for postgresql TIME (merge from 1.1)
++  - BYTEA now is converted to a real buffer object, not to a string
++
++* buffer objects are now adapted into Binary objects automatically.
++
++* ported scroll method from 1.1 (DBAPI-2.0 extension for cursors)
++
++* initial support for some DBAPI-2.0 extensions:
++  - .rownumber attribute for cursors
++  - .connection attribute for cursors
++  - .next() and .__iter__() methods to have cursors support the iterator
++    protocol
++  - all exception objects are exported to the connection object
++
++What's new in psycopg 1.99.1
++----------------------------
++
++* implemented microprotocols to adapt arbitrary types to the interface used by
++  psycopg to bind variables in execute;
++
++* moved qstring, pboolean and mxdatetime to the new adapter layout (binary is
++  still missing; python 2.3 datetime needs to be written).
++
++
++What's new in psycopg 1.99.0
++----------------------------
++
++* reorganized the whole source tree;
++
++* async core is in place;
++
++* splitted QuotedString objects from mx stuff;
++
++* dropped autotools and moved to pythonic setup.py (needs work.)
 === added file 'NEWS-2.2'
 --- NEWS-2.2	1970-01-01 00:00:00 +0000
 +++ NEWS-2.2	2010-07-28 20:35:51 +0000
@@ -0,0 +1,39 @@
++What's new in psycopg 2.2.1
++---------------------------
++
++* Bux fixes:
++  - psycopg now builds again on MS Windows.
++
++
++What's new in psycopg 2.2.0
++---------------------------
++
++This is the first release of the new 2.2 series, supporting not just one but
++two different ways of executing asynchronous queries, thanks to Jan and Daniele
++(with a little help from me and others, but they did 99% of the work so they
++deserve their names here in the news.)
++
++psycopg now supports both classic select() loops and "green" coroutine
++libraries. It is all in the documentation, so just point your browser to
++doc/html/advanced.html.
++
++* Other new features:
++  - truncate() method for lobjects.
++  - COPY functions are now a little bit faster.
++  - All builtin PostgreSQL to Python typecasters are now available from the
++    psycopg2.extensions module.
++  - Notifications from the backend are now available right after the execute()
++    call (before client code needed to call isbusy() to ensure NOTIFY
++    reception.)
++  - Better timezone support.
++  - Lots of documentation updates.
++
++* Bug fixes:
++  - Fixed some gc/refcounting problems.
++  - Fixed reference leak in NOTIFY reception.
++  - Fixed problem with PostgreSQL not casting string literals to the correct
++    types in some situations: psycopg now add an explicit cast to dates, times
++    and bytea representations.
++  - Fixed TimestampFromTicks() and TimeFromTicks() for seconds >= 59.5.
++  - Fixed spurious exception raised when calling C typecasters from Python
++    ones.
 === modified file 'PKG-INFO'
 --- PKG-INFO	2009-10-12 06:50:00 +0000
 +++ PKG-INFO	2010-07-28 20:35:51 +0000
@@ -1,6 +1,6 @@
  Metadata-Version: 1.0
  Name: psycopg2
--Version: 2.0.13
++Version: 2.2.1
  Summary: Python-PostgreSQL Database Adapter
  Home-page: http://initd.org/tracker/psycopg
  Author: Federico Di Gregorio
@@ -20,9 +20,9 @@
          brave programmer.
  Platform: any
--Classifier: Development Status :: 4 - Beta
++Classifier: Development Status :: 5 - Production/Stable
  Classifier: Intended Audience :: Developers
--Classifier: License :: OSI Approved :: GNU General Public License (GPL)
++Classifier: License :: OSI Approved :: GNU Lesser General Public License (LGPL)
  Classifier: License :: OSI Approved :: Zope Public License
  Classifier: Programming Language :: Python
  Classifier: Programming Language :: C
 === modified file 'README'
 --- README	2006-08-09 10:28:30 +0000
 +++ README	2010-07-28 20:35:51 +0000
@@ -1,28 +1,32 @@
--psycopg - Python-PostgreSQL Database Adapter
++psycopg2 - Python-PostgreSQL Database Adapter
  ********************************************
--psycopg is a PostgreSQL database adapter for the Python programming
++psycopg2 is a PostgreSQL database adapter for the Python programming
  language. This is version 2, a complete rewrite of the original code to
  provide new-style classes for connection and cursor objects and other
--sweet candies. Like the original, psycopg 2 was written with the aim of
++sweet candies. Like the original, psycopg2 was written with the aim of
  being very small and fast, and stable as a rock.
--psycopg is different from the other database adapter because it was
++psycopg2 is different from the other database adapter because it was
  designed for heavily multi-threaded applications that create and destroy
  lots of cursors and make a conspicuous number of concurrent INSERTs or
--UPDATEs. psycopg 2 also provide full asycronous operations for the really
++UPDATEs. psycopg2 also provide full asycronous operations for the really
  brave programmer.
  There are confirmed reports of psycopg 1.x compiling and running on Linux
--and FreeBSD on i386, Solaris, MacOS X and win32 architectures. psycopg 2
++and FreeBSD on i386, Solaris, MacOS X and win32 architectures. psycopg2
  does not introduce build-wise incompatible changes so it should be able to
  compile on all architectures just as its predecessor did.
--Now go read the INSTALL file. More information about psycopg extensions to
++Now go read the INSTALL file. More information about psycopg2 extensions to
  the DBAPI-2.0 is available in the files located in the doc/ direcory.
++Example code can be found in the examples/ directory. If you make any changes
++to the code make sure to run the unit tests localed in tests/.
--psycopg is free software ("free as in freedom" but I like beer too.)
--Licensing information is available in the LICENSE file.
++psycopg2 is free software ("free as in freedom" but I like beer too.)
++It is licensed under the GNU Lesser General Public License, version 3 or
++later plus an exception to allow OpenSSL (libpq) linking; see LICENSE for
++more details.
  Contributors
 === modified file 'ZPsycopgDA/DA.py'
 --- ZPsycopgDA/DA.py	2009-10-12 06:50:00 +0000
 +++ ZPsycopgDA/DA.py	2010-07-28 20:35:51 +0000
@@ -1,24 +1,22 @@
  # ZPsycopgDA/DA.py - ZPsycopgDA Zope product: Database Connection
+ #
--# Copyright (C) 2004 Federico Di Gregorio <fog@initd.org>
--#
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by the
--# Free Software Foundation; either version 2, or (at your option) any later
--# version.
--#
--# Or, at your option this program (ZPsycopgDA) can be distributed under the
--# Zope Public License (ZPL) Version 1.0, as published on the Zope web site,
--# http://www.zope.org/Resources/ZPL.
--#
--# This program is distributed in the hope that it will be useful, but
--# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTIBILITY
--# or FITNESS FOR A PARTICULAR PURPOSE.
--#
--# See the LICENSE file for details.
--
--
--ALLOWED_PSYCOPG_VERSIONS = ('2.0.7','2.0.8','2.0.9','2.0.10', '2.0.11', '2.0.12', '2.0.13')
++# Copyright (C) 2004-2010 Federico Di Gregorio  <fog@debian.org>
++#
++# psycopg2 is free software: you can redistribute it and/or modify it
++# under the terms of the GNU Lesser General Public License as published
++# by the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++#
++# psycopg2 is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
++# License for more details.
++
++# Import modules needed by _psycopg to allow tools like py2exe to do
++# their work without bothering about the module dependencies.
++
++
++ALLOWED_PSYCOPG_VERSIONS = ('2.2.0','2.2.1')
  import sys
  import time
 === modified file 'ZPsycopgDA/__init__.py'
 --- ZPsycopgDA/__init__.py	2006-08-09 10:28:30 +0000
 +++ ZPsycopgDA/__init__.py	2010-07-28 20:35:51 +0000
@@ -1,21 +1,19 @@
  # ZPsycopgDA/__init__.py - ZPsycopgDA Zope product
+ #
--# Copyright (C) 2004 Federico Di Gregorio <fog@initd.org>
--#
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by the
--# Free Software Foundation; either version 2, or (at your option) any later
--# version.
--#
--# Or, at your option this program (ZPsycopgDA) can be distributed under the
--# Zope Public License (ZPL) Version 1.0, as published on the Zope web site,
--# http://www.zope.org/Resources/ZPL.
--#
--# This program is distributed in the hope that it will be useful, but
--# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTIBILITY
--# or FITNESS FOR A PARTICULAR PURPOSE.
--#
--# See the LICENSE file for details.
++# Copyright (C) 2004-2010 Federico Di Gregorio  <fog@debian.org>
++#
++# psycopg2 is free software: you can redistribute it and/or modify it
++# under the terms of the GNU Lesser General Public License as published
++# by the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++#
++# psycopg2 is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
++# License for more details.
++
++# Import modules needed by _psycopg to allow tools like py2exe to do
++# their work without bothering about the module dependencies.
  __doc__ = "ZPsycopg Database Adapter Registration."
  __version__ = '2.0'
 === modified file 'ZPsycopgDA/db.py'
 --- ZPsycopgDA/db.py	2009-08-27 18:05:48 +0000
 +++ ZPsycopgDA/db.py	2010-07-28 20:35:51 +0000
@@ -1,21 +1,19 @@
  # ZPsycopgDA/db.py - query execution
+ #
--# Copyright (C) 2004 Federico Di Gregorio <fog@initd.org>
--#
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by the
--# Free Software Foundation; either version 2, or (at your option) any later
--# version.
--#
--# Or, at your option this program (ZPsycopgDA) can be distributed under the
--# Zope Public License (ZPL) Version 1.0, as published on the Zope web site,
--# http://www.zope.org/Resources/ZPL.
--#
--# This program is distributed in the hope that it will be useful, but
--# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTIBILITY
--# or FITNESS FOR A PARTICULAR PURPOSE.
--#
--# See the LICENSE file for details.
++# Copyright (C) 2004-2010 Federico Di Gregorio  <fog@debian.org>
++#
++# psycopg2 is free software: you can redistribute it and/or modify it
++# under the terms of the GNU Lesser General Public License as published
++# by the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++#
++# psycopg2 is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
++# License for more details.
++
++# Import modules needed by _psycopg to allow tools like py2exe to do
++# their work without bothering about the module dependencies.
  from Shared.DC.ZRDB.TM import TM
  from Shared.DC.ZRDB import dbi_db
@@ -171,15 +169,15 @@
                          c.execute(qs)
                  except TransactionRollbackError:
                      # Ha, here we have to look like we are the ZODB raising conflict errrors, raising ZPublisher.Publish.Retry just doesn't work
--                    logging.debug("Serialization Error, retrying transaction", exc_info=True)
++                    #logging.debug("Serialization Error, retrying transaction", exc_info=True)
                      raise ConflictError("TransactionRollbackError from psycopg2")
                  except psycopg2.OperationalError:
--                    logging.exception("Operational error on connection, closing it.")
++                    #logging.exception("Operational error on connection, closing it.")
                      try:
                          # Only close our connection
                          self.putconn(True)
                      except:
--                        logging.debug("Something went wrong when we tried to close the pool", exc_info=True)
++                        #logging.debug("Something went wrong when we tried to close the pool", exc_info=True)
                          pass
                  if c.description is not None:
                      nselects += 1
 === modified file 'ZPsycopgDA/pool.py'
 --- ZPsycopgDA/pool.py	2006-08-09 10:28:30 +0000
 +++ ZPsycopgDA/pool.py	2010-07-28 20:35:51 +0000
@@ -1,24 +1,22 @@
  # ZPsycopgDA/pool.py - ZPsycopgDA Zope product: connection pooling
+ #
--# Copyright (C) 2004 Federico Di Gregorio <fog@initd.org>
--#
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by the
--# Free Software Foundation; either version 2, or (at your option) any later
--# version.
--#
--# Or, at your option this program (ZPsycopgDA) can be distributed under the
--# Zope Public License (ZPL) Version 1.0, as published on the Zope web site,
--# http://www.zope.org/Resources/ZPL.
--#
--# This program is distributed in the hope that it will be useful, but
--# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTIBILITY
--# or FITNESS FOR A PARTICULAR PURPOSE.
--#
--# See the LICENSE file for details.
--
--# all the connections are held in a pool of pools, directly accessible by the
--# ZPsycopgDA code in db.py
++# Copyright (C) 2004-2010 Federico Di Gregorio  <fog@debian.org>
++#
++# psycopg2 is free software: you can redistribute it and/or modify it
++# under the terms of the GNU Lesser General Public License as published
++# by the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++#
++# psycopg2 is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
++# License for more details.
++
++# Import modules needed by _psycopg to allow tools like py2exe to do
++# their work without bothering about the module dependencies.
++
++# All the connections are held in a pool of pools, directly accessible by the
++# ZPsycopgDA code in db.py.
  import threading
  import psycopg2.pool
 === modified file 'debian/changelog'
 --- debian/changelog	2010-04-16 10:05:03 +0000
 +++ debian/changelog	2010-07-28 20:35:51 +0000
@@ -1,3 +1,26 @@
++psycopg2 (2.2.1-1ubuntu1) maverick; urgency=low
++
++  * Merge from Debian (LP: #611040). Remaining changes:
++    debian/control, debian/rules: Install a seperate testsuite package.
++
++ -- Mikhail Turov <groldster@gmail.com>  Wed, 28 Jul 2010 21:20:45 +0100
++
++psycopg2 (2.2.1-1) unstable; urgency=low
++
++  * New upstream release. (Closes: #582823)
++  * debian/control:
++    - bumped Standards-Version to 3.9.0, no changes required.
++    - removed the zope-psycopg2da binary package. (Closes: #583293)
++
++ -- Fabio Tranchitella <kobold@debian.org>  Fri, 02 Jul 2010 15:04:19 +0200
++
++psycopg2 (2.0.14-1) unstable; urgency=low
++
++  * New upstream release.
++  * debian/control: bumped Standards-Version to 3.8.5, no changes required.
++
++ -- Fabio Tranchitella <kobold@debian.org>  Sat, 10 Apr 2010 10:32:45 +0200
++
  psycopg2 (2.0.13-2ubuntu2) lucid; urgency=low
    * Drop the zope2 package as we have no zope2 in lucid.
@@ -388,13 +411,6 @@
   -- Federico Di Gregorio <fog@debian.org>  Fri,  1 Aug 2003 11:50:57 +0200
--psycopg (1.1.5.1-1.1) unstable; urgency=low
--
--  * NMU
--  * Update for python2.3 as the default python version (closes: #205746).
--
-- -- Matthias Klose <doko@debian.org>  Fri, 22 Aug 2003 00:02:25 +0200
--
  psycopg (1.1.7-1) unstable; urgency=low
    * New upstream release.
@@ -408,6 +424,13 @@
   -- Federico Di Gregorio <fog@initd.org>  Sun, 13 Jul 2003 23:36:04 +0200
++psycopg (1.1.5.1-1.1) unstable; urgency=low
++
++  * NMU
++  * Update for python2.3 as the default python version (closes: #205746).
++
++ -- Matthias Klose <doko@debian.org>  Fri, 22 Aug 2003 00:02:25 +0200
++
  psycopg (1.1.5.1-1) unstable; urgency=low
    * New upstream release.
 === modified file 'debian/control'
 --- debian/control	2010-04-16 10:05:03 +0000
 +++ debian/control	2010-07-28 20:35:51 +0000
@@ -4,7 +4,7 @@
  Build-Depends: debhelper (>= 5.0.37.2), python-all-dev, python-all-dbg, python-central (>= 0.5.0), python (>= 2.3.5-7), python-egenix-mx-base-dev, autoconf, libpq-dev
  Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
  XSBC-Original-Maintainer: Fabio Tranchitella <kobold@debian.org>
--Standards-Version: 3.8.3
++Standards-Version: 3.9.0
  XS-Python-Version: all
  Vcs-Svn: svn://svn.debian.org/python-modules/packages/psycopg2/trunk/
  Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/psycopg2/trunk/
@@ -13,7 +13,7 @@
  Package: python-psycopg2
  Architecture: any
  Section: python
--Depends: ${python:Depends}, ${shlibs:Depends}, python-egenix-mxdatetime
++Depends: python-egenix-mxdatetime, ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
  Provides: ${python:Provides}
  XB-Python-Version: ${python:Versions}
  Description: Python module for PostgreSQL
@@ -37,7 +37,7 @@
  Priority: extra
  Architecture: any
  Section: debug
--Depends: python-psycopg2 (= ${binary:Version}), python-dbg, ${shlibs:Depends}
++Depends: python-psycopg2 (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends}
  XB-Python-Version: ${python:Versions}
  Description: Python module for PostgreSQL (debug extension)
   psycopg is a PostgreSQL database adapter for the Python programming language
@@ -48,15 +48,6 @@
+  .
   This package contains the extensions built for the Python debug interpreter.
--#Package: zope-psycopgda2
--#Architecture: all
--#Section: zope
--#Depends: ${zope:Depends}, python-psycopg2 (>= ${source:Version})
--#XB-Python-Version: ${python:Versions}
--#Description: Zope database adapter based on python-psycopg2
--# The package contains the PostgreSQL database adapter for Zope 2.7, 2.8 and
--# 2.9 based on the psycopg2 Python module.
--
  Package: python-psycopg2-testsuite
  Architecture: any
  Section: python
 === modified file 'debian/rules'
 --- debian/rules	2010-04-16 10:05:03 +0000
 +++ debian/rules	2010-07-28 20:35:51 +0000
@@ -59,8 +59,6 @@
  	find debian/python-*-dbg -depth -empty -exec rmdir {} \;
  install-indep: build
--	# Zope package
--	#dh_installzope -p zope-psycopgda2 ZPsycopgDA
  # Build architecture-independent files here.
  binary-indep: build install-indep
 === added directory 'debian/source'
 === added file 'debian/source/format'
 --- debian/source/format	1970-01-01 00:00:00 +0000
 +++ debian/source/format	2010-07-28 20:35:51 +0000
@@ -0,0 +1,1 @@
++1.0
 === added file 'doc/COPYING'
 --- doc/COPYING	1970-01-01 00:00:00 +0000
 +++ doc/COPYING	2010-07-28 20:35:51 +0000
@@ -0,0 +1,676 @@
++
++		    GNU GENERAL PUBLIC LICENSE
++		       Version 3, 29 June 2007
++
++ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
++ Everyone is permitted to copy and distribute verbatim copies
++ of this license document, but changing it is not allowed.
++
++			    Preamble
++
++  The GNU General Public License is a free, copyleft license for
++software and other kinds of works.
++
++  The licenses for most software and other practical works are designed
++to take away your freedom to share and change the works.  By contrast,
++the GNU General Public License is intended to guarantee your freedom to
++share and change all versions of a program--to make sure it remains free
++software for all its users.  We, the Free Software Foundation, use the
++GNU General Public License for most of our software; it applies also to
++any other work released this way by its authors.  You can apply it to
++your programs, too.
++
++  When we speak of free software, we are referring to freedom, not
++price.  Our General Public Licenses are designed to make sure that you
++have the freedom to distribute copies of free software (and charge for
++them if you wish), that you receive source code or can get it if you
++want it, that you can change the software or use pieces of it in new
++free programs, and that you know you can do these things.
++
++  To protect your rights, we need to prevent others from denying you
++these rights or asking you to surrender the rights.  Therefore, you have
++certain responsibilities if you distribute copies of the software, or if
++you modify it: responsibilities to respect the freedom of others.
++
++  For example, if you distribute copies of such a program, whether
++gratis or for a fee, you must pass on to the recipients the same
++freedoms that you received.  You must make sure that they, too, receive
++or can get the source code.  And you must show them these terms so they
++know their rights.
++
++  Developers that use the GNU GPL protect your rights with two steps:
++(1) assert copyright on the software, and (2) offer you this License
++giving you legal permission to copy, distribute and/or modify it.
++
++  For the developers' and authors' protection, the GPL clearly explains
++that there is no warranty for this free software.  For both users' and
++authors' sake, the GPL requires that modified versions be marked as
++changed, so that their problems will not be attributed erroneously to
++authors of previous versions.
++
++  Some devices are designed to deny users access to install or run
++modified versions of the software inside them, although the manufacturer
++can do so.  This is fundamentally incompatible with the aim of
++protecting users' freedom to change the software.  The systematic
++pattern of such abuse occurs in the area of products for individuals to
++use, which is precisely where it is most unacceptable.  Therefore, we
++have designed this version of the GPL to prohibit the practice for those
++products.  If such problems arise substantially in other domains, we
++stand ready to extend this provision to those domains in future versions
++of the GPL, as needed to protect the freedom of users.
++
++  Finally, every program is threatened constantly by software patents.
++States should not allow patents to restrict development and use of
++software on general-purpose computers, but in those that do, we wish to
++avoid the special danger that patents applied to a free program could
++make it effectively proprietary.  To prevent this, the GPL assures that
++patents cannot be used to render the program non-free.
++
++  The precise terms and conditions for copying, distribution and
++modification follow.
++
++		       TERMS AND CONDITIONS
++
++  0. Definitions.
++
++  "This License" refers to version 3 of the GNU General Public License.
++
++  "Copyright" also means copyright-like laws that apply to other kinds of
++works, such as semiconductor masks.
++
++  "The Program" refers to any copyrightable work licensed under this
++License.  Each licensee is addressed as "you".  "Licensees" and
++"recipients" may be individuals or organizations.
++
++  To "modify" a work means to copy from or adapt all or part of the work
++in a fashion requiring copyright permission, other than the making of an
++exact copy.  The resulting work is called a "modified version" of the
++earlier work or a work "based on" the earlier work.
++
++  A "covered work" means either the unmodified Program or a work based
++on the Program.
++
++  To "propagate" a work means to do anything with it that, without
++permission, would make you directly or secondarily liable for
++infringement under applicable copyright law, except executing it on a
++computer or modifying a private copy.  Propagation includes copying,
++distribution (with or without modification), making available to the
++public, and in some countries other activities as well.
++
++  To "convey" a work means any kind of propagation that enables other
++parties to make or receive copies.  Mere interaction with a user through
++a computer network, with no transfer of a copy, is not conveying.
++
++  An interactive user interface displays "Appropriate Legal Notices"
++to the extent that it includes a convenient and prominently visible
++feature that (1) displays an appropriate copyright notice, and (2)
++tells the user that there is no warranty for the work (except to the
++extent that warranties are provided), that licensees may convey the
++work under this License, and how to view a copy of this License.  If
++the interface presents a list of user commands or options, such as a
++menu, a prominent item in the list meets this criterion.
++
++  1. Source Code.
++
++  The "source code" for a work means the preferred form of the work
++for making modifications to it.  "Object code" means any non-source
++form of a work.
++
++  A "Standard Interface" means an interface that either is an official
++standard defined by a recognized standards body, or, in the case of
++interfaces specified for a particular programming language, one that
++is widely used among developers working in that language.
++
++  The "System Libraries" of an executable work include anything, other
++than the work as a whole, that (a) is included in the normal form of
++packaging a Major Component, but which is not part of that Major
++Component, and (b) serves only to enable use of the work with that
++Major Component, or to implement a Standard Interface for which an
++implementation is available to the public in source code form.  A
++"Major Component", in this context, means a major essential component
++(kernel, window system, and so on) of the specific operating system
++(if any) on which the executable work runs, or a compiler used to
++produce the work, or an object code interpreter used to run it.
++
++  The "Corresponding Source" for a work in object code form means all
++the source code needed to generate, install, and (for an executable
++work) run the object code and to modify the work, including scripts to
++control those activities.  However, it does not include the work's
++System Libraries, or general-purpose tools or generally available free
++programs which are used unmodified in performing those activities but
++which are not part of the work.  For example, Corresponding Source
++includes interface definition files associated with source files for
++the work, and the source code for shared libraries and dynamically
++linked subprograms that the work is specifically designed to require,
++such as by intimate data communication or control flow between those
++subprograms and other parts of the work.
++
++  The Corresponding Source need not include anything that users
++can regenerate automatically from other parts of the Corresponding
++Source.
++
++  The Corresponding Source for a work in source code form is that
++same work.
++
++  2. Basic Permissions.
++
++  All rights granted under this License are granted for the term of
++copyright on the Program, and are irrevocable provided the stated
++conditions are met.  This License explicitly affirms your unlimited
++permission to run the unmodified Program.  The output from running a
++covered work is covered by this License only if the output, given its
++content, constitutes a covered work.  This License acknowledges your
++rights of fair use or other equivalent, as provided by copyright law.
++
++  You may make, run and propagate covered works that you do not
++convey, without conditions so long as your license otherwise remains
++in force.  You may convey covered works to others for the sole purpose
++of having them make modifications exclusively for you, or provide you
++with facilities for running those works, provided that you comply with
++the terms of this License in conveying all material for which you do
++not control copyright.  Those thus making or running the covered works
++for you must do so exclusively on your behalf, under your direction
++and control, on terms that prohibit them from making any copies of
++your copyrighted material outside their relationship with you.
++
++  Conveying under any other circumstances is permitted solely under
++the conditions stated below.  Sublicensing is not allowed; section 10
++makes it unnecessary.
++
++  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
++
++  No covered work shall be deemed part of an effective technological
++measure under any applicable law fulfilling obligations under article
++11 of the WIPO copyright treaty adopted on 20 December 1996, or
++similar laws prohibiting or restricting circumvention of such
++measures.
++
++  When you convey a covered work, you waive any legal power to forbid
++circumvention of technological measures to the extent such circumvention
++is effected by exercising rights under this License with respect to
++the covered work, and you disclaim any intention to limit operation or
++modification of the work as a means of enforcing, against the work's
++users, your or third parties' legal rights to forbid circumvention of
++technological measures.
++
++  4. Conveying Verbatim Copies.
++
++  You may convey verbatim copies of the Program's source code as you
++receive it, in any medium, provided that you conspicuously and
++appropriately publish on each copy an appropriate copyright notice;
++keep intact all notices stating that this License and any
++non-permissive terms added in accord with section 7 apply to the code;
++keep intact all notices of the absence of any warranty; and give all
++recipients a copy of this License along with the Program.
++
++  You may charge any price or no price for each copy that you convey,
++and you may offer support or warranty protection for a fee.
++
++  5. Conveying Modified Source Versions.
++
++  You may convey a work based on the Program, or the modifications to
++produce it from the Program, in the form of source code under the
++terms of section 4, provided that you also meet all of these conditions:
++
++    a) The work must carry prominent notices stating that you modified
++    it, and giving a relevant date.
++
++    b) The work must carry prominent notices stating that it is
++    released under this License and any conditions added under section
++    7.  This requirement modifies the requirement in section 4 to
++    "keep intact all notices".
++
++    c) You must license the entire work, as a whole, under this
++    License to anyone who comes into possession of a copy.  This
++    License will therefore apply, along with any applicable section 7
++    additional terms, to the whole of the work, and all its parts,
++    regardless of how they are packaged.  This License gives no
++    permission to license the work in any other way, but it does not
++    invalidate such permission if you have separately received it.
++
++    d) If the work has interactive user interfaces, each must display
++    Appropriate Legal Notices; however, if the Program has interactive
++    interfaces that do not display Appropriate Legal Notices, your
++    work need not make them do so.
++
++  A compilation of a covered work with other separate and independent
++works, which are not by their nature extensions of the covered work,
++and which are not combined with it such as to form a larger program,
++in or on a volume of a storage or distribution medium, is called an
++"aggregate" if the compilation and its resulting copyright are not
++used to limit the access or legal rights of the compilation's users
++beyond what the individual works permit.  Inclusion of a covered work
++in an aggregate does not cause this License to apply to the other
++parts of the aggregate.
++
++  6. Conveying Non-Source Forms.
++
++  You may convey a covered work in object code form under the terms
++of sections 4 and 5, provided that you also convey the
++machine-readable Corresponding Source under the terms of this License,
++in one of these ways:
++
++    a) Convey the object code in, or embodied in, a physical product
++    (including a physical distribution medium), accompanied by the
++    Corresponding Source fixed on a durable physical medium
++    customarily used for software interchange.
++
++    b) Convey the object code in, or embodied in, a physical product
++    (including a physical distribution medium), accompanied by a
++    written offer, valid for at least three years and valid for as
++    long as you offer spare parts or customer support for that product
++    model, to give anyone who possesses the object code either (1) a
++    copy of the Corresponding Source for all the software in the
++    product that is covered by this License, on a durable physical
++    medium customarily used for software interchange, for a price no
++    more than your reasonable cost of physically performing this
++    conveying of source, or (2) access to copy the
++    Corresponding Source from a network server at no charge.
++
++    c) Convey individual copies of the object code with a copy of the
++    written offer to provide the Corresponding Source.  This
++    alternative is allowed only occasionally and noncommercially, and
++    only if you received the object code with such an offer, in accord
++    with subsection 6b.
++
++    d) Convey the object code by offering access from a designated
++    place (gratis or for a charge), and offer equivalent access to the
++    Corresponding Source in the same way through the same place at no
++    further charge.  You need not require recipients to copy the
++    Corresponding Source along with the object code.  If the place to
++    copy the object code is a network server, the Corresponding Source
++    may be on a different server (operated by you or a third party)
++    that supports equivalent copying facilities, provided you maintain
++    clear directions next to the object code saying where to find the
++    Corresponding Source.  Regardless of what server hosts the
++    Corresponding Source, you remain obligated to ensure that it is
++    available for as long as needed to satisfy these requirements.
++
++    e) Convey the object code using peer-to-peer transmission, provided
++    you inform other peers where the object code and Corresponding
++    Source of the work are being offered to the general public at no
++    charge under subsection 6d.
++
++  A separable portion of the object code, whose source code is excluded
++from the Corresponding Source as a System Library, need not be
++included in conveying the object code work.
++
++  A "User Product" is either (1) a "consumer product", which means any
++tangible personal property which is normally used for personal, family,
++or household purposes, or (2) anything designed or sold for incorporation
++into a dwelling.  In determining whether a product is a consumer product,
++doubtful cases shall be resolved in favor of coverage.  For a particular
++product received by a particular user, "normally used" refers to a
++typical or common use of that class of product, regardless of the status
++of the particular user or of the way in which the particular user
++actually uses, or expects or is expected to use, the product.  A product
++is a consumer product regardless of whether the product has substantial
++commercial, industrial or non-consumer uses, unless such uses represent
++the only significant mode of use of the product.
++
++  "Installation Information" for a User Product means any methods,
++procedures, authorization keys, or other information required to install
++and execute modified versions of a covered work in that User Product from
++a modified version of its Corresponding Source.  The information must
++suffice to ensure that the continued functioning of the modified object
++code is in no case prevented or interfered with solely because
++modification has been made.
++
++  If you convey an object code work under this section in, or with, or
++specifically for use in, a User Product, and the conveying occurs as
++part of a transaction in which the right of possession and use of the
++User Product is transferred to the recipient in perpetuity or for a
++fixed term (regardless of how the transaction is characterized), the
++Corresponding Source conveyed under this section must be accompanied
++by the Installation Information.  But this requirement does not apply
++if neither you nor any third party retains the ability to install
++modified object code on the User Product (for example, the work has
++been installed in ROM).
++
++  The requirement to provide Installation Information does not include a
++requirement to continue to provide support service, warranty, or updates
++for a work that has been modified or installed by the recipient, or for
++the User Product in which it has been modified or installed.  Access to a
++network may be denied when the modification itself materially and
++adversely affects the operation of the network or violates the rules and
++protocols for communication across the network.
++
++  Corresponding Source conveyed, and Installation Information provided,
++in accord with this section must be in a format that is publicly
++documented (and with an implementation available to the public in
++source code form), and must require no special password or key for
++unpacking, reading or copying.
++
++  7. Additional Terms.
++
++  "Additional permissions" are terms that supplement the terms of this
++License by making exceptions from one or more of its conditions.
++Additional permissions that are applicable to the entire Program shall
++be treated as though they were included in this License, to the extent
++that they are valid under applicable law.  If additional permissions
++apply only to part of the Program, that part may be used separately
++under those permissions, but the entire Program remains governed by
++this License without regard to the additional permissions.
++
++  When you convey a copy of a covered work, you may at your option
++remove any additional permissions from that copy, or from any part of
++it.  (Additional permissions may be written to require their own
++removal in certain cases when you modify the work.)  You may place
++additional permissions on material, added by you to a covered work,
++for which you have or can give appropriate copyright permission.
++
++  Notwithstanding any other provision of this License, for material you
++add to a covered work, you may (if authorized by the copyright holders of
++that material) supplement the terms of this License with terms:
++
++    a) Disclaiming warranty or limiting liability differently from the
++    terms of sections 15 and 16 of this License; or
++
++    b) Requiring preservation of specified reasonable legal notices or
++    author attributions in that material or in the Appropriate Legal
++    Notices displayed by works containing it; or
++
++    c) Prohibiting misrepresentation of the origin of that material, or
++    requiring that modified versions of such material be marked in
++    reasonable ways as different from the original version; or
++
++    d) Limiting the use for publicity purposes of names of licensors or
++    authors of the material; or
++
++    e) Declining to grant rights under trademark law for use of some
++    trade names, trademarks, or service marks; or
++
++    f) Requiring indemnification of licensors and authors of that
++    material by anyone who conveys the material (or modified versions of
++    it) with contractual assumptions of liability to the recipient, for
++    any liability that these contractual assumptions directly impose on
++    those licensors and authors.
++
++  All other non-permissive additional terms are considered "further
++restrictions" within the meaning of section 10.  If the Program as you
++received it, or any part of it, contains a notice stating that it is
++governed by this License along with a term that is a further
++restriction, you may remove that term.  If a license document contains
++a further restriction but permits relicensing or conveying under this
++License, you may add to a covered work material governed by the terms
++of that license document, provided that the further restriction does
++not survive such relicensing or conveying.
++
++  If you add terms to a covered work in accord with this section, you
++must place, in the relevant source files, a statement of the
++additional terms that apply to those files, or a notice indicating
++where to find the applicable terms.
++
++  Additional terms, permissive or non-permissive, may be stated in the
++form of a separately written license, or stated as exceptions;
++the above requirements apply either way.
++
++  8. Termination.
++
++  You may not propagate or modify a covered work except as expressly
++provided under this License.  Any attempt otherwise to propagate or
++modify it is void, and will automatically terminate your rights under
++this License (including any patent licenses granted under the third
++paragraph of section 11).
++
++  However, if you cease all violation of this License, then your
++license from a particular copyright holder is reinstated (a)
++provisionally, unless and until the copyright holder explicitly and
++finally terminates your license, and (b) permanently, if the copyright
++holder fails to notify you of the violation by some reasonable means
++prior to 60 days after the cessation.
++
++  Moreover, your license from a particular copyright holder is
++reinstated permanently if the copyright holder notifies you of the
++violation by some reasonable means, this is the first time you have
++received notice of violation of this License (for any work) from that
++copyright holder, and you cure the violation prior to 30 days after
++your receipt of the notice.
++
++  Termination of your rights under this section does not terminate the
++licenses of parties who have received copies or rights from you under
++this License.  If your rights have been terminated and not permanently
++reinstated, you do not qualify to receive new licenses for the same
++material under section 10.
++
++  9. Acceptance Not Required for Having Copies.
++
++  You are not required to accept this License in order to receive or
++run a copy of the Program.  Ancillary propagation of a covered work
++occurring solely as a consequence of using peer-to-peer transmission
++to receive a copy likewise does not require acceptance.  However,
++nothing other than this License grants you permission to propagate or
++modify any covered work.  These actions infringe copyright if you do
++not accept this License.  Therefore, by modifying or propagating a
++covered work, you indicate your acceptance of this License to do so.
++
++  10. Automatic Licensing of Downstream Recipients.
++
++  Each time you convey a covered work, the recipient automatically
++receives a license from the original licensors, to run, modify and
++propagate that work, subject to this License.  You are not responsible
++for enforcing compliance by third parties with this License.
++
++  An "entity transaction" is a transaction transferring control of an
++organization, or substantially all assets of one, or subdividing an
++organization, or merging organizations.  If propagation of a covered
++work results from an entity transaction, each party to that
++transaction who receives a copy of the work also receives whatever
++licenses to the work the party's predecessor in interest had or could
++give under the previous paragraph, plus a right to possession of the
++Corresponding Source of the work from the predecessor in interest, if
++the predecessor has it or can get it with reasonable efforts.
++
++  You may not impose any further restrictions on the exercise of the
++rights granted or affirmed under this License.  For example, you may
++not impose a license fee, royalty, or other charge for exercise of
++rights granted under this License, and you may not initiate litigation
++(including a cross-claim or counterclaim in a lawsuit) alleging that
++any patent claim is infringed by making, using, selling, offering for
++sale, or importing the Program or any portion of it.
++
++  11. Patents.
++
++  A "contributor" is a copyright holder who authorizes use under this
++License of the Program or a work on which the Program is based.  The
++work thus licensed is called the contributor's "contributor version".
++
++  A contributor's "essential patent claims" are all patent claims
++owned or controlled by the contributor, whether already acquired or
++hereafter acquired, that would be infringed by some manner, permitted
++by this License, of making, using, or selling its contributor version,
++but do not include claims that would be infringed only as a
++consequence of further modification of the contributor version.  For
++purposes of this definition, "control" includes the right to grant
++patent sublicenses in a manner consistent with the requirements of
++this License.
++
++  Each contributor grants you a non-exclusive, worldwide, royalty-free
++patent license under the contributor's essential patent claims, to
++make, use, sell, offer for sale, import and otherwise run, modify and
++propagate the contents of its contributor version.
++
++  In the following three paragraphs, a "patent license" is any express
++agreement or commitment, however denominated, not to enforce a patent
++(such as an express permission to practice a patent or covenant not to
++sue for patent infringement).  To "grant" such a patent license to a
++party means to make such an agreement or commitment not to enforce a
++patent against the party.
++
++  If you convey a covered work, knowingly relying on a patent license,
++and the Corresponding Source of the work is not available for anyone
++to copy, free of charge and under the terms of this License, through a
++publicly available network server or other readily accessible means,
++then you must either (1) cause the Corresponding Source to be so
++available, or (2) arrange to deprive yourself of the benefit of the
++patent license for this particular work, or (3) arrange, in a manner
++consistent with the requirements of this License, to extend the patent
++license to downstream recipients.  "Knowingly relying" means you have
++actual knowledge that, but for the patent license, your conveying the
++covered work in a country, or your recipient's use of the covered work
++in a country, would infringe one or more identifiable patents in that
++country that you have reason to believe are valid.
++
++  If, pursuant to or in connection with a single transaction or
++arrangement, you convey, or propagate by procuring conveyance of, a
++covered work, and grant a patent license to some of the parties
++receiving the covered work authorizing them to use, propagate, modify
++or convey a specific copy of the covered work, then the patent license
++you grant is automatically extended to all recipients of the covered
++work and works based on it.
++
++  A patent license is "discriminatory" if it does not include within
++the scope of its coverage, prohibits the exercise of, or is
++conditioned on the non-exercise of one or more of the rights that are
++specifically granted under this License.  You may not convey a covered
++work if you are a party to an arrangement with a third party that is
++in the business of distributing software, under which you make payment
++to the third party based on the extent of your activity of conveying
++the work, and under which the third party grants, to any of the
++parties who would receive the covered work from you, a discriminatory
++patent license (a) in connection with copies of the covered work
++conveyed by you (or copies made from those copies), or (b) primarily
++for and in connection with specific products or compilations that
++contain the covered work, unless you entered into that arrangement,
++or that patent license was granted, prior to 28 March 2007.
++
++  Nothing in this License shall be construed as excluding or limiting
++any implied license or other defenses to infringement that may
++otherwise be available to you under applicable patent law.
++
++  12. No Surrender of Others' Freedom.
++
++  If conditions are imposed on you (whether by court order, agreement or
++otherwise) that contradict the conditions of this License, they do not
++excuse you from the conditions of this License.  If you cannot convey a
++covered work so as to satisfy simultaneously your obligations under this
++License and any other pertinent obligations, then as a consequence you may
++not convey it at all.  For example, if you agree to terms that obligate you
++to collect a royalty for further conveying from those to whom you convey
++the Program, the only way you could satisfy both those terms and this
++License would be to refrain entirely from conveying the Program.
++
++  13. Use with the GNU Affero General Public License.
++
++  Notwithstanding any other provision of this License, you have
++permission to link or combine any covered work with a work licensed
++under version 3 of the GNU Affero General Public License into a single
++combined work, and to convey the resulting work.  The terms of this
++License will continue to apply to the part which is the covered work,
++but the special requirements of the GNU Affero General Public License,
++section 13, concerning interaction through a network will apply to the
++combination as such.
++
++  14. Revised Versions of this License.
++
++  The Free Software Foundation may publish revised and/or new versions of
++the GNU General Public License from time to time.  Such new versions will
++be similar in spirit to the present version, but may differ in detail to
++address new problems or concerns.
++
++  Each version is given a distinguishing version number.  If the
++Program specifies that a certain numbered version of the GNU General
++Public License "or any later version" applies to it, you have the
++option of following the terms and conditions either of that numbered
++version or of any later version published by the Free Software
++Foundation.  If the Program does not specify a version number of the
++GNU General Public License, you may choose any version ever published
++by the Free Software Foundation.
++
++  If the Program specifies that a proxy can decide which future
++versions of the GNU General Public License can be used, that proxy's
++public statement of acceptance of a version permanently authorizes you
++to choose that version for the Program.
++
++  Later license versions may give you additional or different
++permissions.  However, no additional obligations are imposed on any
++author or copyright holder as a result of your choosing to follow a
++later version.
++
++  15. Disclaimer of Warranty.
++
++  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
++APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
++HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
++OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
++THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
++IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
++ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
++
++  16. Limitation of Liability.
++
++  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
++WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
++THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
++GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
++USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
++DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
++PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
++EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
++SUCH DAMAGES.
++
++  17. Interpretation of Sections 15 and 16.
++
++  If the disclaimer of warranty and limitation of liability provided
++above cannot be given local legal effect according to their terms,
++reviewing courts shall apply local law that most closely approximates
++an absolute waiver of all civil liability in connection with the
++Program, unless a warranty or assumption of liability accompanies a
++copy of the Program in return for a fee.
++
++		     END OF TERMS AND CONDITIONS
++
++	    How to Apply These Terms to Your New Programs
++
++  If you develop a new program, and you want it to be of the greatest
++possible use to the public, the best way to achieve this is to make it
++free software which everyone can redistribute and change under these terms.
++
++  To do so, attach the following notices to the program.  It is safest
++to attach them to the start of each source file to most effectively
++state the exclusion of warranty; and each file should have at least
++the "copyright" line and a pointer to where the full notice is found.
++
++    <one line to give the program's name and a brief idea of what it does.>
++    Copyright (C) <year>  <name of author>
++
++    This program is free software: you can redistribute it and/or modify
++    it under the terms of the GNU General Public License as published by
++    the Free Software Foundation, either version 3 of the License, or
++    (at your option) any later version.
++
++    This program is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++    GNU General Public License for more details.
++
++    You should have received a copy of the GNU General Public License
++    along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++Also add information on how to contact you by electronic and paper mail.
++
++  If the program does terminal interaction, make it output a short
++notice like this when it starts in an interactive mode:
++
++    <program>  Copyright (C) <year>  <name of author>
++    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
++    This is free software, and you are welcome to redistribute it
++    under certain conditions; type `show c' for details.
++
++The hypothetical commands `show w' and `show c' should show the appropriate
++parts of the General Public License.  Of course, your program's commands
++might be different; for a GUI interface, you would use an "about box".
++
++  You should also get your employer (if you work as a programmer) or school,
++if any, to sign a "copyright disclaimer" for the program, if necessary.
++For more information on this, and how to apply and follow the GNU GPL, see
++<http://www.gnu.org/licenses/>.
++
++  The GNU General Public License does not permit incorporating your program
++into proprietary programs.  If your program is a subroutine library, you
++may consider it more useful to permit linking proprietary applications with
++the library.  If this is what you want to do, use the GNU Lesser General
++Public License instead of this License.  But first, please read
++<http://www.gnu.org/philosophy/why-not-lgpl.html>.
++
 === added file 'doc/COPYING.LESSER'
 --- doc/COPYING.LESSER	1970-01-01 00:00:00 +0000
 +++ doc/COPYING.LESSER	2010-07-28 20:35:51 +0000
@@ -0,0 +1,165 @@
++		   GNU LESSER GENERAL PUBLIC LICENSE
++                       Version 3, 29 June 2007
++
++ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
++ Everyone is permitted to copy and distribute verbatim copies
++ of this license document, but changing it is not allowed.
++
++
++  This version of the GNU Lesser General Public License incorporates
++the terms and conditions of version 3 of the GNU General Public
++License, supplemented by the additional permissions listed below.
++
++  0. Additional Definitions.
++
++  As used herein, "this License" refers to version 3 of the GNU Lesser
++General Public License, and the "GNU GPL" refers to version 3 of the GNU
++General Public License.
++
++  "The Library" refers to a covered work governed by this License,
++other than an Application or a Combined Work as defined below.
++
++  An "Application" is any work that makes use of an interface provided
++by the Library, but which is not otherwise based on the Library.
++Defining a subclass of a class defined by the Library is deemed a mode
++of using an interface provided by the Library.
++
++  A "Combined Work" is a work produced by combining or linking an
++Application with the Library.  The particular version of the Library
++with which the Combined Work was made is also called the "Linked
++Version".
++
++  The "Minimal Corresponding Source" for a Combined Work means the
++Corresponding Source for the Combined Work, excluding any source code
++for portions of the Combined Work that, considered in isolation, are
++based on the Application, and not on the Linked Version.
++
++  The "Corresponding Application Code" for a Combined Work means the
++object code and/or source code for the Application, including any data
++and utility programs needed for reproducing the Combined Work from the
++Application, but excluding the System Libraries of the Combined Work.
++
++  1. Exception to Section 3 of the GNU GPL.
++
++  You may convey a covered work under sections 3 and 4 of this License
++without being bound by section 3 of the GNU GPL.
++
++  2. Conveying Modified Versions.
++
++  If you modify a copy of the Library, and, in your modifications, a
++facility refers to a function or data to be supplied by an Application
++that uses the facility (other than as an argument passed when the
++facility is invoked), then you may convey a copy of the modified
++version:
++
++   a) under this License, provided that you make a good faith effort to
++   ensure that, in the event an Application does not supply the
++   function or data, the facility still operates, and performs
++   whatever part of its purpose remains meaningful, or
++
++   b) under the GNU GPL, with none of the additional permissions of
++   this License applicable to that copy.
++
++  3. Object Code Incorporating Material from Library Header Files.
++
++  The object code form of an Application may incorporate material from
++a header file that is part of the Library.  You may convey such object
++code under terms of your choice, provided that, if the incorporated
++material is not limited to numerical parameters, data structure
++layouts and accessors, or small macros, inline functions and templates
++(ten or fewer lines in length), you do both of the following:
++
++   a) Give prominent notice with each copy of the object code that the
++   Library is used in it and that the Library and its use are
++   covered by this License.
++
++   b) Accompany the object code with a copy of the GNU GPL and this license
++   document.
++
++  4. Combined Works.
++
++  You may convey a Combined Work under terms of your choice that,
++taken together, effectively do not restrict modification of the
++portions of the Library contained in the Combined Work and reverse
++engineering for debugging such modifications, if you also do each of
++the following:
++
++   a) Give prominent notice with each copy of the Combined Work that
++   the Library is used in it and that the Library and its use are
++   covered by this License.
++
++   b) Accompany the Combined Work with a copy of the GNU GPL and this license
++   document.
++
++   c) For a Combined Work that displays copyright notices during
++   execution, include the copyright notice for the Library among
++   these notices, as well as a reference directing the user to the
++   copies of the GNU GPL and this license document.
++
++   d) Do one of the following:
++
++       0) Convey the Minimal Corresponding Source under the terms of this
++       License, and the Corresponding Application Code in a form
++       suitable for, and under terms that permit, the user to
++       recombine or relink the Application with a modified version of
++       the Linked Version to produce a modified Combined Work, in the
++       manner specified by section 6 of the GNU GPL for conveying
++       Corresponding Source.
++
++       1) Use a suitable shared library mechanism for linking with the
++       Library.  A suitable mechanism is one that (a) uses at run time
++       a copy of the Library already present on the user's computer
++       system, and (b) will operate properly with a modified version
++       of the Library that is interface-compatible with the Linked
++       Version.
++
++   e) Provide Installation Information, but only if you would otherwise
++   be required to provide such information under section 6 of the
++   GNU GPL, and only to the extent that such information is
++   necessary to install and execute a modified version of the
++   Combined Work produced by recombining or relinking the
++   Application with a modified version of the Linked Version. (If
++   you use option 4d0, the Installation Information must accompany
++   the Minimal Corresponding Source and Corresponding Application
++   Code. If you use option 4d1, you must provide the Installation
++   Information in the manner specified by section 6 of the GNU GPL
++   for conveying Corresponding Source.)
++
++  5. Combined Libraries.
++
++  You may place library facilities that are a work based on the
++Library side by side in a single library together with other library
++facilities that are not Applications and are not covered by this
++License, and convey such a combined library under terms of your
++choice, if you do both of the following:
++
++   a) Accompany the combined library with a copy of the same work based
++   on the Library, uncombined with any other library facilities,
++   conveyed under the terms of this License.
++
++   b) Give prominent notice with the combined library that part of it
++   is a work based on the Library, and explaining where to find the
++   accompanying uncombined form of the same work.
++
++  6. Revised Versions of the GNU Lesser General Public License.
++
++  The Free Software Foundation may publish revised and/or new versions
++of the GNU Lesser General Public License from time to time. Such new
++versions will be similar in spirit to the present version, but may
++differ in detail to address new problems or concerns.
++
++  Each version is given a distinguishing version number. If the
++Library as you received it specifies that a certain numbered version
++of the GNU Lesser General Public License "or any later version"
++applies to it, you have the option of following the terms and
++conditions either of that published version or of any later version
++published by the Free Software Foundation. If the Library as you
++received it does not specify a version number of the GNU Lesser
++General Public License, you may choose any version of the GNU Lesser
++General Public License ever published by the Free Software Foundation.
++
++  If the Library as you received it specifies that a proxy can decide
++whether future versions of the GNU Lesser General Public License shall
++apply, that proxy's public statement of acceptance of any version is
++permanent authorization for you to choose that version for the
++Library.
 === added file 'doc/Makefile'
 --- doc/Makefile	1970-01-01 00:00:00 +0000
 +++ doc/Makefile	2010-07-28 20:35:51 +0000
@@ -0,0 +1,23 @@
++.PHONY: help clean html text doctest
++
++docs: html text
++
++check: doctest
++
++help:
++	cd src && $(MAKE) $@
++
++html:
++	cd src && $(MAKE) $@
++	cp -r src/_build/html .
++
++text:
++	cd src && $(MAKE) $@
++	cd src && tools/stitch_text.py index.rst _build/text > ../psycopg2.txt
++
++doctest:
++	cd src && $(MAKE) $@
++
++clean:
++	cd src && $(MAKE) $@
++	rm -rf html psycopg2.txt
 === added file 'doc/README'
 --- doc/README	1970-01-01 00:00:00 +0000
 +++ doc/README	2010-07-28 20:35:51 +0000
@@ -0,0 +1,42 @@
++How to build psycopg documentation
++----------------------------------
++
++- Install Sphinx, maybe in a virtualenv. Tested with Sphinx 0.6.4::
++
++    ~$ virtualenv pd
++    New python executable in pd/bin/python
++    Installing setuptools............done.
++    ~$ cd pd
++    ~/pd$ source bin/activate
++    (pd)~/pd$
++
++- Install Sphinx in the env::
++
++    (pd)~/pd$ easy_install sphinx
++    Searching for sphinx
++    Reading http://pypi.python.org/simple/sphinx/
++    Reading http://sphinx.pocoo.org/
++    Best match: Sphinx 0.6.4
++    ...
++    Finished processing dependencies for sphinx
++
++- Build psycopg2 and ensure the package can be imported (it will be used for
++  reading the version number, autodocs etc.)::
++
++    (pd)~/pd/psycopg2$ python setup.py build
++    (pd)~/pd/psycopg2$ python setup.py install
++    running install
++    ...
++    creating ~/pd/lib/python2.6/site-packages/psycopg2
++    ...
++
++- Move to the ``doc`` dir and run ``make`` from there::
++
++    (pd)~/pd/psycopg2$ cd doc/
++    (pd)~/pd/psycopg2/doc$ make
++    Running Sphinx v0.6.4
++    ...
++
++You should have the rendered documentation in ``./html`` and the text file
++``psycopg2.txt`` now.
++
 === removed file 'doc/TODO'
 --- doc/TODO	2006-08-09 10:28:30 +0000
 +++ doc/TODO	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
--TODO list for psycopg 2 or later
--********************************
--
--Move items to the DONE section only after writing a test for the
--implementation. Also add a note on how the item was resolved.
--(Obviously I was joking about the test..)
--
--* Find a better way to compile the type-casting code instead of including it
--   in typecast.c directy. (Including is not that bad, but the need to touch
--   psycopg/typecast.c every time is bad bad bad.)
--
--* executemany() should _not_ take the async flag, remove it and force multiple
--   queries to be synchronous.
--
--* Fix all the docstrings.
--
--* Support the protocols API fully.
--
--* Unify the common code in typecast_datetime.c and typecast_mxdatetime.c.
--
--* Port typecasters to new-style classes.
--
--* Write a complete postgresql<->python encodings table.
--
--* Implement binary typecasters (should be easy, but it will take time.)
--
--DONE
--====
--
--* Convert type-casters to new-style types in Python 2.2+.
--
--* callproc() never worked, fix it or remove it and raise right exception.
--   [Removed callproc code, now an exception is raised.]
 === removed file 'doc/api-screen.css'
 --- doc/api-screen.css	2006-08-09 10:28:30 +0000
 +++ doc/api-screen.css	1970-01-01 00:00:00 +0000
@@ -1,138 +0,0 @@
--/* Based on the Epydoc "default.css"
--** with some missing reST-related classes
--** and Python syntax support (from SilverCity)
--*/
--
--/* Body color */
--body               { background: #ffffff; color: #000000; }
--
--/* Tables */
--table.summary, table.details, table.index
--                   { background: #e8f0f8; color: #000000; }
--tr.summary, tr.details, tr.index
--                   { background: #70b0f0; color: #000000;
--                     text-align: left; font-size: 120%; }
--tr.group           { background: #c0e0f8; color: #000000;
--                     text-align: left; font-size: 120%;
--                     font-style: italic; }
--
--/* Documentation page titles */
--h2.module          { margin-top: 0.2em; }
--h2.class           { margin-top: 0.2em; }
--
--/* Headings */
--h1.heading         { font-size: +140%; font-style: italic;
--                     font-weight: bold; }
--h2.heading         { font-size: +125%; font-style: italic;
--                     font-weight: bold; }
--h3.heading         { font-size: +110%; font-style: italic;
--                     font-weight: normal; }
--
--/* Base tree */
--pre.base-tree      { font-size: 80%; margin: 0; }
--
--/* TOC */
--p.toc { margin: 0; }
--
--/* Details Sections */
--table.func-details { background: #e8f0f8; color: #000000;
--                     border: 2px groove #c0d0d0;
--                     padding: 0 1em 0 1em; margin: 0.4em 0 0 0; }
--h3.func-detail     { background: transparent; color: #000000;
--                     margin: 0 0 1em 0; }
--
--table.var-details  { background: #e8f0f8; color: #000000;
--                     border: 2px groove #c0d0d0;
--                     padding: 0 1em 0 1em; margin: 0.4em 0 0 0; }
--h3.var-details     { background: transparent; color: #000000;
--                     margin: 0 0 1em 0; }
--
--/* Function signatures */
--.sig               { background: transparent; color: #000000;
--                     font-weight: bold; }
--.sig-name          { background: transparent; color: #006080; }
--.sig-arg, .sig-kwarg, .sig-vararg
--                   { background: transparent; color: #008060; }
--.sig-default       { background: transparent; color: #602000; }
--.summary-sig       { background: transparent; color: #000000; }
--.summary-sig-name  { background: transparent; color: #204080; }
--.summary-sig-arg, .summary-sig-kwarg, .summary-sig-vararg
--                   { background: transparent; color: #008060; }
--
--/* Doctest blocks */
--.py-src            { background: transparent; color: #000000; }
--.py-prompt         { background: transparent; color: #005050;
--                     font-weight: bold;}
--.py-string         { background: transparent; color: #006030; }
--.py-comment        { background: transparent; color: #003060; }
--.py-keyword        { background: transparent; color: #600000; }
--.py-output         { background: transparent; color: #404040; }
--div.code-block,
--pre.literal-block,
--pre.doctestblock   { background: #f4faff; color: #000000;
--                     padding: .5em; margin: 1em;
--                     border: 1px solid #708890; }
--table pre.doctestblock
--                   { background: #dce4ec; color: #000000;
--                     padding: .5em; margin: 1em;
--                     border: 1px solid #708890; }
--div.code-block     { font-family: monospace; }
--
--/* Variable values */
--pre.variable       { background: #dce4ec; color: #000000;
--                     padding: .5em; margin: 0;
--                     border: 1px solid #708890; }
--.variable-linewrap { background: transparent; color: #604000; }
--.variable-ellipsis { background: transparent; color: #604000; }
--.variable-quote    { background: transparent; color: #604000; }
--.re                { background: transparent; color: #000000; }
--.re-char           { background: transparent; color: #006030; }
--.re-op             { background: transparent; color: #600000; }
--.re-group          { background: transparent; color: #003060; }
--.re-ref            { background: transparent; color: #404040; }
--
--/* Navigation bar */
--table.navbar       { background: #a0c0ff; color: #0000ff;
--                     border: 2px groove #c0d0d0; }
--th.navbar          { background: #a0c0ff; color: #0000ff; }
--th.navselect       { background: #70b0ff; color: #000000; }
--.nomargin          { margin: 0; }
--
--/* Links */
--a:link             { background: transparent; color: #0000ff; }
--a:visited          { background: transparent; color: #204080; }
--a.navbar:link      { background: transparent; color: #0000ff;
--                     text-decoration: none; }
--a.navbar:visited   { background: transparent; color: #204080;
--                     text-decoration: none; }
--
--/* Admonitions */
--div.warning,
--div.note                { background-color: #c0e0f8;
--                          border: thin solid black;
--                          padding: 1em;
--                          margin-left: 1em;
--                          margin-right: 1em; }
--div.warning .first,
--div.note .first      { font-family: sans-serif;
--                          font-size: 110%;
--                          margin-right: 0.5em; }
--
--/* Lists */
--ul { margin-top: 0; }
--
--/* Python syntax */
--.p_character { color: olive; }
--.p_classname { color: blue; font-weight: bold; }
--.p_commentblock {color: gray; font-style: italic; }
--.p_commentline { color: green; font-style: italic; }
--.p_default {}
--.p_defname { color: #009999; font-weight: bold; }
--.p_identifier { color: black; }
--.p_number { color: #009999; }
--.p_operator { color: black; }
--.p_string { color: #7F007F; }
--.p_stringeol { color: #7F007F; }
--.p_triple { color: #7F0000; }
--.p_tripledouble { color: #7F0000; }
--.p_word { color: navy; font-weight: bold; }
 === removed file 'doc/async.txt'
 --- doc/async.txt	2006-08-09 10:28:30 +0000
 +++ doc/async.txt	1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
--psycopg asynchronous API
--************************
--
--** Important: async quaeries are not enabled for 2.0 **
--
--Program code can initiate an asynchronous query by passing an 'async=1' flag
--to the .execute() method. A very simple example, from the connection to the
--query:
--
--    conn = psycopg.connect(database='test')
--    curs = conn.cursor()
--    curs.execute("SEECT * from test WHERE fielda > %s", (1971,), async=1)
--
--From then on any query on other cursors derived from the same connection is
--doomed to fail (and raise an exception) until the original cursor (the one
--executing the query) complete the asynchronous operation. This can happen in
--a number of different ways:
--
--    1) one of the .fetchXXX() methods is called, effectively blocking untill
--       data has been sent from the backend to the client, terminating the
--       query.
--
--    2) .cancel() is called. This method tries to abort the current query and
--       will block until the query is aborted or fully executed. The return
--       value is True if the query was successfully aborted or False if it
--       was executed. Query result are discarded in both cases.
--
--    3) .execute() is called again on the same cursor (.execute() on a
--       different cursor will simply raise an exception.) This waits for the
--       complete execution of the current query, discard any data and execute
--       the new one.
--
--Note that calling .execute() two times in a row will not abort the former
--query and will temporarily go to synchronous mode until the first of the two
--queries is executed.
--
--Cursors now have some extra methods that make them usefull during
--asynchronous queries:
--
--    .fileno()
--      Returns the file descriptor associated with the current connection and
--      make possible to use a cursor in a context where a file object would be
--      expected (like in a select() call.)
--
--    .isbusy()
--      Returns True if the backend is still processing the query or false if
--      data is ready to be fetched (by one of the .fetchXXX() methods.)
--
--A code snippet that shows how to use the cursor object in a select() call:
--
--    import psycopg
--    import select
--
--    conn = psycopg.connect(database='test')
--    curs = conn.cursor()
--    curs.execute("SEECT * from test WHERE fielda > %s", (1971,), async=1)
--
--    # wait for input with a maximum timeout of 5 seconds
--    query_ended = False
--    while not query_ended:
--        rread, rwrite, rspec = select([cursor, another_file], [], [], 5)
--	if not cursor.isbusy():
--	   query_ended = True
--	# manage input from other sources like other_file, etc.
--    print "Query Results:"
--    for row in cursor:
--        print row
 === removed file 'doc/extensions.rst'
 --- doc/extensions.rst	2006-08-09 10:28:30 +0000
 +++ doc/extensions.rst	1970-01-01 00:00:00 +0000
@@ -1,260 +0,0 @@
--=======================================
-- psycopg 2 extensions to the DBAPI 2.0
--=======================================
--
--This document is a short summary of the extensions built in psycopg 2.0.x over
--the standard `Python Database API Specification 2.0`__, usually called simply
--DBAPI-2.0 or even PEP-249.  Before reading on this document please make sure
--you already know how to program in Python using a DBAPI-2.0 compliant driver:
--basic concepts like opening a connection, executing queries and commiting or
--rolling back a transaction will not be explained but just used.
--
--.. __: http://www.python.org/peps/pep-0249.html
--
--Many objects and extension functions are defined in the `psycopg2.extensions`
--module.
--
--
--Connection and cursor factories
--===============================
--
--psycopg 2 exposes two new-style classes that can be sub-classed and expanded to
--adapt them to the needs of the programmer: `cursor` and `connection`.  The
--`connection` class is usually sub-classed only to provide an easy way to create
--customized cursors but other uses are possible. `cursor` is much more
--interesting, because it is the class where query building, execution and result
--type-casting into Python variables happens.
--
--An example of cursor subclass performing logging is::
--
--    import psycopg2
--    import psycopg2.extensions
--    import logging
--
--    class LoggingCursor(psycopg2.extensions.cursor):
--        def execute(self, sql, args=None):
--            logger = logging.getLogger('sql_debug')
--            logger.info(self.mogrify(sql, args))
--
--            try:
--                psycopg2.extensions.cursor.execute(self, sql, args)
--            except Exception, exc:
--                logger.error("%s: %s" % (exc.__class__.__name__, exc))
--                raise
--
--    conn = psycopg2.connect(DSN)
--    curs = conn.cursor(cursor_factory=LoggingCursor)
--    curs.execute("INSERT INTO mytable VALUES (%s, %s, %s);",
--                 (10, 20, 30))
--
--
--Row factories
---------------
--
--tzinfo factories
------------------
--
--
--Setting transaction isolation levels
--====================================
--
--psycopg2 connection objects hold informations about the PostgreSQL `transaction
--isolation level`_.  The current transaction level can be read from the
--`.isolation_level` attribute.  The default isolation level is ``READ
--COMMITTED``.  A different isolation level con be set through the
--`.set_isolation_level()` method.  The level can be set to one of the following
--constants, defined in `psycopg2.extensions`:
--
--`ISOLATION_LEVEL_AUTOCOMMIT`
--    No transaction is started when command are issued and no
--    `.commit()`/`.rollback()` is required.  Some PostgreSQL command such as
--    ``CREATE DATABASE`` can't run into a transaction: to run such command use
--    `.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT)`.
--
--`ISOLATION_LEVEL_READ_COMMITTED`
--    This is the default value.  A new transaction is started at the first
--    `.execute()` command on a cursor and at each new `.execute()` after a
--    `.commit()` or a `.rollback()`.  The transaction runs in the PostgreSQL
--    ``READ COMMITTED`` isolation level.
--
--`ISOLATION_LEVEL_SERIALIZABLE`
--    Transactions are run at a ``SERIALIZABLE`` isolation level.
--
--
--.. _transaction isolation level:
--   http://www.postgresql.org/docs/8.1/static/transaction-iso.html
--
--
--Adaptation of Python values to SQL types
--========================================
--
--psycopg2 casts Python variables to SQL literals by type.  Standard Python types
--are already adapted to the proper SQL literal.
--
--Example: the Python function::
--
--    curs.execute("""INSERT INTO atable (anint, adate, astring)
--                     VALUES (%s, %s, %s)""",
--                 (10, datetime.date(2005, 11, 18), "O'Reilly"))
--
--is converted into the SQL command::
--
--    INSERT INTO atable (anint, adate, astring)
--     VALUES (10, '2005-11-18', 'O''Reilly');
--
--Named arguments are supported too with ``%(name)s`` placeholders. Notice that:
--
--  - The Python string operator ``%`` is not used: the `.execute()` function
--    accepts the values tuple or dictionary as second parameter.
--
--  - The variables placeholder must always be a ``%s``, even if a different
--    placeholder (such as a ``%d`` for an integer) may look more appropriate.
--
--  - For positional variables binding, the second argument must always be a
--    tuple, even if it contains a single variable.
--
--  - Only variable values should be bound via this method: it shouldn't be used
--    to set table or field names. For these elements, ordinary string formatting
--    should be used before running `.execute()`.
--
--
--Adapting new types
--------------------
--
--Any Python class or type can be adapted to an SQL string.  Adaptation mechanism
--is similar to the Object Adaptation proposed in the `PEP-246`_ and is exposed
--by the `adapt()` function.
--
--psycopg2 `.execute()` method adapts its ``vars`` arguments to the `ISQLQuote`
--protocol.  Objects that conform to this protocol expose a ``getquoted()`` method
--returning the SQL representation of the object as a string.
--
--The easiest way to adapt an object to an SQL string is to register an adapter
--function via the `register_adapter()` function.  The adapter function must take
--the value to be adapted as argument and return a conform object.  A convenient
--object is the `AsIs` wrapper, whose ``getquoted()`` result is simply the
--``str()``\ ingification of the wrapped object.
--
--Example: mapping of a ``Point`` class into the ``point`` PostgreSQL geometric
--type::
--
--    from psycopg2.extensions import adapt, register_adapter, AsIs
--
--    class Point(object):
--        def __init__(self, x=0.0, y=0.0):
--            self.x = x
--            self.y = y
--
--    def adapt_point(point):
--        return AsIs("'(%s,%s)'" % (adapt(point.x), adapt(point.y)))
--
--    register_adapter(Point, adapt_point)
--
--    curs.execute("INSERT INTO atable (apoint) VALUES (%s)",
--                 (Point(1.23, 4.56),))
--
--The above function call results in the SQL command::
--
--    INSERT INTO atable (apoint) VALUES ((1.23, 4.56));
--
--
--.. _PEP-246: http://www.python.org/peps/pep-0246.html
--
--
--Type casting of SQL types into Python values
--============================================
--
--PostgreSQL objects read from the database can be adapted to Python objects
--through an user-defined adapting function.  An adapter function takes two
--argments: the object string representation as returned by PostgreSQL and the
--cursor currently being read, and should return a new Python object.  For
--example, the following function parses a PostgreSQL ``point`` into the
--previously defined ``Point`` class::
--
--    def cast_point(value, curs):
--        if value is not None:
--        	# Convert from (f1, f2) syntax using a regular expression.
--            m = re.match("\((.*),(.*)\)", value)
--            if m:
--                return Point(float(m.group(1)), float(m.group(2)))
--
--To create a mapping from the PostgreSQL type (either standard or user-defined),
--its ``oid`` must be known. It can be retrieved either by the second column of
--the cursor description::
--
--    curs.execute("SELECT NULL::point")
--    point_oid = curs.description[0][1]   # usually returns 600
--
--or by querying the system catalogs for the type name and namespace (the
--namespace for system objects is ``pg_catalog``)::
--
--    curs.execute("""
--        SELECT pg_type.oid
--          FROM pg_type JOIN pg_namespace
--                 ON typnamespace = pg_namespace.oid
--         WHERE typname = %(typename)s
--           AND nspname = %(namespace)s""",
--                {'typename': 'point', 'namespace': 'pg_catalog'})
--
--    point_oid = curs.fetchone()[0]
--
--After you know the object ``oid``, you must can and register the new type::
--
--    POINT = psycopg2.extensions.new_type((point_oid,), "POINT", cast_point)
--    psycopg2.extensions.register_type(POINT)
--
--The `new_type()` function binds the object oids (more than one can be
--specified) to the adapter function.  `register_type()` completes the spell.
--Conversion is automatically performed when a column whose type is a registered
--``oid`` is read::
--
--    curs.execute("SELECT '(10.2,20.3)'::point")
--    point = curs.fetchone()[0]
--    print type(point), point.x, point.y
--    # Prints: "<class '__main__.Point'> 10.2 20.3"
--
--
--Working with times and dates
--============================
--
--
--Receiving NOTIFYs
--=================
--
--
--Using COPY TO and COPY FROM
--===========================
--
--psycopg2 `cursor` object provides an interface to the efficient `PostgreSQL
--COPY command`__ to move data from files to tables and back.
--
--The `.copy_to(file, table)` method writes the content of the table
--named ``table`` *to* the file-like object ``file``. ``file`` must have a
--``write()`` method.
--
--The `.copy_from(file, table)` reads data *from* the file-like object
--``file`` appending them to the table named ``table``. ``file`` must have both
--``read()`` and ``readline()`` method.
--
--Both methods accept two optional arguments: ``sep`` (defaulting to a tab) is
--the columns separator and ``null`` (defaulting to ``\N``) represents ``NULL``
--values in the file.
--
--.. __: http://www.postgresql.org/docs/8.1/static/sql-copy.html
--
--
--PostgreSQL status message and executed query
--============================================
--
--`cursor` objects have two special fields related to the last executed query:
--
--  - `.query` is the textual representation (str or unicode, depending on what
--    was passed to `.execute()` as first argument) of the query *after* argument
--    binding and mogrification has been applied. To put it another way, `.query`
--    is the *exact* query that was sent to the PostgreSQL backend.
--
--  - `.statusmessage` is the status message that the backend sent upon query
--    execution. It usually contains the basic type of the query (SELECT,
--    INSERT, UPDATE, ...) and some additional information like the number of
--    rows updated and so on. Refer to the PostgreSQL manual for more
--    information.
 === added directory 'doc/html'
 === added file 'doc/html/.buildinfo'
 --- doc/html/.buildinfo	1970-01-01 00:00:00 +0000
 +++ doc/html/.buildinfo	2010-07-28 20:35:51 +0000
@@ -0,0 +1,4 @@
++# Sphinx build info version 1
++# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
++config: 3b2e5d90696feaaf51ed99c8708bfbca
++tags: fbb0d17656682115ca4d033fb2f83ba1
 === added directory 'doc/html/_sources'
 === added file 'doc/html/_sources/advanced.txt'
 --- doc/html/_sources/advanced.txt	1970-01-01 00:00:00 +0000
 +++ doc/html/_sources/advanced.txt	2010-07-28 20:35:51 +0000
@@ -0,0 +1,450 @@
++More advanced topics
++====================
++
++.. sectionauthor:: Daniele Varrazzo <daniele.varrazzo@gmail.com>
++
++.. testsetup:: *
++
++    import re
++    import select
++
++    cur.execute("CREATE TABLE atable (apoint point)")
++    conn.commit()
++
++    def wait(conn):
++        while 1:
++            state = conn.poll()
++            if state == psycopg2.extensions.POLL_OK:
++                break
++            elif state == psycopg2.extensions.POLL_WRITE:
++                select.select([], [conn.fileno()], [])
++            elif state == psycopg2.extensions.POLL_READ:
++                select.select([conn.fileno()], [], [])
++            else:
++                raise psycopg2.OperationalError("poll() returned %s" % state)
++
++    aconn = psycopg2.connect(database='test', async=1)
++    wait(aconn)
++    acurs = aconn.cursor()
++
++.. index::
++    double: Subclassing; Cursor
++    double: Subclassing; Connection
++
++.. _subclassing-connection:
++.. _subclassing-cursor:
++
++Connection and cursor factories
++-------------------------------
++
++Psycopg exposes two new-style classes that can be sub-classed and expanded to
++adapt them to the needs of the programmer: `psycopg2.extensions.cursor`
++and `psycopg2.extensions.connection`.  The `connection` class is
++usually sub-classed only to provide an easy way to create customized cursors
++but other uses are possible. `cursor` is much more interesting, because
++it is the class where query building, execution and result type-casting into
++Python variables happens.
++
++.. index::
++    single: Example; Cursor subclass
++
++An example of cursor subclass performing logging is::
++
++    import psycopg2
++    import psycopg2.extensions
++    import logging
++
++    class LoggingCursor(psycopg2.extensions.cursor):
++        def execute(self, sql, args=None):
++            logger = logging.getLogger('sql_debug')
++            logger.info(self.mogrify(sql, args))
++
++            try:
++                psycopg2.extensions.cursor.execute(self, sql, args)
++            except Exception, exc:
++                logger.error("%s: %s" % (exc.__class__.__name__, exc))
++                raise
++
++    conn = psycopg2.connect(DSN)
++    cur = conn.cursor(cursor_factory=LoggingCursor)
++    cur.execute("INSERT INTO mytable VALUES (%s, %s, %s);",
++                 (10, 20, 30))
++
++
++
++.. index::
++    single: Objects; Creating new adapters
++    single: Adaptation; Creating new adapters
++    single: Data types; Creating new adapters
++
++.. _adapting-new-types:
++
++Adapting new Python types to SQL syntax
++---------------------------------------
++
++Any Python class or type can be adapted to an SQL string.  Adaptation mechanism
++is similar to the Object Adaptation proposed in the :pep:`246` and is exposed
++by the `psycopg2.extensions.adapt()` function.
++
++The `~cursor.execute()` method adapts its arguments to the
++`~psycopg2.extensions.ISQLQuote` protocol.  Objects that conform to this
++protocol expose a `!getquoted()` method returning the SQL representation
++of the object as a string.
++
++The easiest way to adapt an object to an SQL string is to register an adapter
++function via the `~psycopg2.extensions.register_adapter()` function.  The
++adapter function must take the value to be adapted as argument and return a
++conform object.  A convenient object is the `~psycopg2.extensions.AsIs`
++wrapper, whose `!getquoted()` result is simply the `!str()`\ ing
++conversion of the wrapped object.
++
++.. index::
++    single: Example; Types adaptation
++
++Example: mapping of a `!Point` class into the |point|_ PostgreSQL
++geometric type:
++
++.. doctest::
++
++    >>> from psycopg2.extensions import adapt, register_adapter, AsIs
++
++    >>> class Point(object):
++    ...    def __init__(self, x, y):
++    ...        self.x = x
++    ...        self.y = y
++
++    >>> def adapt_point(point):
++    ...     return AsIs("'(%s, %s)'" % (adapt(point.x), adapt(point.y)))
++
++    >>> register_adapter(Point, adapt_point)
++
++    >>> cur.execute("INSERT INTO atable (apoint) VALUES (%s)",
++    ...             (Point(1.23, 4.56),))
++
++
++.. |point| replace:: :sql:`point`
++.. _point: http://www.postgresql.org/docs/8.4/static/datatype-geometric.html#AEN6084
++
++The above function call results in the SQL command::
++
++    INSERT INTO atable (apoint) VALUES ((1.23, 4.56));
++
++
++
++.. index:: Type casting
++
++.. _type-casting-from-sql-to-python:
++
++Type casting of SQL types into Python objects
++---------------------------------------------
++
++PostgreSQL objects read from the database can be adapted to Python objects
++through an user-defined adapting function.  An adapter function takes two
++arguments: the object string representation as returned by PostgreSQL and the
++cursor currently being read, and should return a new Python object.  For
++example, the following function parses the PostgreSQL :sql:`point`
++representation into the previously defined `!Point` class:
++
++    >>> def cast_point(value, cur):
++    ...    if value is None:
++    ...        return None
++    ...
++    ...    # Convert from (f1, f2) syntax using a regular expression.
++    ...    m = re.match(r"\(([^)]+),([^)]+)\)", value)
++    ...    if m:
++    ...        return Point(float(m.group(1)), float(m.group(2)))
++    ...    else:
++    ...        raise InterfaceError("bad point representation: %r" % value)
++
++
++In order to create a mapping from a PostgreSQL type (either standard or
++user-defined), its OID must be known. It can be retrieved either by the second
++column of the `cursor.description`:
++
++    >>> cur.execute("SELECT NULL::point")
++    >>> point_oid = cur.description[0][1]
++    >>> point_oid
++    600
++
++or by querying the system catalog for the type name and namespace (the
++namespace for system objects is :sql:`pg_catalog`):
++
++    >>> cur.execute("""
++    ...    SELECT pg_type.oid
++    ...      FROM pg_type JOIN pg_namespace
++    ...             ON typnamespace = pg_namespace.oid
++    ...     WHERE typname = %(typename)s
++    ...       AND nspname = %(namespace)s""",
++    ...    {'typename': 'point', 'namespace': 'pg_catalog'})
++    >>> point_oid = cur.fetchone()[0]
++    >>> point_oid
++    600
++
++After you know the object OID, you can create and register the new type:
++
++    >>> POINT = psycopg2.extensions.new_type((point_oid,), "POINT", cast_point)
++    >>> psycopg2.extensions.register_type(POINT)
++
++The `~psycopg2.extensions.new_type()` function binds the object OIDs
++(more than one can be specified) to the adapter function.
++`~psycopg2.extensions.register_type()` completes the spell.  Conversion
++is automatically performed when a column whose type is a registered OID is
++read:
++
++    >>> cur.execute("SELECT '(10.2,20.3)'::point")
++    >>> point = cur.fetchone()[0]
++    >>> print type(point), point.x, point.y
++    <class 'Point'> 10.2 20.3
++
++
++
++.. index::
++    pair: Asynchronous; Notifications
++    pair: LISTEN; SQL command
++    pair: NOTIFY; SQL command
++
++.. _async-notify:
++
++Asynchronous notifications
++--------------------------
++
++Psycopg allows asynchronous interaction with other database sessions using the
++facilities offered by PostgreSQL commands |LISTEN|_ and |NOTIFY|_. Please
++refer to the PostgreSQL documentation for examples of how to use this form of
++communications.
++
++Notifications received are made available in the `connection.notifies`
++list. Notifications can be sent from Python code simply using a :sql:`NOTIFY`
++command in an `~cursor.execute()` call.
++
++Because of the way sessions interact with notifications (see |NOTIFY|_
++documentation), you should keep the connection in :ref:`autocommit
++<autocommit>` mode if you wish to receive or send notifications in a timely
++manner.
++
++.. |LISTEN| replace:: :sql:`LISTEN`
++.. _LISTEN: http://www.postgresql.org/docs/8.4/static/sql-listen.html
++.. |NOTIFY| replace:: :sql:`NOTIFY`
++.. _NOTIFY: http://www.postgresql.org/docs/8.4/static/sql-notify.html
++
++Notification are received after every query execution. If the user is interested
++in receiving notification but not in performing any query, the
++`~connection.poll()` method can be used to check for notification without
++wasting resources.
++
++A simple application could poll the connection from time to time to check if
++something new has arrived. A better strategy is to use some I/O completion
++function such as |select()|_ to sleep until awaken from the kernel when there is
++some data to read on the connection, thereby using no CPU unless there is
++something to read::
++
++    import select
++    import psycopg2
++    import psycopg2.extensions
++
++    conn = psycopg2.connect(DSN)
++    conn.set_isolation_level(psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT)
++
++    curs = conn.cursor()
++    curs.execute("LISTEN test;")
++
++    print "Waiting for 'NOTIFY test'"
++    while 1:
++        if select.select([conn],[],[],5) == ([],[],[]):
++            print "Timeout"
++        else:
++            conn.poll()
++            while conn.notifies:
++                print "Got NOTIFY:", conn.notifies.pop()
++
++Running the script and executing the command :sql:`NOTIFY test` in a separate
++:program:`psql` shell, the output may look similar to::
++
++    Waiting for 'NOTIFY test'
++    Timeout
++    Timeout
++    Got NOTIFY: (6535, 'test')
++    Timeout
++    ...
++
++
++
++.. index::
++    double: Asynchronous; Connection
++
++.. _async-support:
++
++Asynchronous support
++--------------------
++
++.. versionadded:: 2.2.0
++
++Psycopg can issue asynchronous queries to a PostgreSQL database. An asynchronous
++communication style is established passing the parameter *async*\=1 to the
++`~psycopg2.connect()` function: the returned connection will work in
++*asynchronous mode*.
++
++In asynchronous mode, a Psycopg connection will rely on the caller to poll the
++socket file descriptor, checking if it is ready to accept data or if a query
++result has been transferred and is ready to be read on the client. The caller
++can use the method `~connection.fileno()` to get the connection file
++descriptor and `~connection.poll()` to make communication proceed according to
++the current connection state.
++
++The following is an example loop using methods `!fileno()` and `!poll()`
++together with the Python |select()|_ function in order to carry on
++asynchronous operations with Psycopg::
++
++    def wait(conn):
++        while 1:
++            state = conn.poll()
++            if state == psycopg2.extensions.POLL_OK:
++                break
++            elif state == psycopg2.extensions.POLL_WRITE:
++                select.select([], [conn.fileno()], [])
++            elif state == psycopg2.extensions.POLL_READ:
++                select.select([conn.fileno()], [], [])
++            else:
++                raise psycopg2.OperationalError("poll() returned %s" % state)
++
++.. |select()| replace:: `!select()`
++.. _select(): http://docs.python.org/library/select.html#select.select
++
++The above loop of course would block an entire application: in a real
++asynchronous framework, `!select()` would be called on many file descriptors
++waiting for any of them to be ready.  Nonetheless the function can be used to
++connect to a PostgreSQL server only using nonblocking commands and the
++connection obtained can be used to perform further nonblocking queries.  After
++`!poll()` has returned `~psycopg2.extensions.POLL_OK`, and thus `!wait()` has
++returned, the connection can be safely used:
++
++    >>> aconn = psycopg2.connect(database='test', async=1)
++    >>> wait(aconn)
++    >>> acurs = aconn.cursor()
++
++Notice that there are a few other requirements to be met in order to have a
++completely non-blocking connection attempt: see the libpq documentation for
++|PQconnectStart|_.
++
++.. |PQconnectStart| replace:: `!PQconnectStart()`
++.. _PQconnectStart: http://www.postgresql.org/docs/8.4/static/libpq-connect.html#AEN33199
++
++The same loop should be also used to perform nonblocking queries: after
++sending a query via `~cursor.execute()` or `~cursor.callproc()`, call
++`!poll()` on the connection available from `cursor.connection` until it
++returns `!POLL_OK`, at which pont the query has been completely sent to the
++server and, if it produced data, the results have been transferred to the
++client and available using the regular cursor methods:
++
++    >>> acurs.execute("SELECT pg_sleep(5); SELECT 42;")
++    >>> wait(acurs.connection)
++    >>> acurs.fetchone()[0]
++    42
++
++When an asynchronous query is being executed, `connection.isexecuting()` returns
++`True`. Two cursors can't execute concurrent queries on the same asynchronous
++connection.
++
++There are several limitations in using asynchronous connections: the
++connection is always in :ref:`autocommit <autocommit>` mode and it is not
++possible to change it using `~connection.set_isolation_level()`. So a
++transaction is not implicitly started at the first query and is not possible
++to use methods `~connection.commit()` and `~connection.rollback()`: you can
++manually control transactions using `~cursor.execute()` to send database
++commands such as :sql:`BEGIN`, :sql:`COMMIT` and :sql:`ROLLBACK`.
++
++With asynchronous connections it is also not possible to use
++`~connection.set_client_encoding()`, `~cursor.executemany()`, :ref:`large
++objects <large-objects>`, :ref:`named cursors <server-side-cursors>`.
++
++:ref:`COPY commands <copy>` are not supported either in asynchronous mode, but
++this will be probably implemented in a future release.
++
++
++
++
++.. index::
++    single: Greenlet, Coroutine, Eventlet, gevent, Wait callback
++
++.. _green-support:
++
++Support to coroutine libraries
++------------------------------
++
++.. versionadded:: 2.2.0
++
++Psycopg can be used together with coroutine_\-based libraries, and participate
++to cooperative multithreading.
++
++Coroutine-based libraries (such as Eventlet_ or gevent_) can usually patch the
++Python standard library in order to enable a coroutine switch in the presence of
++blocking I/O: the process is usually referred as making the system *green*, in
++reference to the `green threads`_.
++
++Because Psycopg is a C extension module, it is not possible for coroutine
++libraries to patch it: Psycopg instead enables cooperative multithreading by
++allowing the registration of a *wait callback* using the
++`psycopg2.extensions.set_wait_callback()` function. When a wait callback is
++registered, Psycopg will use `libpq non-blocking calls`__ instead of the regular
++blocking ones, and will delegate to the callback the responsibility to wait
++for the socket to become readable or writable.
++
++Working this way, the caller does not have the complete freedom to schedule the
++socket check whenever they want as with an :ref:`asynchronous connection
++<async-support>`, but has the advantage of maintaining a complete |DBAPI|
++semantics: from the point of view of the end user, all Psycopg functions and
++objects will work transparently in the coroutine environment (blocking the
++calling green thread and giving other green threads the possibility to be
++scheduled), allowing non modified code and third party libraries (such as
++SQLAlchemy_) to be used in coroutine-based programs.
++
++Notice that, while I/O correctly yields control to other coroutines, each
++connection has a lock allowing a single cursor at a time to communicate with the
++backend: such lock is not *green*, so blocking against it would block the
++entire program waiting for data, not the single coroutine. Therefore,
++programmers are advised to either avoid sharing connections between coroutines
++or to use a library-friendly lock to synchronize shared connections, e.g. for
++pooling.
++
++Coroutine libraries authors should provide a callback implementation (and
++probably register it) to make Psycopg as green as they want. An example
++callback (using `!select()` to block) is provided as
++`psycopg2.extras.wait_select()`: it boils down to something similar to::
++
++    def wait_select(conn):
++        while 1:
++            state = conn.poll()
++            if state == extensions.POLL_OK:
++                break
++            elif state == extensions.POLL_READ:
++                select.select([conn.fileno()], [], [])
++            elif state == extensions.POLL_WRITE:
++                select.select([], [conn.fileno()], [])
++            else:
++                raise OperationalError("bad state from poll: %s" % state)
++
++.. _coroutine: http://en.wikipedia.org/wiki/Coroutine
++.. _greenlet: http://pypi.python.org/pypi/greenlet
++.. _green threads: http://en.wikipedia.org/wiki/Green_threads
++.. _Eventlet: http://eventlet.net/
++.. _gevent: http://www.gevent.org/
++.. _SQLAlchemy: http://www.sqlalchemy.org/
++.. __: http://www.postgresql.org/docs/8.4/static/libpq-async.html
++
++.. warning::
++    :ref:`COPY commands <copy>` are currently not supported when a wait callback
++    is registered, but they will be probably implemented in a future release.
++
++    :ref:`Large objects <large-objects>` are not supported either: they are
++    not compatible with asynchronous connections.
++
++
++.. testcode::
++    :hide:
++
++    aconn.close()
++    conn.rollback()
++    cur.execute("DROP TABLE atable")
++    conn.commit()
++    cur.close()
++    conn.close()
 === added file 'doc/html/_sources/connection.txt'
 --- doc/html/_sources/connection.txt	1970-01-01 00:00:00 +0000
 +++ doc/html/_sources/connection.txt	2010-07-28 20:35:51 +0000
@@ -0,0 +1,365 @@
++The ``connection`` class
++========================
++
++.. sectionauthor:: Daniele Varrazzo <daniele.varrazzo@gmail.com>
++
++.. testsetup::
++
++    from pprint import pprint
++    import psycopg2.extensions
++
++    drop_test_table('foo')
++
++.. class:: connection
++
++    Handles the connection to a PostgreSQL database instance. It encapsulates
++    a database session.
++
++    Connections are created using the factory function
++    `~psycopg2.connect()`.
++
++    Connections are thread safe and can be shared among many thread. See
++    :ref:`thread-safety` for details.
++
++    .. method:: cursor([name] [, cursor_factory])
++
++        Return a new `cursor` object using the connection.
++
++        If `name` is specified, the returned cursor will be a *server
++        side* (or *named*) cursor. Otherwise the cursor will be *client side*.
++        See :ref:`server-side-cursors` for further details.
++
++        The `cursor_factory` argument can be used to create non-standard
++        cursors. The class returned should be a subclass of
++        `psycopg2.extensions.cursor`. See :ref:`subclassing-cursor` for
++        details.
++
++        .. extension::
++
++            The `name` and `cursor_factory` parameters are Psycopg
++            extensions to the |DBAPI|.
++
++
++    .. index::
++        pair: Transaction; Commit
++
++    .. method:: commit()
++
++        Commit any pending transaction to the database. Psycopg can be set to
++        perform automatic commits at each operation, see
++        `~connection.set_isolation_level()`.
++
++
++    .. index::
++        pair: Transaction; Rollback
++
++    .. method:: rollback()
++
++        Roll back to the start of any pending transaction.  Closing a
++        connection without committing the changes first will cause an implicit
++        rollback to be performed.
++
++
++    .. method:: close()
++
++        Close the connection now (rather than whenever `__del__()` is
++        called).  The connection will be unusable from this point forward; an
++        `~psycopg2.InterfaceError` will be raised if any operation is
++        attempted with the connection.  The same applies to all cursor objects
++        trying to use the connection.  Note that closing a connection without
++        committing the changes first will cause an implicit rollback to be
++        performed (unless a different isolation level has been selected: see
++        `~connection.set_isolation_level()`).
++
++
++    .. index::
++        single: Exceptions; In the connection class
++
++    .. rubric:: Excetptions as connection class attributes
++
++    The `!connection` also exposes as attributes the same exceptions
++    available in the `psycopg2` module.  See :ref:`dbapi-exceptions`.
++
++
++    .. extension::
++
++        The above methods are the only ones defined by the |DBAPI| protocol.
++        The Psycopg connection objects exports the following additional
++        methods and attributes.
++
++
++    .. attribute:: closed
++
++        Read-only attribute reporting whether the database connection is open
++        (0) or closed (1).
++
++
++    .. method:: reset
++
++        Reset the connection to the default.
++
++        The method rolls back an eventual pending transaction and executes the
++        PostgreSQL |RESET|_ and |SET SESSION AUTHORIZATION|__ to revert the
++        session to the default values.
++
++        .. |RESET| replace:: :sql:`RESET`
++        .. _RESET: http://www.postgresql.org/docs/8.4/static/sql-reset.html
++
++        .. |SET SESSION AUTHORIZATION| replace:: :sql:`SET SESSION AUTHORIZATION`
++        .. __: http://www.postgresql.org/docs/8.4/static/sql-set-session-authorization.html
++
++        .. versionadded:: 2.0.12
++
++
++    .. attribute:: dsn
++
++        Read-only string containing the connection string used by the
++        connection.
++
++
++    .. index::
++        pair: Transaction; Autocommit
++        pair: Transaction; Isolation level
++
++    .. _autocommit:
++
++    .. attribute:: isolation_level
++    .. method:: set_isolation_level(level)
++
++        Read or set the `transaction isolation level`_ for the current session.
++        The level defines the different phenomena that can happen in the
++        database between concurrent transactions.
++
++        The value set or read is an integer: symbolic constants are defined in
++        the module `psycopg2.extensions`: see
++        :ref:`isolation-level-constants` for the available values.
++
++        The default level is :sql:`READ COMMITTED`: at this level a
++        transaction is automatically started the first time a database command
++        is executed.  If you want an *autocommit* mode, switch to
++        `~psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT` before
++        executing any command::
++
++            >>> conn.set_isolation_level(psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT)
++
++        See also :ref:`transactions-control`.
++
++    .. index::
++        pair: Client; Encoding
++
++    .. attribute:: encoding
++    .. method:: set_client_encoding(enc)
++
++        Read or set the client encoding for the current session. The default
++        is the encoding defined by the database. It should be one of the
++        `characters set supported by PostgreSQL`__
++
++        .. __: http://www.postgresql.org/docs/8.4/static/multibyte.html
++
++
++    .. index::
++        pair: Client; Logging
++
++    .. attribute:: notices
++
++        A list containing all the database messages sent to the client during
++        the session.
++
++        .. doctest::
++            :options: NORMALIZE_WHITESPACE
++
++            >>> cur.execute("CREATE TABLE foo (id serial PRIMARY KEY);")
++            >>> pprint(conn.notices)
++            ['NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "foo_pkey" for table "foo"\n',
++             'NOTICE:  CREATE TABLE will create implicit sequence "foo_id_seq" for serial column "foo.id"\n']
++
++        To avoid a leak in case excessive notices are generated, only the last
++        50 messages are kept.
++
++        You can configure what messages to receive using `PostgreSQL logging
++        configuration parameters`__ such as ``log_statement``,
++        ``client_min_messages``, ``log_min_duration_statement`` etc.
++
++        .. __: http://www.postgresql.org/docs/8.4/static/runtime-config-logging.html
++
++
++    .. attribute:: notifies
++
++        List containing asynchronous notifications received by the session.
++
++        Received notifications have the form of a 2 items tuple
++        :samp:`({pid},{name})`, where :samp:`{pid}` is the PID of the backend
++        that sent the notification and :samp:`{name}` is the signal name
++        specified in the :sql:`NOTIFY` command.
++
++        For other details see :ref:`async-notify`.
++
++    .. index::
++        pair: Backend; PID
++
++    .. method:: get_backend_pid()
++
++        Returns the process ID (PID) of the backend server process handling
++        this connection.
++
++        Note that the PID belongs to a process executing on the database
++        server host, not the local host!
++
++        .. seealso:: libpq docs for `PQbackendPID()`__ for details.
++
++            .. __: http://www.postgresql.org/docs/8.4/static/libpq-status.html#AEN33590
++
++        .. versionadded:: 2.0.8
++
++
++    .. index::
++        pair: Server; Parameters
++
++    .. method:: get_parameter_status(parameter)
++
++        Look up a current parameter setting of the server.
++
++        Potential values for ``parameter`` are: ``server_version``,
++        ``server_encoding``, ``client_encoding``, ``is_superuser``,
++        ``session_authorization``, ``DateStyle``, ``TimeZone``,
++        ``integer_datetimes``, and ``standard_conforming_strings``.
++
++        If server did not report requested parameter, return ``None``.
++
++        .. seealso:: libpq docs for `PQparameterStatus()`__ for details.
++
++            .. __: http://www.postgresql.org/docs/8.4/static/libpq-status.html#AEN33499
++
++        .. versionadded:: 2.0.12
++
++
++    .. index::
++        pair: Transaction; Status
++
++    .. method:: get_transaction_status()
++
++        Return the current session transaction status as an integer.  Symbolic
++        constants for the values are defined in the module
++        `psycopg2.extensions`: see :ref:`transaction-status-constants`
++        for the available values.
++
++        .. seealso:: libpq docs for `PQtransactionStatus()`__ for details.
++
++            .. __: http://www.postgresql.org/docs/8.4/static/libpq-status.html#AEN33480
++
++
++    .. index::
++        pair: Protocol; Version
++
++    .. attribute:: protocol_version
++
++        A read-only integer representing frontend/backend protocol being used.
++        It can be 2 or 3.
++
++        .. seealso:: libpq docs for `PQprotocolVersion()`__ for details.
++
++            .. __: http://www.postgresql.org/docs/8.4/static/libpq-status.html#AEN33546
++
++        .. versionadded:: 2.0.12
++
++
++    .. index::
++        pair: Server; Version
++
++    .. attribute:: server_version
++
++        A read-only integer representing the backend version.
++
++        The number is formed by converting the major, minor, and revision
++        numbers into two-decimal-digit numbers and appending them together.
++        For example, version 8.1.5 will be returned as ``80105``.
++
++        .. seealso:: libpq docs for `PQserverVersion()`__ for details.
++
++            .. __: http://www.postgresql.org/docs/8.4/static/libpq-status.html#AEN33556
++
++        .. versionadded:: 2.0.12
++
++
++    .. index::
++        pair: Connection; Status
++
++    .. attribute:: status
++
++        A read-only integer representing the status of the connection.
++        Symbolic constants for the values are defined in the module
++        `psycopg2.extensions`: see :ref:`connection-status-constants`
++        for the available values.
++
++
++    .. method:: lobject([oid [, mode [, new_oid [, new_file [, lobject_factory]]]]])
++
++        Return a new database large object. See :ref:`large-objects` for an
++        overview.
++
++        :param oid: The OID of the object to read or write. 0 to create
++            a new large object and and have its OID assigned automatically.
++        :param mode: Access mode to the object: can be ``r``, ``w``,
++            ``rw`` or ``n`` (meaning don't open it).
++        :param new_oid: Create a new object using the specified OID. The
++            function raises `OperationalError` if the OID is already in
++            use. Default is 0, meaning assign a new one automatically.
++        :param new_file: The name of a file to be imported in the the database
++            (using the |lo_import|_ function)
++        :param lobject_factory: Subclass of
++            `~psycopg2.extensions.lobject` to be instantiated.
++        :rtype: `~psycopg2.extensions.lobject`
++
++        .. |lo_import| replace:: `!lo_import()`
++        .. _lo_import: http://www.postgresql.org/docs/8.4/static/lo-interfaces.html#AEN36307
++
++        .. versionadded:: 2.0.8
++
++
++
++    .. rubric:: Methods related to asynchronous support.
++
++    .. versionadded:: 2.2.0
++
++    .. seealso:: :ref:`async-support` and :ref:`green-support`.
++
++
++    .. attribute:: async
++
++        Read only attribute: 1 if the connection is asynchronous, 0 otherwse.
++
++
++    .. method:: poll()
++
++        Used during an asynchronous connection attempt, or when a cursor is
++        executing a query on an asynchronous connection, make communication
++        proceed if it wouldn't block.
++
++        Return one of the constants defined in :ref:`poll-constants`. If it
++        returns `~psycopg2.extensions.POLL_OK` then the connection has been
++        estabilished or the query results are available on the client.
++        Otherwise wait until the file descriptor returned by `fileno()` is
++        ready to read or to write, as explained in :ref:`async-support`.
++        `poll()` should be also used by the function installed by
++        `~psycopg2.extensions.set_wait_callback()` as explained in
++        :ref:`green-support`.
++
++        `poll()` is also used to receive asynchronous notifications from the
++        database: see :ref:`async-notify` from further details.
++
++
++    .. method:: fileno()
++
++        Return the file descriptor underlying the connection: useful to read
++        its status during asynchronous communication.
++
++
++    .. method:: isexecuting()
++
++        Return `True` if the connection is executing an asynchronous operation.
++
++
++.. testcode::
++    :hide:
++
++    conn.rollback()
 === added file 'doc/html/_sources/cursor.txt'
 --- doc/html/_sources/cursor.txt	1970-01-01 00:00:00 +0000
 +++ doc/html/_sources/cursor.txt	2010-07-28 20:35:51 +0000
@@ -0,0 +1,473 @@
++The ``cursor`` class
++====================
++
++.. sectionauthor:: Daniele Varrazzo <daniele.varrazzo@gmail.com>
++
++.. testsetup:: *
++
++    from StringIO import StringIO
++    import sys
++
++    create_test_table()
++
++    # initial data
++    cur.executemany("INSERT INTO test (num, data) VALUES (%s, %s)",
++        [(100, "abc'def"), (None, 'dada'), (42, 'bar')])
++    conn.commit()
++
++
++.. class:: cursor
++
++    Allows Python code to execute PostgreSQL command in a database session.
++    Cursors are created by the `connection.cursor()` method: they are
++    bound to the connection for the entire lifetime and all the commands are
++    executed in the context of the database session wrapped by the connection.
++
++    Cursors created from the same connection are not isolated, i.e., any
++    changes done to the database by a cursor are immediately visible by the
++    other cursors. Cursors created from different connections can or can not
++    be isolated, depending on the connections' :ref:`isolation level
++    <transactions-control>`. See also `~connection.rollback()` and
++    `~connection.commit()` methods.
++
++    Cursors are *not* thread safe: a multithread application can create
++    many cursors from the same connection and should use each cursor from
++    a single thread. See :ref:`thread-safety` for details.
++
++
++    .. attribute:: description
++
++        This read-only attribute is a sequence of 7-item sequences.
++
++        Each of these sequences contains information describing one result
++        column:
++
++        - ``name``
++        - ``type_code``
++        - ``display_size``
++        - ``internal_size``
++        - ``precision``
++        - ``scale``
++        - ``null_ok``
++
++        The first two items (``name`` and ``type_code``) are always specified,
++        the other five are optional and are set to ``None`` if no meaningful
++        values can be provided.
++
++        This attribute will be ``None`` for operations that do not return rows
++        or if the cursor has not had an operation invoked via the
++        |execute*|_ methods yet.
++
++        The ``type_code`` can be interpreted by comparing it to the Type
++        Objects specified in the section :ref:`type-objects-and-constructors`.
++        It is also used to register typecasters to convert PostgreSQL types to
++        Python objects: see :ref:`type-casting-from-sql-to-python`.
++
++
++    .. method:: close()
++
++        Close the cursor now (rather than whenever `!__del__()` is
++        called).  The cursor will be unusable from this point forward; an
++        `~psycopg2.InterfaceError` will be raised if any operation is
++        attempted with the cursor.
++
++    .. attribute:: closed
++
++        Read-only boolean attribute: specifies if the cursor is closed
++        (``True``) or not (``False``).
++
++        .. extension::
++
++            The `closed` attribute is a Psycopg extension to the
++            |DBAPI|.
++
++        .. versionadded:: 2.0.7
++
++
++    .. attribute:: connection
++
++        Read-only attribute returning a reference to the `connection`
++        object on which the cursor was created.
++
++
++    .. attribute:: name
++
++        Read-only attribute containing the name of the cursor if it was
++        creates as named cursor by `connection.cursor()`, or ``None`` if
++        it is a client side cursor.  See :ref:`server-side-cursors`.
++
++        .. extension::
++
++            The `name` attribute is a Psycopg extension to the |DBAPI|.
++
++
++
++    .. |execute*| replace:: `execute*()`
++
++    .. _execute*:
++
++    .. rubric:: Commands execution methods
++
++
++    .. method:: execute(operation [, parameters])
++
++        Prepare and execute a database operation (query or command).
++
++        Parameters may be provided as sequence or mapping and will be bound to
++        variables in the operation.  Variables are specified either with
++        positional (``%s``) or named (:samp:`%({name})s`) placeholders. See
++        :ref:`query-parameters`.
++
++        The method returns `None`. If a query was executed, the returned
++        values can be retrieved using |fetch*|_ methods.
++
++
++    .. method:: mogrify(operation [, parameters])
++
++        Return a query string after arguments binding. The string returned is
++        exactly the one that would be sent to the database running the
++        `~cursor.execute()` method or similar.
++
++            >>> cur.mogrify("INSERT INTO test (num, data) VALUES (%s, %s)", (42, 'bar'))
++            "INSERT INTO test (num, data) VALUES (42, E'bar')"
++
++        .. extension::
++
++            The `mogrify()` method is a Psycopg extension to the |DBAPI|.
++
++
++    .. method:: executemany(operation, seq_of_parameters)
++
++        Prepare a database operation (query or command) and then execute it
++        against all parameter tuples or mappings found in the sequence
++        `seq_of_parameters`.
++
++        The function is mostly useful for commands that update the database:
++        any result set returned by the query is discarded.
++
++        Parameters are bounded to the query using the same rules described in
++        the `~cursor.execute()` method.
++
++
++    .. method:: callproc(procname [, parameters])
++
++        Call a stored database procedure with the given name. The sequence of
++        parameters must contain one entry for each argument that the procedure
++        expects. The result of the call is returned as modified copy of the
++        input sequence. Input parameters are left untouched, output and
++        input/output parameters replaced with possibly new values.
++
++        The procedure may also provide a result set as output. This must then
++        be made available through the standard |fetch*|_ methods.
++
++
++    .. method:: setinputsizes(sizes)
++
++        This method is exposed in compliance with the |DBAPI|. It currently
++        does nothing but it is safe to call it.
++
++
++
++    .. |fetch*| replace:: `!fetch*()`
++
++    .. _fetch*:
++
++    .. rubric:: Results retrieval methods
++
++
++    The following methods are used to read data from the database after an
++    `~cursor.execute()` call.
++
++    .. _cursor-iterable:
++
++    .. note::
++
++        `cursor` objects are iterable, so, instead of calling
++        explicitly `~cursor.fetchone()` in a loop, the object itself can
++        be used:
++
++            >>> cur.execute("SELECT * FROM test;")
++            >>> for record in cur:
++            ...     print record
++            ...
++            (1, 100, "abc'def")
++            (2, None, 'dada')
++            (3, 42, 'bar')
++
++
++    .. method:: fetchone()
++
++        Fetch the next row of a query result set, returning a single tuple,
++        or ``None`` when no more data is available:
++
++            >>> cur.execute("SELECT * FROM test WHERE id = %s", (3,))
++            >>> cur.fetchone()
++            (3, 42, 'bar')
++
++        A `~psycopg2.ProgrammingError` is raised if the previous call
++        to |execute*|_ did not produce any result set or no call was issued
++        yet.
++
++
++    .. method:: fetchmany([size=cursor.arraysize])
++
++        Fetch the next set of rows of a query result, returning a list of
++        tuples. An empty list is returned when no more rows are available.
++
++        The number of rows to fetch per call is specified by the parameter.
++        If it is not given, the cursor's `~cursor.arraysize` determines
++        the number of rows to be fetched. The method should try to fetch as
++        many rows as indicated by the size parameter. If this is not possible
++        due to the specified number of rows not being available, fewer rows
++        may be returned:
++
++            >>> cur.execute("SELECT * FROM test;")
++            >>> cur.fetchmany(2)
++            [(1, 100, "abc'def"), (2, None, 'dada')]
++            >>> cur.fetchmany(2)
++            [(3, 42, 'bar')]
++            >>> cur.fetchmany(2)
++            []
++
++        A `~psycopg2.ProgrammingError` is raised if the previous call to
++        |execute*|_ did not produce any result set or no call was issued yet.
++
++        Note there are performance considerations involved with the size
++        parameter.  For optimal performance, it is usually best to use the
++        `~cursor.arraysize` attribute.  If the size parameter is used,
++        then it is best for it to retain the same value from one
++        `fetchmany()` call to the next.
++
++
++    .. method:: fetchall()
++
++        Fetch all (remaining) rows of a query result, returning them as a list
++        of tuples.  An empty list is returned if there is no more record to
++        fetch.
++
++            >>> cur.execute("SELECT * FROM test;")
++            >>> cur.fetchall()
++            [(1, 100, "abc'def"), (2, None, 'dada'), (3, 42, 'bar')]
++
++        A `~psycopg2.ProgrammingError` is raised if the previous call to
++        |execute*|_ did not produce any result set or no call was issued yet.
++
++
++    .. method:: scroll(value [, mode='relative'])
++
++        Scroll the cursor in the result set to a new position according
++        to mode.
++
++        If `mode` is ``relative`` (default), value is taken as offset to
++        the current position in the result set, if set to ``absolute``,
++        value states an absolute target position.
++
++        If the scroll operation would leave the result set, a
++        `~psycopg2.ProgrammingError` is raised and the cursor position is
++        not changed.
++
++        The method can be used both for client-side cursors and
++        :ref:`server-side cursors <server-side-cursors>`.
++
++        .. note::
++
++            According to the |DBAPI|_, the exception raised for a cursor out
++            of bound should have been `!IndexError`.  The best option is
++            probably to catch both exceptions in your code::
++
++                try:
++                    cur.scroll(1000 * 1000)
++                except (ProgrammingError, IndexError), exc:
++                    deal_with_it(exc)
++
++
++    .. attribute:: arraysize
++
++        This read/write attribute specifies the number of rows to fetch at a
++        time with `~cursor.fetchmany()`. It defaults to 1 meaning to fetch
++        a single row at a time.
++
++
++    .. attribute:: rowcount
++
++        This read-only attribute specifies the number of rows that the last
++        |execute*|_ produced (for :abbr:`DQL (Data Query Language)` statements
++        like :sql:`SELECT`) or affected (for
++        :abbr:`DML (Data Manipulation Language)` statements like :sql:`UPDATE`
++        or :sql:`INSERT`).
++
++        The attribute is -1 in case no |execute*| has been performed on
++        the cursor or the row count of the last operation if it can't be
++        determined by the interface.
++
++        .. note::
++            The |DBAPI|_ interface reserves to redefine the latter case to
++            have the object return ``None`` instead of -1 in future versions
++            of the specification.
++
++
++    .. attribute:: rownumber
++
++        This read-only attribute provides the current 0-based index of the
++        cursor in the result set or ``None`` if the index cannot be
++        determined.
++
++        The index can be seen as index of the cursor in a sequence (the result
++        set). The next fetch operation will fetch the row indexed by
++        `rownumber` in that sequence.
++
++
++    .. index:: oid
++
++    .. attribute:: lastrowid
++
++        This read-only attribute provides the OID of the last row inserted
++        by the cursor. If the table wasn't created with OID support or the
++        last operation is not a single record insert, the attribute is set to
++        ``None``.
++
++        PostgreSQL currently advices to not create OIDs on the tables and the
++        default for |CREATE-TABLE|__ is to not support them. The
++        |INSERT-RETURNING|__ syntax available from PostgreSQL 8.3 allows more
++        flexibility.
++
++        .. |CREATE-TABLE| replace:: :sql:`CREATE TABLE`
++        .. __: http://www.postgresql.org/docs/8.4/static/sql-createtable.html
++
++        .. |INSERT-RETURNING| replace:: :sql:`INSERT ... RETURNING`
++        .. __: http://www.postgresql.org/docs/8.4/static/sql-insert.html
++
++
++    .. method:: nextset()
++
++        This method is not supported (PostgreSQL does not have multiple data
++        sets) and will raise a `~psycopg2.NotSupportedError` exception.
++
++
++    .. method:: setoutputsize(size [, column])
++
++        This method is exposed in compliance with the |DBAPI|. It currently
++        does nothing but it is safe to call it.
++
++
++    .. attribute:: query
++
++        Read-only attribute containing the body of the last query sent to the
++        backend (including bound arguments). ``None`` if no query has been
++        executed yet:
++
++            >>> cur.execute("INSERT INTO test (num, data) VALUES (%s, %s)", (42, 'bar'))
++            >>> cur.query
++            "INSERT INTO test (num, data) VALUES (42, E'bar')"
++
++        .. extension::
++
++            The `query` attribute is a Psycopg extension to the |DBAPI|.
++
++
++    .. attribute:: statusmessage
++
++        Read-only attribute containing the message returned by the last
++        command:
++
++            >>> cur.execute("INSERT INTO test (num, data) VALUES (%s, %s)", (42, 'bar'))
++            >>> cur.statusmessage
++            'INSERT 0 1'
++
++        .. extension::
++
++            The `statusmessage` attribute is a Psycopg extension to the
++            |DBAPI|.
++
++
++    .. attribute:: tzinfo_factory
++
++        The time zone factory used to handle data types such as
++        :sql:`TIMESTAMP WITH TIME ZONE`.  It should be a |tzinfo|_ object.
++        See also the `psycopg2.tz` module.
++
++        .. |tzinfo| replace:: `!tzinfo`
++        .. _tzinfo: http://docs.python.org/library/datetime.html#tzinfo-objects
++
++
++    .. rubric:: COPY-related methods
++
++    .. extension::
++
++        The :sql:`COPY` command is a PostgreSQL extension to the SQL standard.
++        As such, its support is a Psycopg extension to the |DBAPI|.
++
++    .. method:: copy_from(file, table, sep='\\t', null='\\N', columns=None)
++
++        Read data *from* the file-like object `file` appending them to
++        the table named `table`.  `file` must have both
++        `!read()` and `!readline()` method.  See :ref:`copy` for an
++        overview.
++
++        The optional argument `sep` is the columns separator and
++        `null` represents :sql:`NULL` values in the file.
++
++        The `columns` argument is a sequence containing the name of the
++        fields where the read data will be entered.  Its length and column
++        type should match the content of the read file.  If not specifies, it
++        is assumed that the entire table matches the file structure.
++
++            >>> f = StringIO("42\tfoo\n74\tbar\n")
++            >>> cur.copy_from(f, 'test', columns=('num', 'data'))
++            >>> cur.execute("select * from test where id > 5;")
++            >>> cur.fetchall()
++            [(6, 42, 'foo'), (7, 74, 'bar')]
++
++        .. versionchanged:: 2.0.6
++            added the `columns` parameter.
++
++
++    .. method:: copy_to(file, table, sep='\\t', null='\\N', columns=None)
++
++        Write the content of the table named `table` *to* the file-like
++        object `file`.  `file` must have a `!write()` method.
++        See :ref:`copy` for an overview.
++
++        The optional argument `sep` is the columns separator and
++        `null` represents :sql:`NULL` values in the file.
++
++        The `columns` argument is a sequence of field names: if not
++        ``None`` only the specified fields will be included in the dump.
++
++            >>> cur.copy_to(sys.stdout, 'test', sep="|")
++            1|100|abc'def
++            2|\N|dada
++            ...
++
++        .. versionchanged:: 2.0.6
++            added the `columns` parameter.
++
++
++    .. method:: copy_expert(sql, file [, size])
++
++        Submit a user-composed :sql:`COPY` statement. The method is useful to
++        handle all the parameters that PostgreSQL makes available (see
++        |COPY|__ command documentation).
++
++        `file` must be an open, readable file for :sql:`COPY FROM` or an
++        open, writeable file for :sql:`COPY TO`. The optional `size`
++        argument, when specified for a :sql:`COPY FROM` statement, will be
++        passed to `file`\ 's read method to control the read buffer
++        size.
++
++            >>> cur.copy_expert("COPY test TO STDOUT WITH CSV HEADER", sys.stdout)
++            id,num,data
++            1,100,abc'def
++            2,,dada
++            ...
++
++        .. |COPY| replace:: :sql:`COPY`
++        .. __: http://www.postgresql.org/docs/8.4/static/sql-copy.html
++
++        .. versionadded:: 2.0.6
++
++
++.. testcode::
++    :hide:
++
++    conn.rollback()
 === added file 'doc/html/_sources/errorcodes.txt'
 --- doc/html/_sources/errorcodes.txt	1970-01-01 00:00:00 +0000
 +++ doc/html/_sources/errorcodes.txt	2010-07-28 20:35:51 +0000
@@ -0,0 +1,76 @@
++`psycopg2.errorcodes` -- Error codes defined by PostgreSQL
++===============================================================
++
++.. sectionauthor:: Daniele Varrazzo <daniele.varrazzo@gmail.com>
++
++.. index::
++    single: Error; Codes
++
++.. module:: psycopg2.errorcodes
++
++.. testsetup:: *
++
++    from psycopg2 import errorcodes
++
++.. versionadded:: 2.0.6
++
++This module contains symbolic names for all PostgreSQL error codes and error
++classes codes.  Subclasses of `~psycopg2.Error` make the PostgreSQL error
++code available in the `~psycopg2.Error.pgcode` attribute.
++
++From PostgreSQL documentation:
++
++    All messages emitted by the PostgreSQL server are assigned five-character
++    error codes that follow the SQL standard's conventions for :sql:`SQLSTATE`
++    codes.  Applications that need to know which error condition has occurred
++    should usually test the error code, rather than looking at the textual
++    error message.  The error codes are less likely to change across
++    PostgreSQL releases, and also are not subject to change due to
++    localization of error messages. Note that some, but not all, of the error
++    codes produced by PostgreSQL are defined by the SQL standard; some
++    additional error codes for conditions not defined by the standard have
++    been invented or borrowed from other databases.
++
++    According to the standard, the first two characters of an error code
++    denote a class of errors, while the last three characters indicate a
++    specific condition within that class. Thus, an application that does not
++    recognize the specific error code can still be able to infer what to do
++    from the error class.
++
++.. seealso:: `PostgreSQL Error Codes table`__
++
++    .. __: http://www.postgresql.org/docs/8.4/static/errcodes-appendix.html#ERRCODES-TABLE
++
++
++An example of the available constants defined in the module:
++
++    >>> errorcodes.CLASS_SYNTAX_ERROR_OR_ACCESS_RULE_VIOLATION
++    '42'
++    >>> errorcodes.UNDEFINED_TABLE
++    '42P01'
++
++Constants representing all the error values documented by PostgreSQL versions
++between 8.1 and 8.4 are included in the module.
++
++
++.. autofunction:: lookup(code)
++
++    .. doctest::
++
++        >>> try:
++        ...     cur.execute("SELECT ouch FROM aargh;")
++        ... except Exception, e:
++        ...     pass
++        ...
++        >>> errorcodes.lookup(e.pgcode[:2])
++        'CLASS_SYNTAX_ERROR_OR_ACCESS_RULE_VIOLATION'
++        >>> errorcodes.lookup(e.pgcode)
++        'UNDEFINED_TABLE'
++
++    .. versionadded:: 2.0.14
++
++
++.. testcode::
++    :hide:
++
++    conn.rollback()
 === added file 'doc/html/_sources/extensions.txt'
 --- doc/html/_sources/extensions.txt	1970-01-01 00:00:00 +0000
 +++ doc/html/_sources/extensions.txt	2010-07-28 20:35:51 +0000
@@ -0,0 +1,565 @@
++`psycopg2.extensions` -- Extensions to the DB API
++======================================================
++
++.. sectionauthor:: Daniele Varrazzo <daniele.varrazzo@gmail.com>
++
++.. module:: psycopg2.extensions
++
++.. testsetup:: *
++
++    from psycopg2.extensions import AsIs, Binary, QuotedString, ISOLATION_LEVEL_AUTOCOMMIT
++
++The module contains a few objects and function extending the minimum set of
++functionalities defined by the |DBAPI|_.
++
++
++.. class:: connection
++
++    Is the class usually returned by the `~psycopg2.connect()` function.
++    It is exposed by the `extensions` module in order to allow
++    subclassing to extend its behaviour: the subclass should be passed to the
++    `!connect()` function using the `connection_factory` parameter.
++    See also :ref:`subclassing-connection`.
++
++    Subclasses should have constructor signature :samp:`({dsn}, {async}=0)`.
++
++    For a complete description of the class, see `connection`.
++
++.. class:: cursor
++
++    It is the class usually returnded by the `connection.cursor()`
++    method. It is exposed by the `extensions` module in order to allow
++    subclassing to extend its behaviour: the subclass should be passed to the
++    `!cursor()` method using the `cursor_factory` parameter. See
++    also :ref:`subclassing-cursor`.
++
++    For a complete description of the class, see `cursor`.
++
++.. class:: lobject(conn [, oid [, mode [, new_oid [, new_file ]]]])
++
++    Wrapper for a PostgreSQL large object. See :ref:`large-objects` for an
++    overview.
++
++    The class can be subclassed: see the `connection.lobject()` to know
++    how to specify a `!lobject` subclass.
++
++    .. versionadded:: 2.0.8
++
++    .. attribute:: oid
++
++        Database OID of the object.
++
++    .. attribute:: mode
++
++        The mode the database was open (``r``, ``w``, ``rw`` or ``n``).
++
++    .. method:: read(bytes=-1)
++
++        Read a chunk of data from the current file position. If -1 (default)
++        read all the remaining data.
++
++    .. method:: write(str)
++
++        Write a string to the large object. Return the number of bytes
++        written.
++
++    .. method:: export(file_name)
++
++        Export the large object content to the file system.
++
++        The method uses the efficient |lo_export|_ libpq function.
++
++        .. |lo_export| replace:: `!lo_export()`
++        .. _lo_export: http://www.postgresql.org/docs/8.4/static/lo-interfaces.html#AEN36330
++
++    .. method:: seek(offset, whence=0)
++
++        Set the lobject current position.
++
++    .. method:: tell()
++
++        Return the lobject current position.
++
++    .. method:: truncate(len=0)
++
++        .. versionadded:: 2.2.0
++
++        Truncate the lobject to the given size.
++
++        The method will only be available if Psycopg has been built against libpq
++        from PostgreSQL 8.3 or later and can only be used with PostgreSQL servers
++        running these versions. It uses the |lo_truncate|_ libpq function.
++
++        .. |lo_truncate| replace:: `!lo_truncate()`
++        .. _lo_truncate: http://www.postgresql.org/docs/8.4/static/lo-interfaces.html#AEN36420
++
++    .. method:: close()
++
++        Close the object.
++
++    .. attribute:: closed
++
++        Boolean attribute specifying if the object is closed.
++
++    .. method:: unlink()
++
++        Close the object and remove it from the database.
++
++
++.. autofunction:: set_wait_callback(f)
++
++    .. versionadded:: 2.2.0
++
++.. autofunction:: get_wait_callback()
++
++    .. versionadded:: 2.2.0
++
++
++.. _sql-adaptation-objects:
++
++SQL adaptation protocol objects
++-------------------------------
++
++Psycopg provides a flexible system to adapt Python objects to the SQL syntax
++(inspired to the :pep:`246`), allowing serialization in PostgreSQL. See
++:ref:`adapting-new-types` for a detailed description.  The following objects
++deal with Python objects adaptation:
++
++.. function:: adapt(obj)
++
++    Return the SQL representation of *obj* as a string.  Raise a
++    `~psycopg2.ProgrammingError` if how to adapt the object is unknown.
++    In order to allow new objects to be adapted, register a new adapter for it
++    using the `register_adapter()` function.
++
++    The function is the entry point of the adaptation mechanism: it can be
++    used to write adapters for complex objects by recursively calling
++    `!adapt()` on its components.
++
++.. function:: register_adapter(class, adapter)
++
++    Register a new adapter for the objects of class *class*.
++
++    *adapter* should be a function taking a single argument (the object
++    to adapt) and returning an object conforming the `ISQLQuote`
++    protocol (e.g. exposing a `!getquoted()` method).  The `AsIs` is
++    often useful for this task.
++
++    Once an object is registered, it can be safely used in SQL queries and by
++    the `adapt()` function.
++
++.. class:: ISQLQuote(wrapped_object)
++
++    Represents the SQL adaptation protocol.  Objects conforming this protocol
++    should implement a `!getquoted()` method.
++
++    Adapters may subclass `!ISQLQuote`, but is not necessary: it is
++    enough to expose a `!getquoted()` method to be conforming.
++
++    .. attribute:: _wrapped
++
++        The wrapped object passes to the constructor
++
++    .. method:: getquoted()
++
++        Subclasses or other conforming objects should return a valid SQL
++        string representing the wrapped object. The `!ISQLQuote`
++        implementation does nothing.
++
++.. class:: AsIs
++
++    Adapter conform to the `ISQLQuote` protocol useful for objects
++    whose string representation is already valid as SQL representation.
++
++    .. method:: getquoted()
++
++        Return the `str()` conversion of the wrapped object.
++
++            >>> AsIs(42).getquoted()
++            '42'
++
++.. class:: QuotedString
++
++    Adapter conform to the `ISQLQuote` protocol for string-like
++    objects.
++
++    .. method:: getquoted()
++
++        Return the string enclosed in single quotes.  Any single quote
++        appearing in the the string is escaped by doubling it according to SQL
++        string constants syntax.  Backslashes are escaped too.
++
++            >>> QuotedString(r"O'Reilly").getquoted()
++            "'O''Reilly'"
++
++.. class:: Binary
++
++    Adapter conform to the `ISQLQuote` protocol for binary objects.
++
++    .. method:: getquoted()
++
++        Return the string enclosed in single quotes.  It performs the same
++        escaping of the `QuotedString` adapter, plus it knows how to
++        escape non-printable chars.
++
++            >>> Binary("\x00\x08\x0F").getquoted()
++            "'\\\\000\\\\010\\\\017'"
++
++    .. versionchanged:: 2.0.14
++        previously the adapter was not exposed by the `extensions`
++        module. In older versions it can be imported from the implementation
++        module `!psycopg2._psycopg`.
++
++
++
++.. class:: Boolean
++           Float
++           SQL_IN
++
++        Specialized adapters for builtin objects.
++
++.. class:: DateFromPy
++           TimeFromPy
++           TimestampFromPy
++           IntervalFromPy
++
++        Specialized adapters for Python datetime objects.
++
++.. class:: DateFromMx
++           TimeFromMx
++           TimestampFromMx
++           IntervalFromMx
++
++        Specialized adapters for `mx.DateTime`_ objects.
++
++.. data:: adapters
++
++    Dictionary of the currently registered object adapters.  Use
++    `register_adapter()` to add an adapter for a new type.
++
++
++
++Database types casting functions
++--------------------------------
++
++These functions are used to manipulate type casters to convert from PostgreSQL
++types to Python objects.  See :ref:`type-casting-from-sql-to-python` for
++details.
++
++.. function:: new_type(oids, name, adapter)
++
++    Create a new type caster to convert from a PostgreSQL type to a Python
++    object.  The created object must be registered using
++    `register_type()` to be used.
++
++    :param oids: tuple of OIDs of the PostgreSQL type to convert.
++    :param name: the name of the new type adapter.
++    :param adapter: the adaptation function.
++
++    The object OID can be read from the `cursor.description` attribute
++    or by querying from the PostgreSQL catalog.
++
++    *adapter* should have signature :samp:`fun({value}, {cur})` where
++    *value* is the string representation returned by PostgreSQL and
++    *cur* is the cursor from which data are read. In case of
++    :sql:`NULL`, *value* will be ``None``. The adapter should return the
++    converted object.
++
++    See :ref:`type-casting-from-sql-to-python` for an usage example.
++
++
++.. function:: register_type(obj [, scope])
++
++    Register a type caster created using `new_type()`.
++
++    If *scope* is specified, it should be a `connection` or a
++    `cursor`: the type caster will be effective only limited to the
++    specified object.  Otherwise it will be globally registered.
++
++
++.. data:: string_types
++
++    The global register of type casters.
++
++
++.. index::
++    single: Encoding; Mapping
++
++.. data:: encodings
++
++    Mapping from `PostgreSQL encoding`__ names to `Python codec`__ names.
++    Used by Psycopg when adapting or casting unicode strings. See
++    :ref:`unicode-handling`.
++
++    .. __: http://www.postgresql.org/docs/8.4/static/multibyte.html
++    .. __: http://docs.python.org/library/codecs.html#standard-encodings
++
++
++
++.. index::
++    single: Exceptions; Additional
++
++Additional exceptions
++---------------------
++
++The module exports a few exceptions in addition to the :ref:`standard ones
++<dbapi-exceptions>` defined by the |DBAPI|_.
++
++.. exception:: QueryCanceledError
++
++    (subclasses `~psycopg2.OperationalError`)
++
++    Error related to SQL query cancelation.  It can be trapped specifically to
++    detect a timeout.
++
++    .. versionadded:: 2.0.7
++
++
++.. exception:: TransactionRollbackError
++
++    (subclasses `~psycopg2.OperationalError`)
++
++    Error causing transaction rollback (deadlocks, serialisation failures,
++    etc).  It can be trapped specifically to detect a deadlock.
++
++    .. versionadded:: 2.0.7
++
++
++
++.. index::
++    pair: Isolation level; Constants
++
++.. _isolation-level-constants:
++
++Isolation level constants
++-------------------------
++
++Psycopg2 `connection` objects hold informations about the PostgreSQL
++`transaction isolation level`_.  The current transaction level can be read
++from the `~connection.isolation_level` attribute.  The default isolation
++level is :sql:`READ COMMITTED`.  A different isolation level con be set
++through the `~connection.set_isolation_level()` method.  The level can be
++set to one of the following constants:
++
++.. data:: ISOLATION_LEVEL_AUTOCOMMIT
++
++    No transaction is started when command are issued and no
++    `~connection.commit()` or `~connection.rollback()` is required.
++    Some PostgreSQL command such as :sql:`CREATE DATABASE` or :sql:`VACUUM`
++    can't run into a transaction: to run such command use::
++
++        >>> conn.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT)
++
++    See also :ref:`transactions-control`.
++
++.. data:: ISOLATION_LEVEL_READ_UNCOMMITTED
++
++    The :sql:`READ UNCOMMITTED` isolation level is defined in the SQL standard
++    but not available in the |MVCC| model of PostgreSQL: it is replaced by the
++    stricter :sql:`READ COMMITTED`.
++
++.. data:: ISOLATION_LEVEL_READ_COMMITTED
++
++    This is the default value.  A new transaction is started at the first
++    `~cursor.execute()` command on a cursor and at each new
++    `!execute()` after a `~connection.commit()` or a
++    `~connection.rollback()`.  The transaction runs in the PostgreSQL
++    :sql:`READ COMMITTED` isolation level.
++
++.. data:: ISOLATION_LEVEL_REPEATABLE_READ
++
++    The :sql:`REPEATABLE READ` isolation level is defined in the SQL standard
++    but not available in the |MVCC| model of PostgreSQL: it is replaced by the
++    stricter :sql:`SERIALIZABLE`.
++
++.. data:: ISOLATION_LEVEL_SERIALIZABLE
++
++    Transactions are run at a :sql:`SERIALIZABLE` isolation level. This is the
++    strictest transactions isolation level, equivalent to having the
++    transactions executed serially rather than concurrently. However
++    applications using this level must be prepared to retry reansactions due
++    to serialization failures. See `serializable isolation level`_ in
++    PostgreSQL documentation.
++
++
++
++.. index::
++    pair: Transaction status; Constants
++
++.. _transaction-status-constants:
++
++Transaction status constants
++----------------------------
++
++These values represent the possible status of a transaction: the current value
++can be read using the `connection.get_transaction_status()` method.
++
++.. data:: TRANSACTION_STATUS_IDLE
++
++    The session is idle and there is no current transaction.
++
++.. data:: TRANSACTION_STATUS_ACTIVE
++
++    A command is currently in progress.
++
++.. data:: TRANSACTION_STATUS_INTRANS
++
++    The session is idle in a valid transaction block.
++
++.. data:: TRANSACTION_STATUS_INERROR
++
++    The session is idle in a failed transaction block.
++
++.. data:: TRANSACTION_STATUS_UNKNOWN
++
++    Reported if the connection with the server is bad.
++
++
++
++.. index::
++    pair: Connection status; Constants
++
++.. _connection-status-constants:
++
++Connection status constants
++---------------------------
++
++These values represent the possible status of a connection: the current value
++can be read from the `~connection.status` attribute.
++
++It is possible to find the connection in other status than the one shown below.
++Those are the only states in which a working connection is expected to be found
++during the execution of regular Python client code: other states are for
++internal usage and Python code should not rely on them.
++
++.. data:: STATUS_READY
++
++    Connection established. No transaction in progress.
++
++.. data:: STATUS_BEGIN
++
++    Connection established. A transaction is currently in progress.
++
++.. data:: STATUS_IN_TRANSACTION
++
++    An alias for `STATUS_BEGIN`
++
++
++
++.. index::
++    pair: Poll status; Constants
++
++.. _poll-constants:
++
++Poll constants
++--------------
++
++.. versionadded:: 2.2.0
++
++These values can be returned by `connection.poll()` during asynchronous
++connection and communication.  They match the values in the libpq enum
++`!PostgresPollingStatusType`.  See :ref:`async-support` and
++:ref:`green-support`.
++
++.. data:: POLL_OK
++
++    The data being read is available, or the file descriptor is ready for
++    writing: reading or writing will not block.
++
++.. data:: POLL_READ
++
++    Some data is being read from the backend, but it is not available yet on
++    the client and reading would block.  Upon receiving this value, the client
++    should wait for the connection file descriptor to be ready *for reading*.
++    For example::
++
++        select.select([conn.fileno()], [], [])
++
++.. data:: POLL_WRITE
++
++    Some data is being sent to the backend but the connection file descriptor
++    can't currently accept new data.  Upon receiving this value, the client
++    should wait for the connection file descriptor to be ready *for writing*.
++    For example::
++
++        select.select([], [conn.fileno()], [])
++
++.. data:: POLL_ERROR
++
++    There was a problem during connection polling. This value should actually
++    never be returned: in case of poll error usually an exception containing
++    the relevant details is raised.
++
++
++
++Additional database types
++-------------------------
++
++The `!extensions` module includes typecasters for many standard
++PostgreSQL types.  These objects allow the conversion of returned data into
++Python objects.  All the typecasters are automatically registered, except
++`UNICODE` and `UNICODEARRAY`: you can register them using
++`register_type()` in order to receive Unicode objects instead of strings
++from the database.  See :ref:`unicode-handling` for details.
++
++.. data:: BOOLEAN
++          DATE
++          DECIMAL
++          FLOAT
++          INTEGER
++          INTERVAL
++          LONGINTEGER
++          TIME
++          UNICODE
++
++    Typecasters for basic types. Notice that a few other ones (`~psycopg2.BINARY`,
++    `~psycopg2.DATETIME`, `~psycopg2.NUMBER`, `~psycopg2.ROWID`,
++    `~psycopg2.STRING`) are exposed by the `psycopg2` module for |DBAPI|_
++    compliance.
++
++.. data:: BINARYARRAY
++          BOOLEANARRAY
++          DATEARRAY
++          DATETIMEARRAY
++          DECIMALARRAY
++          FLOATARRAY
++          INTEGERARRAY
++          INTERVALARRAY
++          LONGINTEGERARRAY
++          ROWIDARRAY
++          STRINGARRAY
++          TIMEARRAY
++          UNICODEARRAY
++
++    Typecasters to convert arrays of sql types into Python lists.
++
++.. data:: PYDATE
++          PYDATETIME
++          PYINTERVAL
++          PYTIME
++          PYDATEARRAY
++          PYDATETIMEARRAY
++          PYINTERVALARRAY
++          PYTIMEARRAY
++
++    Typecasters to convert time-related data types to Python `!datetime`
++    objects.
++
++.. data:: MXDATE
++          MXDATETIME
++          MXINTERVAL
++          MXTIME
++          MXDATEARRAY
++          MXDATETIMEARRAY
++          MXINTERVALARRAY
++          MXTIMEARRAY
++
++    Typecasters to convert time-related data types to `mx.DateTime`_ objects.
++    Only available if Psycopg was compiled with `!mx` support.
++
++.. versionchanged:: 2.2.0
++        previously the `DECIMAL` typecaster and the specific time-related
++        typecasters (`!PY*` and `!MX*`) were not exposed by the `extensions`
++        module. In older versions they can be imported from the implementation
++        module `!psycopg2._psycopg`.
++
 === added file 'doc/html/_sources/extras.txt'
 --- doc/html/_sources/extras.txt	1970-01-01 00:00:00 +0000
 +++ doc/html/_sources/extras.txt	2010-07-28 20:35:51 +0000
@@ -0,0 +1,165 @@
++`psycopg2.extras` -- Miscellaneous goodies for Psycopg 2
++=============================================================
++
++.. sectionauthor:: Daniele Varrazzo <daniele.varrazzo@gmail.com>
++
++.. module:: psycopg2.extras
++
++.. testsetup::
++
++    import psycopg2.extras
++    from psycopg2.extras import Inet
++
++    create_test_table()
++
++This module is a generic place used to hold little helper functions and
++classes until a better place in the distribution is found.
++
++
++.. index::
++    pair: Cursor; Dictionary
++
++.. _dict-cursor:
++
++Dictionary-like cursor
++----------------------
++
++The dict cursors allow to access to the retrieved records using an iterface
++similar to the Python dictionaries instead of the tuples. You can use it
++either passing `DictConnection` as `connection_factory` argument
++to the `~psycopg2.connect()` function or passing `DictCursor` as
++the `!cursor_factory` argument to the `~connection.cursor()` method
++of a regular `connection`.
++
++    >>> dict_cur = conn.cursor(cursor_factory=psycopg2.extras.DictCursor)
++    >>> dict_cur.execute("INSERT INTO test (num, data) VALUES(%s, %s)",
++    ...                  (100, "abc'def"))
++    >>> dict_cur.execute("SELECT * FROM test")
++    >>> rec = dict_cur.fetchone()
++    >>> rec['id']
++    1
++    >>> rec['num']
++    100
++    >>> rec['data']
++    "abc'def"
++
++The records still support indexing as the original tuple:
++
++    >>> rec[2]
++    "abc'def"
++
++
++.. autoclass:: DictCursor
++
++.. autoclass:: DictConnection
++
++.. autoclass:: DictRow
++
++
++Real dictionary cursor
++^^^^^^^^^^^^^^^^^^^^^^
++
++.. autoclass:: RealDictCursor
++
++.. autoclass:: RealDictConnection
++
++.. autoclass:: RealDictRow
++
++
++
++.. index::
++    pair: Cursor; Logging
++
++Logging cursor
++--------------
++
++.. autoclass:: LoggingConnection
++    :members: initialize,filter
++
++.. autoclass:: LoggingCursor
++
++
++.. autoclass:: MinTimeLoggingConnection
++    :members: initialize,filter
++
++.. autoclass:: MinTimeLoggingCursor
++
++
++
++.. index::
++    pair: UUID; Data types
++
++UUID data type
++--------------
++
++.. versionadded:: 2.0.9
++.. versionchanged:: 2.0.13 added UUID array support.
++
++.. doctest::
++
++    >>> psycopg2.extras.register_uuid()
++    <psycopg2._psycopg.type object at 0x...>
++
++    >>> # Python UUID can be used in SQL queries
++    >>> import uuid
++    >>> my_uuid = uuid.UUID('{12345678-1234-5678-1234-567812345678}')
++    >>> psycopg2.extensions.adapt(my_uuid).getquoted()
++    "'12345678-1234-5678-1234-567812345678'::uuid"
++
++    >>> # PostgreSQL UUID are transformed into Python UUID objects.
++    >>> cur.execute("SELECT 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::uuid")
++    >>> cur.fetchone()[0]
++    UUID('a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11')
++
++
++.. autofunction:: register_uuid
++
++.. autoclass:: UUID_adapter
++
++
++
++.. index::
++    pair: INET; Data types
++
++:sql:`inet` data type
++----------------------
++
++.. versionadded:: 2.0.9
++
++.. doctest::
++
++    >>> psycopg2.extras.register_inet()
++    <psycopg2._psycopg.type object at 0x...>
++
++    >>> cur.mogrify("SELECT %s", (Inet('127.0.0.1/32'),))
++    "SELECT E'127.0.0.1/32'::inet"
++
++    >>> cur.execute("SELECT '192.168.0.1/24'::inet")
++    >>> cur.fetchone()[0].addr
++    '192.168.0.1/24'
++
++
++.. autofunction:: register_inet()
++
++.. autoclass:: Inet
++
++
++
++.. index::
++    single: Time zones; Fractional
++
++Fractional time zones
++---------------------
++
++.. autofunction:: register_tstz_w_secs
++
++    .. versionadded:: 2.0.9
++
++.. index::
++   pair: Example; Coroutine;
++
++Coroutine support
++-----------------
++
++.. autofunction:: wait_select(conn)
++
 === added file 'doc/html/_sources/faq.txt'
 --- doc/html/_sources/faq.txt	1970-01-01 00:00:00 +0000
 +++ doc/html/_sources/faq.txt	2010-07-28 20:35:51 +0000
@@ -0,0 +1,139 @@
++Frequently Asked Questions
++==========================
++
++.. sectionauthor:: Daniele Varrazzo <daniele.varrazzo@gmail.com>
++
++Here are a few gotchas you may encounter using `psycopg2`.  Feel free to
++suggest new entries!
++
++
++Problems with transactions handling
++-----------------------------------
++
++.. cssclass:: faq
++
++Why does `!psycopg2` leave database sessions "idle in transaction"?
++    Psycopg normally starts a new transaction the first time a query is
++    executed, e.g. calling `cursor.execute()`, even if the command is a
++    :sql:`SELECT`.  The transaction is not closed until an explicit
++    `~connection.commit()` or `~connection.rollback()`.
++
++    If you are writing a long-living program, you should probably ensure to
++    call one of the transaction closing methods before leaving the connection
++    unused for a long time (which may also be a few seconds, depending on the
++    concurrency level in your database).  Alternatively you can use a
++    connection in :ref:`autocommit <autocommit>` mode to avoid a new
++    transaction to be started at the first command.
++
++I receive the error *current transaction is aborted, commands ignored until end of transaction block* and can't do anything else!

Ubuntupsycopg2 package

Merge lp:~groldster/ubuntu/maverick/psycopg2/merge-611040 into lp:ubuntu/maverick/psycopg2

Commit message

Description of the change

Preview Diff

Subscribers

Ubuntu
psycopg2 package