Merge branch 'master' of https://github.com/twilio/twilio-python into identity-tokens

jingming · jingming · commit 3cfedafd6ae2 · 2015-12-03T14:04:54.000-08:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -10,6 +10,20 @@ Released December 3, 2015:
 
 - Add Access Tokens
 
+Version 4.9.2
+-------------
+
+Released November 25, 2015:
+
+- Fix for SIP Trunking bug
+
+Version 4.9.1
+-------------
+
+Released November 18, 2015:
+
+- Addresses bug with SMS Pricing country
+
 Version 4.9.0
 -------------
 
diff --git a/twilio/rest/pricing.py b/twilio/rest/pricing.py
@@ -36,7 +36,7 @@ def messaging_countries(self):
         Returns a :class:`MessagingCountries` resource
         :return: MessagingCountries
         """
-        messaging_countries_uri = "{0}/Messaging/Countries".format(
+        messaging_countries_uri = "{0}/Messaging".format(
             self.uri_base)
         return MessagingCountries(messaging_countries_uri, self.auth,
                                   self.timeout)
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):
