Merge pull request #66 from digitalocean/url-sanitization

Fixes #61 - URL with trailing frontslash

Author: Zach Moody

pynetbox/api.py

@@ -89,7 +89,7 @@ def __init__(self, url, token=None, private_key=None,
             raise ValueError(
                 '"private_key" and "private_key_file" cannot be used together.'
             )
-        base_url = "{}/api".format(url)
+        base_url = "{}/api".format(url if url[-1] != '/' else url[:-1])
 
         self.api_kwargs = {
             "token": token,

tests/test_api.py

@@ -41,6 +41,18 @@ def test_get(self, mock):
         )
         self.assertTrue(api)
 
+    @patch(
+        'pynetbox.lib.query.requests.post',
+        return_value=Response(fixture='api/get_session_key.json')
+    )
+    def test_sanitize_url(self, mock):
+        api = pynetbox.api(
+            'http://localhost:8000/',
+            **def_kwargs
+        )
+        self.assertTrue(api)
+        self.assertEqual(api.api_kwargs['base_url'], 'http://localhost:8000/api')
+
 
 class ApiArgumentsTestCase(unittest.TestCase):