Merge lp://qastaging/~groldster/ubuntu/maverick/psycopg2/merge-611040 into lp://qastaging/ubuntu/maverick/psycopg2
Proposed by
Mikhail Turov
Status: | Merged |
---|---|
Merged at revision: | 14 |
Proposed branch: | lp://qastaging/~groldster/ubuntu/maverick/psycopg2/merge-611040 |
Merge into: | lp://qastaging/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://qastaging/~groldster/ubuntu/maverick/psycopg2/merge-611040 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Holbach (community) | Approve | ||
Review via email:
|
Description of the change
merge psycopg2 2.2.1-1 (main) from Debian unstable (main)
To post a comment you must log in.
Good work!