Merge pull request #238 from twilio/fix-trunking

senthgit · senthgit · commit d7fd631cfeca · 2015-11-25T10:13:24.000-08:00
Fix for Broken Trunking helper library
diff --git a/twilio/rest/trunking.py b/twilio/rest/trunking.py
@@ -28,21 +28,21 @@ def __init__(self, account=None, token=None,
         """
         super(TwilioTrunkingClient, self).__init__(account, token, base,
                                                    version, timeout)
-        self.trunk_base_uri = "{0}/{1}/Trunks".format(base, version)
+        self.trunk_base_uri = "{0}/{1}".format(base, version)
 
     def credential_lists(self, trunk_sid):
         """
         Return a :class:`CredentialList` instance
         """
-        credential_lists_uri = "{0}/{1}/CredentialLists".format(
+        credential_lists_uri = "{0}/Trunks/{1}".format(
             self.trunk_base_uri, trunk_sid)
         return CredentialLists(credential_lists_uri, self.auth, self.timeout)
 
     def ip_access_control_lists(self, trunk_sid):
         """
         Return a :class:`IpAccessControlList` instance
         """
-        ip_access_control_lists_uri = "{0}/{1}/IpAccessControlLists".format(
+        ip_access_control_lists_uri = "{0}/Trunks/{1}".format(
             self.trunk_base_uri, trunk_sid)
         return IpAccessControlLists(ip_access_control_lists_uri, self.auth,
                                     self.timeout)
@@ -51,16 +51,16 @@ def origination_urls(self, trunk_sid):
         """
         Return a :class:`OriginationUrls` instance
         """
-        origination_urls_uri = "{0}/{1}/OriginationUrls".format(
+        origination_urls_uri = "{0}/Trunks/{1}".format(
             self.trunk_base_uri, trunk_sid)
         return OriginationUrls(origination_urls_uri, self.auth, self.timeout)
 
     def phone_numbers(self, trunk_sid):
         """
         Return a :class:`PhoneNumbers` instance
         """
-        phone_numbers_uri = "{0}/{1}/PhoneNumbers".format(self.trunk_base_uri,
-                                                          trunk_sid)
+        phone_numbers_uri = "{0}/Trunks/{1}".format(self.trunk_base_uri,
+                                                    trunk_sid)
         return PhoneNumbers(phone_numbers_uri, self.auth, self.timeout)
 
     def trunks(self):
