Fix region support

jingming · jingming · commit e8d01c2ffd50 · 2017-03-27T16:15:46.000-07:00
diff --git a/examples/basic_usage.py b/examples/basic_usage.py
@@ -1,8 +1,7 @@
 import os
 
-from twilio.twiml import Response
-
 from twilio.rest import Client
+from twilio.twiml.voice_response import VoiceResponse
 
 ACCOUNT_SID = os.environ.get('TWILIO_ACCOUNT_SID')
 AUTH_TOKEN = os.environ.get('TWILIO_AUTH_TOKEN')
@@ -35,10 +34,10 @@ def example():
     new_call = client.calls.create(to='XXXX', from_='YYYY', method='GET')
 
     print('Serving TwiML')
-    twiml_response = Response()
+    twiml_response = VoiceResponse()
     twiml_response.say('Hello!')
     twiml_response.hangup()
-    twiml_xml = twiml_response.toxml()
+    twiml_xml = twiml_response.to_xml()
     print('Generated twiml: {}'.format(twiml_xml))
 
 
diff --git a/twilio/rest/__init__.py b/twilio/rest/__init__.py
@@ -99,9 +99,12 @@ def request(self, method, uri, params=None, data=None, headers=None, auth=None,
         if 'Accept' not in headers:
             headers['Accept'] = 'application/json'
 
+
         if self.region:
             head, tail = uri.split('.', 1)
-            uri = '.'.join([head, self.region, tail])
+
+            if not tail.startswith(self.region):
+                uri = '.'.join([head, self.region, tail])
 
         return self.http_client.request(
             method,
