8000 Update generation · rbachman/twilio-python@6df4955 · GitHub
[go: up one dir, main page]

Skip to content

Commit 6df4955

Browse files
author
Carlos Diaz-Padron
committed
Update generation
1 parent b1b20c2 commit 6df4955

File tree

24 files changed

+670
-34
lines changed

24 files changed

+670
-34
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ analysis:
1717
. venv/bin/activate; flake8 --ignore=E123,E126,E128,E501 tests
1818
. venv/bin/activate; flake8 --ignore=F401 twilio
1919

20-
test: analysis
20+
test:
2121
. venv/bin/activate; \
2222
find tests -type d | xargs nosetests
2323

tests/integration/api/v2010/account/available_phone_number/test_local.py

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ def test_read_full_response(self):
3737
"address_requirements": "none",
3838
"beta": false,
3939
"capabilities": {
40-
"MMS": true,
41-
"SMS": false,
40+
"mms": true,
41+
"sms": false,
4242
"voice": true
4343
},
4444
"friendly_name": "(808) 925-1571",
@@ -52,6 +52,16 @@ def test_read_full_response(self):
5252
"region": "HI"
5353
}
5454
],
55+
"end": 1,
56+
"first_page_uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/AvailablePhoneNumbers/US/Local.json?PageSize=50&Page=0",
57+
"last_page_uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/AvailablePhoneNumbers/US/Local.json?PageSize=50&Page=0",
58+
"next_page_uri": null,
59+
"num_pages": 1,
60+
"page": 0,
61+
"page_size": 50,
62+
"previous_page_uri": null,
63+
"start": 0,
64+
"total": 1,
5565
"uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/AvailablePhoneNumbers/US/Local.json?PageSize=1"
5666
}
5767
'''
@@ -69,6 +79,15 @@ def test_read_empty_response(self):
6979
'''
7080
{
7181
"available_phone_numbers": [],
82+
"first_page_uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/AvailablePhoneNumbers/US/Local.json?PageSize=50&Page=0",
83+
"last_page_uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/AvailablePhoneNumbers/US/Local.json?PageSize=50&Page=0",
84+
"next_page_uri": null,
85+
"num_pages": 1,
86+
"page": 0,
87+
"page_size": 50,
88+
"previous_page_uri": null,
89+
"start": 0,
90+
"total": 1,
7291
"uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/AvailablePhoneNumbers/US/Local.json?PageSize=1"
7392
}
7493
'''

tests/integration/api/v2010/account/available_phone_number/test_mobile.py

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ def test_read_full_response(self):
3737
"address_requirements": "none",
3838
"beta": false,
3939
"capabilities": {
40-
"MMS": false,
41-
"SMS": true,
40+
"mms": false,
41+
"sms": true,
4242
"voice": false
4343
},
4444
"friendly_name": "+4759440374",
@@ -52,6 +52,15 @@ def test_read_full_response(self):
5252
"region": null
5353
}
5454
],
55+
"first_page_uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/AvailablePhoneNumbers/US/Mobile.json?PageSize=50&Page=0",
56+
"last_page_uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/AvailablePhoneNumbers/US/Mobile.json?PageSize=50&Page=0",
57+
"next_page_uri": null,
58+
"num_pages": 1,
59+
"page": 0,
60+
"page_size": 50,
61+
"previous_page_uri": null,
62+
"start": 0,
63+
"total": 1,
5564
"uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/AvailablePhoneNumbers/US/Mobile.json?PageSize=1"
5665
}
5766
'''
@@ -69,6 +78,15 @@ def test_read_empty_response(self):
6978
'''
7079
{
7180
"available_phone_numbers": [],
81+
"first_page_uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/AvailablePhoneNumbers/US/Mobile.json?PageSize=50&Page=0",
82+
"last_page_uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/AvailablePhoneNumbers/US/Mobile.json?PageSize=50&Page=0",
83+
"next_page_uri": null,
84+
"num_pages": 1,
85+
"page": 0,
86+
"page_size": 50,
87+
"previous_page_uri": null,
88+
"start": 0,
89+
"total": 1,
7290
"uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/AvailablePhoneNumbers/US/Mobile.json?PageSize=1"
7391
}
7492
'''

tests/integration/api/v2010/account/available_phone_number/test_toll_free.py

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ def test_read_full_response(self):
3737
"address_requirements": "none",
3838
"beta": false,
3939
"capabilities": {
40-
"MMS": true,
41-
"SMS": true,
40+
"mms": true,
41+
"sms": true,
4242
"voice": true
4343
},
4444
"friendly_name": "(800) 100-0052",
@@ -52,6 +52,15 @@ def test_read_full_response(self):
5252
"region": null
5353
}
5454
],
55+
"first_page_uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/AvailablePhoneNumbers/US/TollFree.json?PageSize=50&Page=0",
56+
"last_page_uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/AvailablePhoneNumbers/US/TollFree.json?PageSize=50&Page=0",
57+
"next_page_uri": null,
58+
"num_pages": 1,
59+
"page": 0,
60+
"page_size": 50,
61+
"previous_page_uri": null,
62+
"start": 0,
63+
"total": 1,
5564
"uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/AvailablePhoneNumbers/US/TollFree.json?PageSize=1"
5665
}
5766
'''
@@ -69,6 +78,15 @@ def test_read_empty_response(self):
6978
'''
7079
{
7180
"available_phone_numbers": [],
81+
"first_page_uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/AvailablePhoneNumbers/US/TollFree.json?PageSize=50&Page=0",
82+
"last_page_uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/AvailablePhoneNumbers/US/TollFree.json?PageSize=50&Page=0",
83+
"next_page_uri": null,
84+
"num_pages": 1,
85+
"page": 0,
86+
"page_size": 50,
87+
"previous_page_uri": null,
88+
"start": 0,
89+
"total": 1,
7290
"uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/AvailablePhoneNumbers/US/TollFree.json?PageSize=1"
7391
}
7492
'''

tests/integration/api/v2010/account/call/test_feedback_summary.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def test_create_response(self):
4343
"account_sid": "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
4444
"call_count": 10200,
4545
"call_feedback_count": 729,
46-
"end_date": "2014-01-31",
46+
"end_date": "2011-01-01",
4747
"include_subaccounts": false,
4848
"issues": [
4949
{
@@ -56,7 +56,7 @@ def test_create_response(self):
5656
"quality_score_median": 4,
5757
"quality_score_standard_deviation": 1,
5858
"sid": "FSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
59-
"start_date": "2014-01-01",
59+
"start_date": "2011-01-01",
6060
"status": "completed",
6161
"date_created": "Tue, 31 Aug 2010 20:36:28 +0000",
6262
"date_updated": "Tue, 31 Aug 2010 20:36:44 +0000"
@@ -91,7 +91,7 @@ def test_fetch_response(self):
9191
"account_sid": "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
9292
"call_count": 10200,
9393
"call_feedback_count": 729,
94-
"end_date": "2014-01-31",
94+
"end_date": "2011-01-01",
9595
"include_subaccounts": false,
9696
"issues": [
9797
{
@@ -104,7 +104,7 @@ def test_fetch_response(self):
104104
"quality_score_median": 4,
105105
"quality_score_standard_deviation": 1,
106106
"sid": "FSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
107-
"start_date": "2014-01-01",
107+
"start_date": "2011-01-01",
108108
"status": "completed",
109109
"date_created": "Tue, 31 Aug 2010 20:36:28 +0000",
110110
"date_updated": "Tue, 31 Aug 2010 20:36:44 +0000"

tests/integration/api/v2010/account/test_available_phone_number.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ def test_read_full_response(self):
4343
}
4444
],
4545
"end": 1,
46-
"first_page_uri": null,
47-
"last_page_uri": null,
46+
"first_page_uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/AvailablePhoneNumbers/DK.json?PageSize=50&Page=0",
47+
"last_page_uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/AvailablePhoneNumbers/DK.json?PageSize=50&Page=0",
4848
"next_page_uri": null,
4949
"num_pages": 1,
5050
"page": 0,
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# coding=utf-8
2+
"""
3+
This code was generated by
4+
\ / _ _ _| _ _
5+
| (_)\/(_)(_|\/| |(/_ v1.0.0
6+
/ /
7+
"""
8+
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# coding=utf-8
2+
"""
3+
This code was generated by
4+
\ / _ _ _| _ _
5+
| (_)\/(_)(_|\/| |(/_ v1.0.0
6+
/ /
7+
"""
8+
9+
from tests.integration import IntegrationTestCase
10+
from tests.integration.holodeck import Request
11+
from twilio.exceptions import TwilioException
12+
from twilio.http.response import Response
13+
14+
15+
class CountryTestCase(IntegrationTestCase):
16+
17+
def test_list_request(self):
18+
self.holodeck.mock(Response(500, ''))
19+
20+
with self.assertRaises(TwilioException):
21+
self.client.pricing.v1.messaging \
22+
.countries.list()
23+
24+
self.holodeck.assert_has_request(Request(
25+
'get',
26+
'https://pricing.twilio.com/v1/Messaging/Countries',
27+
))
28+
29+
def test_fetch_request(self):
30+
self.holodeck.mock(Response(500, ''))
31+
32+
with self.assertRaises(TwilioException):
33+
self.client.pricing.v1.messaging \
34+
.countries(iso_country="US").fetch()
35+
36+
self.holodeck.assert_has_request(Request(
37+
'get',
38+
'https://pricing.twilio.com/v1/Messaging/Countries/US',
39+
))
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# coding=utf-8
2+
"""
3+
This code was generated by
4+
\ / _ _ _| _ _
5+
| (_)\/(_)(_|\/| |(/_ v1.0.0
6+
/ /
7+
"""
8+
9+
from tests.integration import IntegrationTestCase
10+
from tests.integration.holodeck import Request
11+
from twilio.exceptions import TwilioException
12+
from twilio.http.response import Response
13+
14+
15+
class MessagingTestCase(IntegrationTestCase):
16+
pass

tests/unit/test_request_validator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from nose.tools import assert_equal, assert_true
55
from six import b, u
66

7-
from twilio.request_validator import RequestValidator
7+
from twilio.security import RequestValidator
88

99

1010
class ValidationTest(unittest.TestCase):

twilio/rest/api/v2010/account/call/feedback_summary.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,14 +236,14 @@ def __init__(self, version, payload, account_sid, sid=None):
236236
'call_feedback_count': deserialize.integer(payload['call_feedback_count']),
237237
'date_created': deserialize.rfc2822_datetime(payload['date_created']),
238238
'date_updated': deserialize.rfc2822_datetime(payload['date_updated']),
239-
'end_date': deserialize.rfc2822_datetime(payload['end_date']),
239+
'end_date': deserialize.iso8601_datetime(payload['end_date']),
240240
'include_subaccounts': payload['include_subaccounts'],
241241
'issues': payload['issues'],
242242
'quality_score_average': deserialize.decimal(payload['quality_score_average']),
243243
'quality_score_median': deserialize.decimal(payload['quality_score_median']),
244244
'quality_score_standard_deviation': deserialize.decimal(payload['quality_score_standard_deviation']),
245245
'sid': payload['sid'],
246-
'start_date': deserialize.rfc2822_datetime(payload['start_date']),
246+
'start_date': deserialize.iso8601_datetime(payload['start_date']),
247247
'status': payload['status'],
248248
}
249249

twilio/rest/api/v2010/account/usage/record/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,10 +374,10 @@ def __init__(self, version, payload, account_sid):
374374
'count': payload['count'],
375375
'count_unit': payload['count_unit'],
376376
'description': payload['description'],
377-
'end_date': deserialize.rfc2822_datetime(payload['end_date']),
377+
'end_date': deserialize.iso8601_datetime(payload['end_date']),
378378
'price': deserialize.decimal(payload['price']),
379379
'price_unit': payload['price_unit'],
380-
'start_date': deserialize.rfc2822_datetime(payload['start_date']),
380+
'start_date': deserialize.iso8601_datetime(payload['start_date']),
381381
'subresource_uris': payload['subresource_uris'],
382382
'uri': payload['uri'],
383383
'usage': payload['usage'],

twilio/rest/api/v2010/account/usage/record/all_time.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,10 @@ def __init__(self, version, payload, account_sid):
184184
'count': payload['count'],
185185
'count_unit': payload['count_unit'],
186186
'description': payload['description'],
187-
'end_date': deserialize.rfc2822_datetime(payload['end_date']),
187+
'end_date': deserialize.iso8601_datetime(payload['end_date']),
188188
'price': deserialize.decimal(payload['price']),
189189
'price_unit': payload['price_unit'],
190-
'start_date': deserialize.rfc2822_datetime(payload['start_date']),
190+
'start_date': deserialize.iso8601_datetime(payload['start_date']),
191191
'subresource_uris': payload['subresource_uris'],
192192
'uri': payload['uri'],
193193
'usage': payload['usage'],

twilio/rest/api/v2010/account/usage/record/daily.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,10 @@ def __init__(self, version, payload, account_sid):
184184
'count': payload['count'],
185185
'count_unit': payload['count_unit'],
186186
'description': payload['description'],
187-
'end_date': deserialize.rfc2822_datetime(payload['end_date']),
187+
'end_date': deserialize.iso8601_datetime(payload['end_date']),
188188
'price': deserialize.decimal(payload['price']),
189189
'price_unit': payload['price_unit'],
190-
'start_date': deserialize.rfc2822_datetime(payload['start_date']),
190+
'start_date': deserialize.iso8601_datetime(payload['start_date']),
191191
'subresource_uris': payload['subresource_uris'],
192192
'uri': payload['uri'],
193193
'usage': payload['usage'],

twilio/rest/api/v2010/account/usage/record/last_month.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,10 @@ def __init__(self, version, payload, account_sid):
184184
'count': payload['count'],
185185
'count_unit': payload['count_unit'],
186186
'description': payload['description'],
187-
'end_date': deserialize.rfc2822_datetime(payload['end_date']),
187+
'end_date': deserialize.iso8601_datetime(payload['end_date']),
188188
'price': deserialize.decimal(payload['price']),
189189
'price_unit': payload['price_unit'],
190-
'start_date': deserialize.rfc2822_datetime(payload['start_date']),
190+
'start_date': deserialize.iso8601_datetime(payload['start_date']),
191191
'subresource_uris': payload['subresource_uris'],
192192
'uri': payload['uri'],
193193
'usage': payload['usage'],

twilio/rest/api/v2010/account/usage/record/monthly.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,10 @@ def __init__(self, version, payload, account_sid):
184184
'count': payload['count'],
185185
'count_unit': payload['count_unit'],
186186
'description': payload['description'],
187-
'end_date': deserialize.rfc2822_datetime(payload['end_date']),
187+
'end_date': deserialize.iso8601_datetime(payload['end_date']),
188188
'price': deserialize.decimal(payload['price']),
189189
'price_unit': payload['price_unit'],
190-
'start_date': deserialize.rfc2822_datetime(payload['start_date']),
190+
'start_date': deserialize.iso8601_datetime(payload['start_date']),
191191
'subresource_uris': payload['subresource_uris'],
192192
'uri': payload['uri'],
193193
'usage': payload['usage'],

twilio/rest/api/v2010/account/usage/record/this_month.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,10 @@ def __init__(self, version, payload, account_sid):
184184
'count': payload['count'],
185185
'count_unit': payload['count_unit'],
186186
'description': payload['description'],
187-
'end_date': deserialize.rfc2822_datetime(payload['end_date']),
187+
'end_date': deserialize.iso8601_datetime(payload['end_date']),
188188
'price': deserialize.decimal(payload['price']),
189189
'price_unit': payload['price_unit'],
190-
'start_date': deserialize.rfc2822_datetime(payload['start_date']),
190+
'start_date': deserialize.iso8601_datetime(payload['start_date']),
191191
'subresource_uris': payload['subresource_uris'],
192192
'uri': payload['uri'],
193193
'usage': payload['usage'],

twilio/rest/api/v2010/account/usage/record/today.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,10 @@ def __init__(self, version, payload, account_sid):
184184
'count': payload['count'],
185185
'count_unit': payload['count_unit'],
186186
'description': payload['description'],
187-
'end_date': deserialize.rfc2822_datetime(payload['end_date']),
187+
'end_date': deserialize.iso8601_datetime(payload['end_date']),
188188
'price': deserialize.decimal(payload['price']),
189189
'price_unit': payload['price_unit'],
190-
'start_date': deserialize.rfc2822_datetime(payload['start_date']),
190+
'start_date': deserialize.iso8601_datetime(payload['start_date']),
191191
'subresource_uris': payload['subresource_uris'],
192192
'uri': payload['uri'],
193193
'usage': payload['usage'],

twilio/rest/api/v2010/account/usage/record/yearly.py

Lines changed: 2 additions & 2 deletion F166 s
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,10 @@ def __init__(self, version, payload, account_sid):
184184
'count': payload['count'],
185185
'count_unit': payload['count_unit'],
186186
'description': payload['description'],
187-
'end_date': deserialize.rfc2822_datetime(payload['end_date']),
187+
'end_date': deserialize.iso8601_datetime(payload['end_date']),
188188
'price': deserialize.decimal(payload['price']),
189189
'price_unit': payload['price_unit'],
190-
'start_date': deserialize.rfc2822_datetime(payload['start_date']),
190+
'start_date': deserialize.iso8601_datetime(payload['start_date']),
191191
'subresource_uris': payload['subresource_uris'],
192192
'uri': payload['uri'],
193193
'usage': payload['usage'],

twilio/rest/api/v2010/account/usage/record/yesterday.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,10 @@ def __init__(self, version, payload, account_sid):
184184
'count': payload['count'],
185185
'count_unit': payload['count_unit'],
186186
'description': payload['description'],
187-
'end_date': deserialize.rfc2822_datetime(payload['end_date']),
187+
'end_date': deserialize.iso8601_datetime(payload['end_date']),
188188
'price': deserialize.decimal(payload['price']),
189189
'price_unit': payload['price_unit'],
190-
'start_date': deserialize.rfc2822_datetime(payload['start_date']),
190+
'start_date': deserialize.iso8601_datetime(payload['start_date']),
191191
'subresource_uris': payload['subresource_uris'],
192192
'uri': payload['uri'],
193193
'usage': payload['usage'],

0 commit comments

Comments
 (0)
0