Variable name cleanup

kyleconroy · kyleconroy · commit 30a6b58ebcef · 2013-02-14T13:43:05.000-08:00
diff --git a/tests/test_twiml.py b/tests/test_twiml.py
@@ -419,6 +419,15 @@ def testSip(self):
         r = self.strip(r)
         self.assertEquals(r, '<?xml version="1.0" encoding="UTF-8"?><Response><Dial><Sip>foo@example.com</Sip></Dial></Response>')
 
+    def testSipUsernamePass(self):
+        """ should redirect the call"""
+        r = Response()
+        d = r.dial()
+        d.sip('foo@example.com', username='foo', password='bar')
+        r = self.strip(r)
+        self.assertEquals(r, '<?xml version="1.0" encoding="UTF-8"?><Response><Dial><Sip password="bar" username="foo">foo@example.com</Sip></Dial></Response>')
+
+
     def testSipUri(self):
         """ should redirect the call"""
         r = Response()
diff --git a/twilio/twiml.py b/twilio/twiml.py
@@ -412,8 +412,8 @@ def conference(self, name, **kwargs):
     def queue(self, name, **kwargs):
         return self.append(Queue(name, **kwargs))
 
-    def sip(self, name=None, **kwargs):
-        return self.append(Sip(name, **kwargs))
+    def sip(self, sip_address=None, **kwargs):
+        return self.append(Sip(sip_address, **kwargs))
 
     def addNumber(self, *args, **kwargs):
         return self.number(*args, **kwargs)
@@ -509,7 +509,7 @@ def headers(self, headers):
 
 
 class Uri(Verb):
-    """A collection of headers"""
+    """A uniform resource indentifier"""
     def __init__(self, uri, **kwargs):
         super(Uri, self).__init__(**kwargs)
         self.body = uri
