diff options
| author | Amjith Ramanujam <amjith.r@gmail.com> | 2019-10-26 19:45:02 -0700 |
|---|---|---|
| committer | Amjith Ramanujam <amjith.r@gmail.com> | 2019-10-26 19:45:02 -0700 |
| commit | 43e79d00278250b8c253dbe9f44a54e3da5dec62 (patch) | |
| tree | caa039828954169ecf13e3c9b3ec8cb8efe544f5 /pgcli | |
| parent | 76133a37407a7a2aa3d8428a55e1a8d1c75c19a4 (diff) | |
Use libpq version instead of psycopg2 version.
Diffstat (limited to 'pgcli')
| -rw-r--r-- | pgcli/pgexecute.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pgcli/pgexecute.py b/pgcli/pgexecute.py index c79e2aec..e4605c02 100644 --- a/pgcli/pgexecute.py +++ b/pgcli/pgexecute.py @@ -7,7 +7,6 @@ import psycopg2.extensions as ext import sqlparse import pgspecial as special import select -from distutils.version import LooseVersion from psycopg2.extensions import POLL_OK, POLL_READ, POLL_WRITE, make_dsn from .packages.parseutils.meta import FunctionMetadata, ForeignKey from .encodingutils import unicode2utf8, PY2, utf8tounicode @@ -266,11 +265,11 @@ class PGExecute(object): # When we connect using a DSN, we don't really know what db, # user, etc. we connected to. Let's read it. # Note: moved this after setting autocommit because of #664. - psycopg2_version = LooseVersion(psycopg2.__version__) + libpq_version = psycopg2.__libpq_version__ dsn_parameters = {} - if psycopg2_version >= LooseVersion("2.8"): + if libpq_version >= 93000: # use actual connection info from psycopg2.extensions.Connection.info - # as psycopg>2.8 is available and required dependency + # as libpq_version > 9.3 is available and required dependency dsn_parameters = conn.info.dsn_parameters else: try: |