Skip to content
Snippets Groups Projects
Commit 8554efdf authored by Roang's avatar Roang
Browse files

Update check_psql.py

* Use psycopg v3 instead of psycopg2
* Direct import of used fuctions
* Fix linting errors
parent 8cdb6435
Branches
Tags
No related merge requests found
...@@ -3,23 +3,24 @@ ...@@ -3,23 +3,24 @@
import os import os
import sys import sys
try: from psycopg import connect
import psycopg from psycopg.errors import OperationalError
except ImportError:
import psycopg2 as psycopg
url = os.getenv('DATABASE_URL') URL = os.getenv('DATABASE_URL')
if url is None or url == '': if URL is None or URL == '':
print('No DATABASE_URL specified!', file=sys.stderr) print('No DATABASE_URL specified!', file=sys.stderr)
sys.exit(2) sys.exit(2)
try: try:
if url.startswith('postgis://'): if URL.startswith('postgis://'):
url = 'postgresql://' + url[len('postgis://') :] URL = 'postgresql://' + URL[len('postgis://') :]
psycopg.connect(url) connect(URL)
except Exception as err: except OperationalError as err:
print('ERROR', file=sys.stderr) print('ERROR', file=sys.stderr)
print(' ', err, sep='', file=sys.stderr) print(' ', err, sep='', file=sys.stderr)
sys.exit(1) sys.exit(1)
except Exception as err: # pylint: disable=W0718
print('UNKNOWN', file=sys.stderr)
print(' ', err, sep='', file=sys.stderr)
sys.exit(3)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment