cartodb4/cartodb-postgresql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try to work with both python2 and python3

Browse Source
This commit is contained in:
Raul Marin
2019-10-22 16:49:08 +02:00
parent 0cecfdb112
commit 9686ad5cfe
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts-available/CDB_Groups_API.sql
+8 -5
View File
@@ -189,7 +189,10 @@ CREATE OR REPLACE
FUNCTION @extschema@._CDB_Group_API_Request(method text, url text, body text, valid_return_codes int[]) FUNCTION @extschema@._CDB_Group_API_Request(method text, url text, body text, valid_return_codes int[])
RETURNS int AS RETURNS int AS
$$ $$
import httplib try:
import httplib as client
except:
from http import client
params = plpy.execute("select c.host, c.port, c.timeout, c.auth from @extschema@._CDB_Group_API_Conf() c;")[0] params = plpy.execute("select c.host, c.port, c.timeout, c.auth from @extschema@._CDB_Group_API_Conf() c;")[0]
if params['host'] is None: if params['host'] is None:
@@ -202,17 +205,17 @@ $$
last_err = None last_err = None
while retry > 0: while retry > 0:
try: try:
client = SD['groups_api_client'] = httplib.HTTPConnection(params['host'], params['port'], False, params['timeout']) conn = SD['groups_api_client'] = client.HTTPConnection(params['host'], params['port'], False, params['timeout'])
database_name = plpy.execute("select current_database();")[0]['current_database'] database_name = plpy.execute("select current_database();")[0]['current_database']
client.request(method, url.format(database_name), body, headers) conn.request(method, url.format(database_name), body, headers)
response = client.getresponse() response = conn.getresponse()
assert response.status in valid_return_codes assert response.status in valid_return_codes
return response.status return response.status
except Exception as err: except Exception as err:
retry -= 1 retry -= 1
last_err = err last_err = err
plpy.warning('Retrying after: ' + str(err)) plpy.warning('Retrying after: ' + str(err))
client = SD['groups_api_client'] = None conn = SD['groups_api_client'] = None
if last_err is not None: if last_err is not None:
plpy.error('Fatal Group API error: ' + str(last_err)) plpy.error('Fatal Group API error: ' + str(last_err))