External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-18 17:37:30 -02:30
Code Issues Packages Projects Releases Wiki Activity

Don't error on a trailing slash, just fix it up

Browse Source
This commit is contained in:
Bill Nottingham
2019-11-25 10:55:18 -05:00
parent 4dd4928aab
commit ac9bf1afcf
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awxkit/awxkit/api/client.py
View File

@@ -74,9 +74,11 @@ class Connection(object):
raise ConnectionException(message="Unknown request method: {0}".format(method)) raise ConnectionException(message="Unknown request method: {0}".format(method))
use_endpoint = relative_endpoint use_endpoint = relative_endpoint
if self.server.endswith('/') and use_endpoint.startswith('/'): if self.server.endswith('/'):
raise RuntimeError('AWX URL given with trailing slash, remove slash.') self.server = self.server[:-1]
url = '{0.server}{1}'.format(self, use_endpoint) if use_endpoint.startswith('/'):
use_endpoint = use_endpoint[1:]
url = '/'.join([self.server, use_endpoint])
kwargs = dict(verify=self.verify, params=query_parameters, json=json, data=data, kwargs = dict(verify=self.verify, params=query_parameters, json=json, data=data,
hooks=dict(response=log_elapsed)) hooks=dict(response=log_elapsed))