gCubeSystem
/
conductor-worker-python
17
0
Fork 0
Code Pull Requests Releases Activity

make url composition absorb multiple / because new version of server are sensible to it

This commit is contained in:
dcore94 2023-05-22 19:01:24 +02:00
parent f0e6ddf63e
commit 566ebd41db
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
conductor/conductor.py
View File

@ -29,7 +29,7 @@ class BaseClient(object):
headers = {'Content-Type': 'application/json', 'Accept': 'application/json'}
def __init__(self, baseURL, baseResource, headers=None):
self.baseURL = baseURL
self.baseURL = baseURL.rstrip("/")
self.headers = self.mergeTwoDicts(self.headers, headers) if headers != None else self.headers
self.baseResource = baseResource
@ -43,7 +43,7 @@ class BaseClient(object):
return resp.json()
def post(self, resPath, queryParams, body, headers=None, timeout=(5, 10)):
theUrl = "{}/{}".format(self.baseURL, resPath)
theUrl = "{}/{}".format(self.baseURL, resPath.lstrip("/"))
theHeader = self.headers
if headers is not None:
theHeader = self.mergeTwoDicts(self.headers, headers)
@ -57,7 +57,7 @@ class BaseClient(object):
return self.__return(resp, theHeader)
def put(self, resPath, queryParams=None, body=None, headers=None, timeout=(5, 10)):
theUrl = "{}/{}".format(self.baseURL, resPath)
theUrl = "{}/{}".format(self.baseURL, resPath.lstrip("/"))
theHeader = self.headers
if headers is not None:
theHeader = self.mergeTwoDicts(self.headers, headers)
@ -72,7 +72,7 @@ class BaseClient(object):
self.__checkForSuccess(resp)
def delete(self, resPath, queryParams, timeout=(5, 10)):
theUrl = "{}/{}".format(self.baseURL, resPath)
theUrl = "{}/{}".format(self.baseURL, resPath.lstrip("/"))
resp = requests.delete(theUrl, params=queryParams, headers=self.headers, timeout=timeout)
self.__print(resp)
self.__checkForSuccess(resp)