Remove Accounts component from TaskRouter URLs

skimbrel · skimbrel · commit 7bb4d07819c1 · 2015-02-12T08:46:36.000-08:00
diff --git a/tests/task_router/test_activities.py b/tests/task_router/test_activities.py
@@ -6,7 +6,7 @@
 from twilio.rest.resources.task_router.activities import Activities, Activity
 
 AUTH = ("AC123", "token")
-BASE_URI = "https://taskrouter.twilio.com/v1/Accounts/AC123/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+BASE_URI = "https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
 ACTIVITY_SID = "WAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
 
 
diff --git a/tests/test_client.py b/tests/test_client.py
@@ -56,7 +56,7 @@ def test_workflows(self, request):
         workflows = self.task_router_client.workflows("WS123")
         workflows = workflows.list()
         assert_is_not_none(workflows[0].sid)
-        uri = "https://taskrouter.twilio.com/v1/Accounts/ACCOUNT_SID/Workspaces/WS123/Workflows.json"
+        uri = "https://taskrouter.twilio.com/v1/Workspaces/WS123/Workflows.json"
         request.assert_called_with("GET", uri, headers=ANY, params={}, auth=AUTH)
 
 
diff --git a/twilio/rest/__init__.py b/twilio/rest/__init__.py
@@ -255,12 +255,10 @@ def __init__(self, account=None, token=None,
         """
         super(TwilioTaskRouterClient, self).__init__(account, token, base,
                                                      version, timeout)
+        self.base_uri = "{}/{}".format(base, version)
+        self.workspace_uri = "{}/Workspaces".format(self.base_uri)
 
-        self.workspaces = Workspaces(self.account_uri, self.auth, timeout)
-
-        self.workspace_uri = "{}/{}/Accounts/{}/Workspaces".format(
-            base, version, account
-        )
+        self.workspaces = Workspaces(self.base_uri, self.auth, timeout)
 
     def activities(self, workspace_sid):
         """
