Add .json to Tokens in enable_nts

skimbrel · skimbrel · commit a20892df1071 · 2015-05-20T17:50:20.000-07:00
diff --git a/tests/conversations/__init__.py b/tests/conversations/__init__.py
@@ -1 +0,0 @@
-
diff --git a/tests/test_access_token.py b/tests/test_access_token.py
@@ -71,6 +71,6 @@ def test_enable_nts(self):
         payload = decode(token, 'secret')
         self._validate_claims(payload)
         assert_equal(1, len(payload['grants']))
-        assert_equal('https://api.twilio.com/2010-04-01/Accounts/AC123/Tokens',
+        assert_equal('https://api.twilio.com/2010-04-01/Accounts/AC123/Tokens.json',
                      payload['grants'][0]['res'])
         assert_equal(['POST'], payload['grants'][0]['act'])
diff --git a/tests/test_make_request.py b/tests/test_make_request.py
@@ -100,7 +100,7 @@ def test_make_request_basic_auth(self, mock_request, mock_response):
                 'authorization': 'Basic {}'.format(
                     base64.b64encode("{}:{}".format('AC123', 'AuthToken'))
                 ),
-                'user-agent': 'Python-httplib2/0.8 (gzip)'
+                'user-agent': ANY,
             }
         )
 
diff --git a/twilio/access_token.py b/twilio/access_token.py
@@ -47,7 +47,7 @@ def add_endpoint_grant(self, endpoint, actions=None):
         return self.add_grant(resource, actions)
 
     def enable_nts(self):
-        return self.add_rest_grant('/Tokens', HTTP_POST)
+        return self.add_rest_grant('/Tokens.json', HTTP_POST)
 
     def to_jwt(self):
         now = int(time.time())
diff --git a/twilio/rest/resources/conversations/__init__.py b/twilio/rest/resources/conversations/__init__.py
@@ -1 +0,0 @@
-
diff --git a/twilio/rest/resources/conversations/conversations.py b/twilio/rest/resources/conversations/conversations.py
@@ -19,7 +19,8 @@ def delete_instance(self, sid):
 
 
 class Conversation(NextGenInstanceResource):
-    """A Conversation instance representing a call between two or more participants.
+    """A Conversation instance representing a call between two or more
+    participants.
 
     .. attribute:: sid
 

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ def test_make_request_basic_auth(self, mock_request, mock_response):`
`100`	`100`	`'authorization': 'Basic {}'.format(`
`101`	`101`	`base64.b64encode("{}:{}".format('AC123', 'AuthToken'))`
`102`	`102`	`),`
`103`		`- 'user-agent': 'Python-httplib2/0.8 (gzip)'`
	`103`	`+ 'user-agent': ANY,`
`104`	`104`	`}`
`105`	`105`	`)`
`106`	`106`