diff options
| author | Oleksandr Shulgin <oleksandr.shulgin@zalando.de> | 2015-06-02 12:42:03 +0200 |
|---|---|---|
| committer | Oleksandr Shulgin <oleksandr.shulgin@zalando.de> | 2015-06-02 12:42:03 +0200 |
| commit | cc08e141625f08fbec25f858c9a26a2f7e498576 (patch) | |
| tree | 4dba4a6d733bf884acb90cff0a9e5905271abe8d /lib/extensions.py | |
| parent | 3200cd77bf07c5de3375dece678eb58f714956b9 (diff) | |
| parent | 8d4ac25b56cff1ef39ca0d79ea12a3ae0f5a0f51 (diff) | |
| download | psycopg2-cc08e141625f08fbec25f858c9a26a2f7e498576.tar.gz | |
Merge branch 'master' into feature/parse-dsn
Conflicts:
lib/extensions.py
Diffstat (limited to 'lib/extensions.py')
| -rw-r--r-- | lib/extensions.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/extensions.py b/lib/extensions.py index f951c51..d10e8ac 100644 --- a/lib/extensions.py +++ b/lib/extensions.py @@ -56,7 +56,7 @@ try: except ImportError: pass -from psycopg2._psycopg import adapt, adapters, encodings, connection, cursor, lobject, Xid, parse_dsn +from psycopg2._psycopg import adapt, adapters, encodings, connection, cursor, lobject, Xid, libpq_version, parse_dsn from psycopg2._psycopg import string_types, binary_types, new_type, new_array_type, register_type from psycopg2._psycopg import ISQLQuote, Notify, Diagnostics, Column |