get rid of base url

tbarbugli · tbarbugli · commit 9855e76316f9 · 2017-12-10T19:58:08.000+01:00
diff --git a/stream/client.py b/stream/client.py
@@ -21,7 +21,6 @@
 
 
 class StreamClient(object):
-    base_url = 'https://api.stream-io-api.com/api/'
 
     def __init__(self, api_key, api_secret, app_id, version='v1.0', timeout=6.0, base_url=None, location=None):
         '''
@@ -77,8 +76,6 @@ def __init__(self, api_key, api_secret, app_id, version='v1.0', timeout=6.0, bas
         self.base_analytics_url = 'https://analytics.stream-io-api.com/analytics/'
 
         self.session = requests.Session()
-        # TODO: turn this back on after we verify it doesnt retry on slower requests
-        self.session.mount(self.base_url, HTTPAdapter(max_retries=0))
         self.auth = HTTPSignatureAuth(api_key, secret=api_secret)
         
         # setup personalization
diff --git a/stream/tests.py b/stream/tests.py
@@ -195,12 +195,14 @@ def test_heroku_location_compat(self):
         self.assertEqual(
             client.api_secret, 'gthc2t9gh7pzq52f6cky8w4r4up9dr6rju9w3fjgmkv6cdvvav2ufe5fv7e2r9qy')
 
+        feed_url = client.get_full_url('api', 'feed/')
         if self.local_tests:
             self.assertEqual(
-                client.base_url, 'http://localhost:8000/api/')
+                feed_url, 'http://localhost:8000/api/v1.0/feed/')
         else:
             self.assertEqual(
-                client.base_url, 'https://us-east-api.stream-io-api.com/api/')
+                feed_url, 'https://us-east-api.stream-io-api.com/api/v1.0/feed/')
+
         self.assertEqual(client.app_id, '1')
 
     def test_heroku_location(self):
@@ -211,12 +213,13 @@ def test_heroku_location(self):
         self.assertEqual(
             client.api_secret, 'gthc2t9gh7pzq52f6cky8w4r4up9dr6rju9w3fjgmkv6cdvvav2ufe5fv7e2r9qy')
 
+        feed_url = client.get_full_url('api', 'feed/')
         if self.local_tests:
             self.assertEqual(
-                client.base_url, 'http://localhost:8000/api/')
+                feed_url, 'http://localhost:8000/api/v1.0/feed/')
         else:
             self.assertEqual(
-                client.base_url, 'https://us-east-api.stream-io-api.com/api/')
+                feed_url, 'https://us-east-api.stream-io-api.com/api/v1.0/feed/')
         self.assertEqual(client.app_id, '1')
 
     def test_heroku_overwrite(self):
