Merge pull request #26 from CiscoZeus/fix-path-joins

Fix path joins

requirements.txt

@@ -1,3 +1,3 @@
 wheel
 requests
-wsgiref
+wsgiref

setup.py

@@ -34,17 +34,19 @@
 
 setup(
     name='cisco-zeus',
-    version='0.2.2',
+    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",
     author_email='msolanas@cisco.com',
     url='https://github.com/CiscoZeus/python-zeusclient.git',
     packages=[
         'zeus',
+        'zeus.interfaces',
     ],
-    package_dir={'zeus':
-                 'zeus'},
+    package_dir={
+        'zeus': 'zeus',
+    },
     include_package_data=True,
     install_requires=requirements,
     license="Apache License 2.0",

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")