From 337158a572b42351cba3a07ecf98ab815eab6983 Mon Sep 17 00:00:00 2001 From: Victor Fonseca Date: Wed, 8 Feb 2017 14:40:10 -0800 Subject: [PATCH] Fix joining of urls --- requirements.txt | 2 +- setup.py | 2 +- zeus/interfaces/rest.py | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index 7fd9b46..c4cc4d4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ wheel requests -wsgiref \ No newline at end of file +wsgiref diff --git a/setup.py b/setup.py index fdc601c..f03c5c6 100755 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ setup( name='cisco-zeus', - version='0.2.2.5', + version='0.2.2.6', description="Python client for CiscoZeus.io. It allows a user to post/query logs and metrics using Zeus.", long_description=readme + '\n\n' + history, author="Marc Solanas Tarre", diff --git a/zeus/interfaces/rest.py b/zeus/interfaces/rest.py index 5db782d..23ffdcc 100644 --- a/zeus/interfaces/rest.py +++ b/zeus/interfaces/rest.py @@ -16,6 +16,7 @@ import requests from urlparse import urlparse +from urlparse import urljoin METHOD_POST = 'POST' METHOD_GET = 'GET' @@ -33,14 +34,15 @@ def __init__(self, server): self.server = ''.join(url_parts) def _sendRequest(self, method, path, data=None, headers=None): + final_url = urljoin(self.server, path) if method == METHOD_POST: - r = requests.post(self.server + path, data=data, headers=headers) + r = requests.post(final_url, data=data, headers=headers) elif method == METHOD_GET: - r = requests.get(self.server + path, params=data) + r = requests.get(final_url, params=data) elif method == METHOD_DELETE: - r = requests.delete(self.server + path) + r = requests.delete(final_url) elif method == METHOD_PUT: - r = requests.put(self.server + path, data=data, headers=headers) + r = requests.put(final_url, data=data, headers=headers) if r.status_code == 500: raise Exception("Internal Server Error")