Merge branch 'release/v0.1.9'

airwaveapiclient/airwaveapiclient.py

@@ -3,10 +3,13 @@
 """airwaveapiclient."""
 
 
-import os
 from collections import OrderedDict
 import xmltodict
 import requests
+try:
+    from urllib.parse import urljoin
+except ImportError:
+    from urlparse import urljoin
 
 
 class AirWaveAPIClient(object):
@@ -62,7 +65,7 @@ def login(self):
         """
         requests.packages.urllib3.disable_warnings()
         self.session = requests.Session()
-        url = os.path.join(self.url, 'LOGIN')
+        url = self.api_path('LOGIN')
         destination = '/'
         next_action = ''
         params = {'credential_0': self.username,
@@ -96,7 +99,7 @@ def api_path(self, path):
             URL string 'https://xxx.xxx.xxx.xxx/xxxxxx'
 
         """
-        return os.path.join(self.url, path)
+        return urljoin(self.url, path)
 
     def amp_stats(self):
         """Get AMP stats.

docs/source/conf.py

@@ -65,9 +65,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.1.8'
+version = '0.1.9'
 # The full version, including alpha/beta/rc tags.
-release = '0.1.8'
+release = '0.1.9'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/source/history.rst

@@ -1,6 +1,10 @@
 History
 ============
 
+0.1.9 (2017-10-13)
+------------------
+* Change method to generate URL path.
+
 0.1.8 (2017-06-30)
 ------------------
 * Added AMP stats and folder list methods.

setup.py

@@ -62,7 +62,7 @@ def run_tests(self):
 
 setup(
     name="airwaveapiclient",
-    version="0.1.8",
+    version="0.1.9",
     description='Aruba Networks AirWave API Client.',
     long_description=README,
     author='Toshikatsu Murakoshi',