10000 Merge pull request #204 from zwhite/master · damui/twilio-python@9334f18 · GitHub
[go: up one dir, main page]
Skip to content

Commit 9334f18

Browse files
skimbrelskimbrel
committed
Merge pull request twilio#204 from zwhite/master
Fixes for python 2.6
2 parents 5bce154 + c7a4d41 commit 9334f18

16 files changed

+103
-102
lines changed

‎docs/usage/usage.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ over the last day.
1919
2020
todays_usage = client.usage.records.today
2121
for category in todays_usage:
22-
print '{}: {}'.format(category.description, category.price)
22+
print '{0}: {1}'.format(category.description, category.price)
2323
2424
This will print out the amount spent for each usage category over the
2525
last day. To see all of the possible usage categories, as well as all of the

‎tests/task_router/test_activities.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ def test_create(self, request):
2121

2222
activities = Activities(BASE_URI, AUTH)
2323
activity = activities.create("Test Activity", True)
24-
self.assertIsNotNone(activity)
24+
self.assertTrue(activity is not None)
2525
self.assertEqual(activity.date_created, datetime(2014, 5, 14, 10, 50, 2, tzinfo=pytz.utc))
2626
exp_params = {
2727
'FriendlyName': "Test Activity",
2828
'Available': "true"
2929
}
3030

31-
request.assert_called_with("POST", "{}/Activities".format(BASE_URI),
31+
request.assert_called_with("POST", "{0}/Activities".format(BASE_URI),
3232
data=exp_params, auth=AUTH,
3333
use_json_extension=False)
3434

@@ -39,7 +39,7 @@ def test_delete_instance(self, request):
3939
resp.status_code = 204
4040
request.return_value = resp
4141

42-
uri = "{}/Activities/{}".format(BASE_URI, ACTIVITY_SID)
42+
uri = "{0}/Activities/{1}".format(BASE_URI, ACTIVITY_SID)
4343
list_resource = Activities(BASE_URI, AUTH)
4444
activity = Activity(list_resource, ACTIVITY_SID)
4545
activity.delete()
@@ -53,7 +53,7 @@ def test_delete_list(self, request):
5353
resp.status_code = 204
5454
request.return_value = resp
5555

56-
uri = "{}/Activities/{}".format(BASE_URI, ACTIVITY_SID)
56+
uri = "{0}/Activities/{1}".format(BASE_URI, ACTIVITY_SID)
5757
list_resource = Activities(BASE_URI, AUTH)
5858
list_resource.delete(ACTIVITY_SID)
5959
request.assert_called_with("DELETE", uri, auth=AUTH,
@@ -65,7 +65,7 @@ def test_get(self, request):
6565
resp.status_code = 200
6666
request.return_value = resp
6767

68-
uri = "{}/Activities/{}".format(BASE_URI, ACTIVITY_SID)
68+
uri = "{0}/Activities/{1}".format(BASE_URI, ACTIVITY_SID)
6969
list_resource = Activities(BASE_URI, AUTH)
7070
list_resource.get(ACTIVITY_SID)
7171
request.assert_called_with("GET", uri, auth=AUTH,
@@ -77,7 +77,7 @@ def test_list(self, request):
7777
resp.status_code = 200
7878
request.return_value = resp
7979

80-
uri = "{}/Activities".format(BASE_URI)
80+
uri = "{0}/Activities".format(BASE_URI)
8181
list_resource = Activities(BASE_URI, AUTH)
8282
list_resource.list()
8383
request.assert_called_with("GET", uri, params={}, auth=AUTH,
@@ -89,7 +89,7 @@ def test_update_instance(self, request):
8989
resp.status_code = 201
9090
request.return_value = resp
9191

92-
uri = "{}/Activities/{}".format(BASE_URI, ACTIVITY_SID)
92+
uri = "{0}/Activities/{1}".format(BASE_URI, ACTIVITY_SID)
9393
list_resource = Activities(BASE_URI, AUTH)
9494
activity = Activity(list_resource, ACTIVITY_SID)
9595
activity.update(friendly_name='Test Activity', available=True)
@@ -107,7 +107,7 @@ def test_update_list(self, request):
107107
resp.status_code = 201
108108
request.return_value = resp
109109

110-
uri = "{}/Activities/{}".format(BASE_URI, ACTIVITY_SID)
110+
uri = "{0}/Activities/{1}".format(BASE_URI, ACTIVITY_SID)
111111
list_resource = Activities(BASE_URI, AUTH)
112112
list_resource.update(ACTIVITY_SID, friendly_name='Test Activity', available="true")
113113
exp_params = {

‎tests/task_router/test_capability.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def test_generate_token(self):
2020
token = self.cap.generate_token()
2121
decoded = jwt.decode(token, self.auth_token)
2222

23-
self.assertIsNotNone(decoded)
23+
self.assertTrue(decoded is not None)
2424
del decoded['exp']
2525
del decoded['policies']
2626

@@ -33,27 +33,27 @@ def test_generate_token(self):
3333
'version': 'v1',
3434
'friendly_name': self.worker_sid,
3535
}
36-
self.assertDictEqual(expected, decoded)
36+
self.assertEqual(expected, decoded)
3737

3838
def test_generate_token_default_ttl(self):
3939
token = self.cap.generate_token()
4040
decoded = jwt.decode(token, self.auth_token)
4141

42-
self.assertIsNotNone(decoded)
42+
self.assertTrue(decoded is not None)
4343
self.assertEqual(int(time.time()) + 3600, decoded['exp'])
4444

4545
def test_generate_token_custom_ttl(self):
4646
token = self.cap.generate_token(10000)
4747
decoded = jwt.decode(token, self.auth_token)
4848

49-
self.assertIsNotNone(decoded)
49+
self.assertTrue(decoded is not None)
5050
self.assertEqual(int(time.time()) + 10000, decoded['exp'])
5151

5252
def test_defaults(self):
5353
token = self.cap.generate_token()
5454
decoded = jwt.decode(token, self.auth_token)
5555

56-
self.assertIsNotNone(decoded)
56+
self.assertTrue(decoded is not None)
5757
websocket_url = (
5858
'https://event-bridge.twilio.com/v1/wschannels/%s/%s' %
5959
(self.account_sid, self.worker_sid)
@@ -89,7 +89,7 @@ def test_allow_worker_activity_updates(self):
8989
token = self.cap.generate_token()
9090
decoded = jwt.decode(token, self.auth_token)
9191

92-
self.assertIsNotNone(decoded)
92+
self.assertTrue(decoded is not None)
9393
url = 'https://taskrouter.twilio.com/v1/Workspaces/%s/Workers/%s' % (
9494
self.workspace_sid,
9595
self.worker_sid,
@@ -109,7 +109,7 @@ def test_allow_worker_fetch_attributes(self):
109109
token = self.cap.generate_token()
110110
decoded = jwt.decode(token, self.auth_token)
111111

112-
self.assertIsNotNone(decoded)
112+
self.assertTrue(decoded is not None)
113113
url = 'https://taskrouter.twilio.com/v1/Workspaces/%s/Workers/%s' % (
114114
self.workspace_sid,
115115
self.worker_sid,
@@ -130,7 +130,7 @@ def test_allow_task_reservation_updates(self):
130130
token = self.cap.generate_token()
131131
decoded = jwt.decode(token, self.auth_token)
132132

133-
self.assertIsNotNone(decoded)
133+
self.assertTrue(decoded is not None)
134134
url = 'https://taskrouter.twilio.com/v1/Workspaces/%s/Tasks/**' % (
135135
self.workspace_sid,
136136
)

‎tests/task_router/test_events.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def test_get(self, request):
1818
resp.status_code = 200
1919
request.return_value = resp
2020

21-
uri = "{}/Events/{}".format(BASE_URI, EVENT_SID)
21+
uri = "{0}/Events/{1}".format(BASE_URI, EVENT_SID)
2222
list_resource = Events(BASE_URI, AUTH)
2323
list_resource.get(EVENT_SID)
2424
request.assert_called_with("GET", uri, auth=AUTH,
@@ -30,7 +30,7 @@ def test_list(self, request):
3030
resp.status_code = 200
3131
request.return_value = resp
3232

33-
uri = "{}/Events".format(BASE_URI)
33+
uri = "{0}/Events".format(BASE_URI)
3434
list_resource = Events(BASE_URI, AUTH)
3535
list_resource.list()
3636
request.assert_called_with("GET", uri, params={}, auth=AUTH,

‎tests/task_router/test_reservations.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def test_get(self, request):
1818
re F438 sp.status_code = 200
1919
request.return_value = resp
2020

21-
uri = "{}/Reservations/{}".format(BASE_URI, RESERVATION_SID)
21+
uri = "{0}/Reservations/{1}".format(BASE_URI, RESERVATION_SID)
2222
list_resource = Reservations(BASE_URI, AUTH)
2323
list_resource.get(RESERVATION_SID)
2424
request.assert_called_with("GET", uri, auth=AUTH,
@@ -30,7 +30,7 @@ def test_list(self, request):
3030
resp.status_code = 200
3131
request.return_value = resp
3232

33-
uri = "{}/Reservations".format(BASE_URI)
33+
uri = "{0}/Reservations".format(BASE_URI)
3434
list_resource = Reservations(BASE_URI, AUTH)
3535
list_resource.list()
3636
request.assert_called_with("GET", uri, params={}, auth=AUTH,
@@ -42,7 +42,7 @@ def test_update_instance(self, request):
4242
resp.status_code = 201
4343
request.return_value = resp
4444

45-
uri = "{}/Reservations/{}".format(BASE_URI, RESERVATION_SID)
45+
uri = "{0}/Reservations/{1}".format(BASE_URI, RESERVATION_SID)
4646
list_resource = Reservations(BASE_URI, AUTH)
4747
workflow = Reservation(list_resource, RESERVATION_SID)
4848
workflow.update(worker_activity_sid='WAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', reservation_status='rejected')
@@ -60,7 +60,7 @@ def test_update_list(self, request):
6060
resp.status_code = 201
6161
request.return_value = resp
6262

63-
uri = "{}/Reservations/{}".format(BASE_URI, RESERVATION_SID)
63+
uri = "{0}/Reservations/{1}".format(BASE_URI, RESERVATION_SID)
6464
list_resource = Reservations(BASE_URI, AUTH)
6565
list_resource.update(RESERVATION_SID, worker_activity_sid='WAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
6666
reservation_status='rejected')

‎tests/task_router/test_statistics.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def test_fetch_worker_statistics(request):
2323
worker.statistics.get()
2424
request.assert_called_with(
2525
'GET',
26-
'{}/Workers/WK123/Statistics'.format(BASE_URI),
26+
'{0}/Workers/WK123/Statistics'.format(BASE_URI),
2727
params={},
2828
auth=AUTH,
2929
timeout=TIMEOUT,
@@ -40,7 +40,7 @@ def test_fetch_workers_statistics(request):
4040
workers = Workers(BASE_URI, AUTH, TIMEOUT)
4141
workers.statistics.get()
4242
request.assert_called_with('GET',
43-
'{}/Workers/Statistics'.format(BASE_URI),
43+
'{0}/Workers/Statistics'.format(BASE_URI),
4444
params={}, auth=AUTH, timeout=TIMEOUT,
4545
use_json_extension=False)
4646

@@ -56,7 +56,7 @@ def test_fetch_task_queue_statistics(request):
5656
tq.load_subresources()
5757
tq.statistics.get()
5858
request.assert_called_with('GET',
59-
'{}/TaskQueues/TQ123/Statistics'.format(BASE_URI),
59+
'{0}/TaskQueues/TQ123/Statistics'.format(BASE_URI),
6060
params={}, auth=AUTH, timeout=30,
6161
use_json_extension=False)
6262

@@ -70,7 +70,7 @@ def test_fetch_task_queues_statistics(request):
7070
tqs = TaskQueues(BASE_URI, AUTH, 30)
7171
tqs.statistics.get()
7272
request.assert_called_with('GET',
73-
'{}/TaskQueues/Statistics'.format(BASE_URI),
73+
'{0}/TaskQueues/Statistics'.format(BASE_URI),
7474
params={}, auth=AUTH, use_json_extension=False)
7575

7676

@@ -85,5 +85,5 @@ def test_fetch_task_workflow_statistics(request):
8585
workflow.load_subresources()
8686
workflow.statistics.get()
8787
request.assert_called_with('GET',
88-
'{}/Workflows/WF123/Statistics'.format(BASE_URI),
88+
'{0}/Workflows/WF123/Statistics'.format(BASE_URI),
8989
params={}, auth=AUTH, use_json_extension=False)

‎tests/task_router/test_task_queues.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def test_create(self, request):
2828
}
2929

3030
request.assert_called_with("POST",
31-
"{}/TaskQueues".format(BASE_URI),
31+
"{0}/TaskQueues".format(BASE_URI),
3232
data=exp_params, auth=AUTH, timeout=TIMEOUT,
3333
use_json_extension=False)
3434

@@ -39,7 +39,7 @@ def test_delete_instance(self, request):
3939
resp.status_code = 204
4040
request.return_value = resp
4141

42-
uri = "{}/TaskQueues/{}".format(BASE_URI, TASK_QUEUE_SID)
42+
uri = "{0}/TaskQueues/{1}".format(BASE_URI, TASK_QUEUE_SID)
4343
list_resource = TaskQueues(BASE_URI, AUTH, TIMEOUT)
4444
task_queue = TaskQueue(list_resource, TASK_QUEUE_SID)
4545
task_queue.delete()
@@ -53,7 +53,7 @@ def test_delete_list(self, request):
5353
resp.status_code = 204
5454
request.return_value = resp
5555

56-
uri = "{}/TaskQueues/{}".format(BASE_URI, TASK_QUEUE_SID)
56+
uri = "{0}/TaskQueues/{1}".format(BASE_URI, TASK_QUEUE_SID)
5757
list_resource = TaskQueues(BASE_URI, AUTH, TIMEOUT)
5858
list_resource.delete(TASK_QUEUE_SID)
5959
request.assert_called_with("DELETE", uri, auth=AUTH, timeout=TIMEOUT,
@@ -65,7 +65,7 @@ def test_get(self, request):
6565
resp.status_code = 200
6666
request.return_value = resp
6767

68-
uri = "{}/TaskQueues/{}".format(BASE_URI, TASK_QUEUE_SID)
68+
uri = "{0}/TaskQueues/{1}".format(BASE_URI, TASK_QUEUE_SID)
6969
list_resource = TaskQueues(BASE_URI, AUTH, TIMEOUT)
7070
list_resource.get(TASK_QUEUE_SID)
7171
request.assert_called_with("GET", uri, auth=AUTH, timeout=TIMEOUT,
@@ -77,7 +77,7 @@ def test_list(self, request):
7777
resp.status_code = 200
7878
request.return_value = resp
7979

80-
uri = "{}/TaskQueues".format(BASE_URI)
80+
uri = "{0}/TaskQueues".format(BASE_URI)
8181
list_resource = TaskQueues(BASE_URI, AUTH, TIMEOUT)
8282
list_resource.list()
8383
request.assert_called_with("GET", uri, params={}, auth=AUTH, timeout=TIMEOUT,
@@ -89,7 +89,7 @@ def test_update_instance(self, request):
8989
resp.status_code = 201
9090
request.return_value = resp
9191

92-
uri = "{}/TaskQueues/{}".format(BASE_URI, TASK_QUEUE_SID)
92+
uri = "{0}/TaskQueues/{1}".format(BASE_URI, TASK_QUEUE_SID)
9393
list_resource = TaskQueues(BASE_URI, AUTH, TIMEOUT)
9494
task_queue = TaskQueue(list_resource, TASK_QUEUE_SID)
9595
task_queue.update(friendly_name='Test TaskQueue', assignment_activity_sid='WAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
@@ -110,7 +110,7 @@ def test_update_list(self, request):
110110
resp.status_code = 201
111111
request.return_value = resp
112112

113-
uri = "{}/TaskQueues/{}".format(BASE_URI, TASK_QUEUE_SID)
113+
uri = "{0}/TaskQueues/{1}".format(BASE_URI, TASK_QUEUE_SID)
114114
list_resource = TaskQueues(BASE_URI, AUTH, TIMEOUT)
115115
list_resource.update(TASK_QUEUE_SID, friendly_name='Test TaskQueue',
116116
assignment_activity_sid='WAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',

‎tests/task_router/test_tasks.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def test_create(self, request):
2626
'Timeout': 60
2727
}
2828

29-
request.assert_called_with("POST", "{}/Tasks".format(BASE_URI),
29+
request.assert_called_with("POST", "{0}/Tasks".format(BASE_URI),
3030
data=exp_params, auth=AUTH,
3131
use_json_extension=False)
3232

@@ -37,7 +37,7 @@ def test_delete_instance(self, request):
3737
resp.status_code = 204
3838
request.return_value = resp
3939

40-
uri = "{}/Tasks/{}".format(BASE_URI, TASK_SID)
40+
uri = "{0}/Tasks/{1}".format(BASE_URI, TASK_SID)
4141
list_resource = Tasks(BASE_URI, AUTH)
4242
task = Task(list_resource, TASK_SID)
4343
task.delete()
@@ -51,7 +51,7 @@ def test_delete_list(self, request):
5151
resp.status_code = 204
5252
request.return_value = resp
5353

54-
uri = "{}/Tasks/{}".format(BASE_URI, TASK_SID)
54+
uri = "{0}/Tasks/{1}".format(BASE_URI, TASK_SID)
5555
list_resource = Tasks(BASE_URI, AUTH)
5656
list_resource.delete(TASK_SID)
5757
request.assert_called_with("DELETE", uri, auth=AUTH,
@@ -63,7 +63,7 @@ def test_get(self, request):
6363
resp.status_code = 200
6464
request.return_value = resp
6565

66-
uri = "{}/Tasks/{}".format(BASE_URI, TASK_SID)
66+
uri = "{0}/Tasks/{1}".format(BASE_URI, TASK_SID)
6767
list_resource = Tasks(BASE_URI, AUTH)
6868
list_resource.get(TASK_SID)
6969
request.assert_called_with("GET", uri, auth=AUTH,
@@ -75,7 +75,7 @@ def test_list(self, request):
7575
resp.status_code = 200
7676
request.return_value = resp
7777

78-
uri = "{}/Tasks".format(BASE_URI)
78+
uri = "{0}/Tasks".format(BASE_URI)
7979
list_resource = Tasks(BASE_URI, AUTH)
8080
list_resource.list()
8181
request.assert_called_with("GET", uri, params={}, auth=AUTH,
@@ -87,7 +87,7 @@ def test_update_instance(self, request):
8787
resp.status_code = 201
8888
request.return_value = resp
8989

90-
uri = "{}/Tasks/{}".format(BASE_URI, TASK_SID)
90+
uri = "{0}/Tasks/{1}".format(BASE_URI, TASK_SID)
9191
list_resource = Tasks(BASE_URI, AUTH)
9292
workflow = Task(list_resource, TASK_SID)
9393
workflow.update(attributes='attributes', workflow_sid='WFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
@@ -105,7 +105,7 @@ def test_update_list(self, request):
105105
resp.status_code = 201
106106
request.return_value = resp
107107

108-
uri = "{}/Tasks/{}".format(BASE_URI, TASK_SID)
108+
uri = "{0}/Tasks/{1}".format(BASE_URI, TASK_SID)
109109
list_resource = Tasks(BASE_URI, AUTH)
110110
list_resource.update(TASK_SID, attributes='attributes', workflow_sid='WFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
111111
exp_params = {

0 commit comments

Comments
 (0)
0