8000 Merge branch 'wds' · yikaraman/twilio-python@9179dce · GitHub
[go: up one dir, main page]
Skip to content

Commit 9179dce

Browse files
skimbrelskimbrel
committed
Merge branch 'wds'
2 parents 7a9aaac + 11a9551 commit 9179dce

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+2906
-131
lines changed

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#
1414
# You need to have the setuptools module installed. Try reading the setuptools
1515
# documentation: http://pypi.python.org/pypi/setuptools
16-
REQUIRES = ["httplib2 >= 0.7", "six"]
16+
REQUIRES = ["httplib2 >= 0.7", "six", "pytz"]
1717

1818
if sys.version_info < (2, 6):
1919
REQUIRES.append('simplejson')

‎tests/__init__.py

Whitespace-only changes.

‎tests/resources/task_router/activities_instance.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"sid": "WAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
3+
"account_sid": "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
4+
"workspace_sid": "WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
5+
"friendly_name": "New Activity",
6+
"available": true,
7+
"date_created": "2014-05-14T10:50:02Z",
8+
"date_updated": "2014-05-14T23:26:06Z",
9+
"url": "https://taskrouter.twilio.com/v1/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Activities/WAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
10+
}

‎tests/resources/task_router/activities_list.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"activities": [
3+
{
4+
"sid": "WAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
5+
"account_sid": "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
6+
"workspace_sid": "WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
7+
"friendly_name": "New Activity",
8+
"available": true,
9+
"date_created": "2014-05-14T10:50:02Z",
10+
"date_updated": "2014-05-14T23:26:06Z",
11+
"url&q 10000 uot;: "https://taskrouter.twilio.comhttps://taskrouter.twilio.com/v1/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Activities/WAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
12+
}
13+
],
14+
"meta": {
15+
"key": "activities",
16+
"first_page_url": "https://taskrouter.twilio.comhttps://taskrouter.twilio.com/v1/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Activities?PageSize=50&Page=0",
17+
"last_page_url": "https://taskrouter.twilio.comhttps://taskrouter.twilio.com/v1/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Activities?PageSize=50&Page=0",
18+
"next_page_url": null,
19+
"page": 0,
20+
"page_size": 50,
21+
"previous_page_url": null,
22+
"url": "https://taskrouter.twilio.comhttps://taskrouter.twilio.com/v1/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Activities?PageSize=50&Page=0"
23+
}
24+
}

‎tests/resources/task_router/events_instance.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"sid": "EVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
3+
"description": "Worker JustinWorker updated to Idle Activity",
4+
"account_sid": "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
5+
"event_type": "worker.activity",
6+
"resource_type": "worker",
7+
"resource_sid": "WKaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
8+
"resource_url": "https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workers/WKaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
9+
"event_date": "2015-02-07T00:32:41Z",
10+
"source": "twilio",
11+
"source_ip_address": "1.2.3.4",
12+
"actor_type": "workspace",
13+
"actor_sid": "WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
14+
"actor_url": "https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
15+
"url": "https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Events/EVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
16+
"event_data": {
17+
"workspace_sid": "WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
18+
"workspace_name": "WorkspaceName",
19+
"worker_sid": "WKaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
20+
"worker_name": "JustinWorker",
21+
"worker_attributes": "{}",
22+
"worker_activity_sid": "WAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
23+
"worker_activity_name": "Offline",
24+
"worker_time_in_previous_activity": "26"
25+
}
26+
}

‎tests/resources/task_router/events_list.json

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"meta": {
3+
"key": "events",
4+
"page": 0,
5+
"page_size": 50,
6+
"first_page_url": "https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Events?PageSize=50&Page=0",
7+
"previous_page_url": null,
8+
"url": "https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Events?PageSize=50&Page=0",
9+
"next_page_url": "https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Events?PageSize=50&Page=1&PageToken=ENeyJTaWQiOiAiRVZhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYSIsICJUaW1lc3RhbXAiOiAiMTQyMzI2OTE2MSIsICJXb3Jrc3BhY2VTaWQiOiAiV0FhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYSJ9"
10+
},
11+
"events": [
12+
{
13+
"sid": "EVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
14+
"description": "Worker JustinWorker updated to Idle Activity",
15+
"account_sid": "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
16+
"event_type": "worker.activity",
17+
"resource_type": "worker",
18+
"resource_sid": "WKaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
19+
"resource_url": "https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workers/WKaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
20+
"event_date": "2015-02-07T00:32:41Z",
21+
"source": "twilio",
22+
"source_ip_address": "1.2.3.4",
23+
"actor_type": "workspace",
24+
"actor_sid": "WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
25+
"actor_url": "https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
26+
"url": "https://taskrouter.twilio.com/v1/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Events/EVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
27+
"event_data": {
28+
"workspace_sid": "WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
29+
"workspace_name": "WorkspaceName",
30+
"worker_sid": "WKaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
31+
"worker_name": "JustinWorker",
32+
"worker_attributes": "{}",
33+
"worker_activity_sid": "WAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
34+
"worker_activity_name": "Offline",
35+
"worker_time_in_previous_activity": "26"
36+
}
37+
}
38+
]
39+
}

‎tests/resources/task_router/reservations_instance.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"account_sid": "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
3+
"sid": "WRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
4+
"reservation_status": "reserved",
5+
"task_sid": "WTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
6+
"worker_sid": "WKaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
7+
"worker_name": "Doug",
8+
"worker_activity_sid": "WAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
9+
"workspace_sid": "WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
10+
"date_created": "2014-05-14T10:50:02Z",
11+
"date_updated": "2014-05-14T23:26:06Z",
12+
"url": "https://taskrouter.twilio.com/v1/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Tasks/WTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Reservations/WRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
13+
}

‎tests/resources/task_router/reservations_list.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"reservations": [
3+
{
4+
"account_sid": "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
5+
"sid": "WRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
6+
"reservation_status": "reserved",
7+
"task_sid": "WTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
8+
"worker_name": "Doug",
9+
"worker_sid": "WKaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
10+
"worker_activity_sid": "WAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
11+
"workspace_sid": "WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
12+
"date_created": "Wed, 14 May 2014 10:50:02 +0000",
13+
"date_updated": "Thu, 15 May 2014 16:03:42 +0000",
14+
"url": "https://taskrouter.twilio.comhttps://taskrouter.twilio.com/v1/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Tasks/WTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Reservations/WRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
15+
}
16+
],
17+
"meta": {
18+
"key": "reservations",
19+
"first_page_url": "https://taskrouter.twilio.comhttps://taskrouter.twilio.com/v1/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Tasks/WTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Reservations?PageSize=50&Page=0",
20+
"last_page_url": "https://taskrouter.twilio.comhttps://taskrouter.twilio.com/v1/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Tasks/WTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Reservations?PageSize=50&Page=0",
21+
"next_page_url": null,
22+
"page": 0,
23+
"page_size": 50,
24+
"previous_page_url": null,
25+
"url": "https://taskrouter.twilio.comhttps://taskrouter.twilio.com/v1/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Tasks/WTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Reservations?PageSize=50&Page=0"
26+
}
27+
}

‎tests/resources/task_router/task_queues_instance.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"account_sid": "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
3+
"workspace_sid": "WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
4+
"sid": "WQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
5+
"friendly_name": "Test TaskQueue",
6+
"target_workers": "['worker.support > 5', 'worker.language == spanish']",
7+
"reservation_activity_sid": "WRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
8+
"reservation_activity_name": "Reserved",
9+
"assignment_activity_sid": "WAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
10+
"date_created": "2014-05-14T10:50:02Z",
11+
"date_updated": "2014-05-14T23:26:06Z",
12+
"assignment_activity_name": "Working on Task",
13+
"url": "https://taskrouter.twilio.com/v1/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/TaskQueues/WQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
14+
}

‎tests/resources/task_router/task_queues_list.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"task_queues": [
3+
{
4+
"account_sid": "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
5+
"workspace_sid": "WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
6+
"sid": "WQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
7+
"friendly_name": "Test TaskQueue",
8+
"target_workers": "['worker.support > 5', 'worker.language == spanish']",
9+
"reservation_activity_sid": "WRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
10+
"reservation_activity_name": "Reserved",
11+
"assignment_activity_sid": "WAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
12+
"assignment_activity_name": "Working on Task",
13+
"date_created": "Wed, 14 May 2014 10:50:02 +0000",
14+
"date_updated": "Thu, 15 May 2014 16:47:51 +0000",
15+
"url": "https://taskrouter.twilio.comhttps://taskrouter.twilio.com/v1/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/TaskQueues/WQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
16+
}
17+
],
18+
"meta": {
19+
"key": "task_queues",
20+
"first_page_url": "https://taskrouter.twilio.comhttps://taskrouter.twilio.com/v1/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/TaskQueues?PageSize=50&Page=0",
21+
"last_page_url": "https://taskrouter.twilio.comhttps://taskrouter.twilio.com/v1/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/TaskQueues?PageSize=50&Page=0",
22+
"next_page_url": null,
23+
"page": 0,
24+
"page_size": 50,
25+
"previous_page_url": null,
26+
"url": "https://taskrouter.twilio.com/v1/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Workspaces/WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/TaskQueues?PageSize=50&Page=0"
27+
}
28+
}

0 commit comments

Comments
 (0)
0