Merge in version 3.3.7

kyleconroy · kyleconroy · commit 82d2e15f6fb9 · 2012-06-14T17:07:16.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,8 @@ parts
 bin
 develop-eggs
 .installed.cfg
+scratch
+env
 
 # Installer logs
 pip-log.txt
diff --git a/docs/usage/accounts.rst b/docs/usage/accounts.rst
@@ -23,8 +23,8 @@ Use the :meth:`Account.update` to modify one of your accounts. Right now the onl
     AUTH_TOKEN = "YYYYYYYYYYYYYYYYYY"
 
     client = TwilioRestClient(ACCOUNT_SID, AUTH_TOKEN)
-    account = client.accounts.get()
-    account.update(name="My Awesome Account")
+    account = client.accounts.get(ACCOUNT_SID)
+    account.update(friendly_name="My Awesome Account")
 
 Creating Subaccounts
 ----------------------
diff --git a/docs/usage/basics.rst b/docs/usage/basics.rst
@@ -50,7 +50,7 @@ The :class:`TwilioRestClient` gives you access to various list resources. :meth:
     AUTH_TOKEN = "YYYYYYYYYYYYYYYYYY"
 
     client = TwilioRestClient(ACCOUNT_SID, AUTH_TOKEN)
-    resources = client.phone_calls.list()
+    resources = client.calls.list()
 
 :meth:`resource.ListResource.list` accepts paging arguments. The following will return page 3 with page size of 25.
 
@@ -63,7 +63,7 @@ The :class:`TwilioRestClient` gives you access to various list resources. :meth:
     AUTH_TOKEN = "YYYYYYYYYYYYYYYYYY"
 
     client = TwilioRestClient(ACCOUNT_SID, AUTH_TOKEN)
-    resources = client.phone_calls.list(page=3, page_size=25)
+    resources = client.calls.list(page=3, page_size=25)
 
 
 Listing All Resources
diff --git a/twilio/twiml.py b/twilio/twiml.py
@@ -81,7 +81,6 @@ def xml(self):
         return el
 
     def append(self, verb):
-        print self.nestables
         if not self.nestables or verb.name not in self.nestables:
             raise TwimlException("%s is not nestable inside %s" % \
                 (verb.name, self.name))
diff --git a/twilio/util.py b/twilio/util.py
@@ -30,13 +30,9 @@ def compute_signature(self, uri, params):
                 s += k + v
 
         # compute signature and compare signatures
-
         mac = hmac.new(self.token, s.encode("utf-8"), sha1)
         computed = base64.b64encode(mac.digest())
 
-        # print base64.b64decode(computed.strip())
-        # print base64.b64decode(computed.strip()).decode("utf-8")
-
         return computed.strip()
 
     def validate(self, uri, params, signature):
