diff options
author | Daniele Varrazzo <daniele.varrazzo@gmail.com> | 2011-01-10 00:29:09 +0000 |
---|---|---|
committer | Daniele Varrazzo <daniele.varrazzo@gmail.com> | 2011-01-10 00:46:02 +0000 |
commit | 79048ff19a2e3d14b8c7fa73f53ea3da9705afdd (patch) | |
tree | b12044135997adc76e16ab18bd16de40a023b808 /tests/dbapi20.py | |
parent | f345e7daeb1f4a80be168215b7256ae3a9c5b6c3 (diff) | |
parent | 48588e5f6943ad31ac9080536514e4ef5e52a60c (diff) | |
download | psycopg2-79048ff19a2e3d14b8c7fa73f53ea3da9705afdd.tar.gz |
Merge branch 'python2' into python3
Conflicts:
NEWS-2.3
tests/__init__.py
tests/test_lobject.py
tests/test_quote.py
tests/testutils.py
Diffstat (limited to 'tests/dbapi20.py')
0 files changed, 0 insertions, 0 deletions