Skip to content

Commit 6524124

Browse files
author
Tom Connors
committed
[Librarian] Regenerated @ 67f0061dba0c2c6cfbc5b7453ecbac54443bacbf
1 parent 6a30f2c commit 6524124

File tree

23 files changed

+241
-28
lines changed

23 files changed

+241
-28
lines changed

‎CHANGES.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,27 @@ twilio-python Changelog
33

44
Here you can see the full list of changes between each twilio-python release.
55

6+
[2017-07-12] Version 6.4.3
7+
---------------------------
8+
**Api**
9+
- Update `AnnounceMethod` parameter naming for consistency
10+
11+
**Notify**
12+
- Add `ToBinding` optional parameter on Notifications resource creation. Accepted values are json strings.
13+
14+
**Preview**
15+
- Add `verification_attempts` to HostedNumberOrders.
16+
- Add `status_callback_url` and `status_callback_method` to HostedNumberOrders.
17+
18+
**Video**
19+
- Filter recordings by date using the parameters `DateCreatedAfter` and `DateCreatedBefore`.
20+
- Override the default time-to-live of a recording's media URL through the `Ttl` parameter (in seconds, default value is 3600).
21+
- Add query parameters `SourceSid`, `Status`, `DateCreatedAfter` and `DateCreatedBefore` to the convenience method for retrieving Room recordings.
22+
23+
**Wireless**
24+
- Added national and international data limits to the RatePlans resource.
25+
26+
627
[2017-06-27] Version 6.4.2
728
--------------------------
829

‎tests/integration/api/v2010/account/call/test_recording.py

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,13 @@ def test_fetch_response(self):
4040
"duration": "6",
4141
"price": null,
4242
"sid": "REaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
43-
"uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Recordings/REaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.json"
43+
"uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Recordings/REaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.json",
44+
"encryption_type": "public-key",
45+
"encryption_details": {
46+
"encryption_public_key_sid": "CRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
47+
"encryption_cek": "OV4h6zrsxMIW7h0Zfqwfn6TI2GCNl54KALlg8wn8YB8KYZhXt6HlgvBWAmQTlfYVeLWydMiCewY0YkDDT1xmNe5huEo9vjuKBS5OmYK4CZkSx1NVv3XOGrZHpd2Pl/5WJHVhUK//AUO87uh5qnUP2E0KoLh1nyCLeGcEkXU0RfpPn/6nxjof/n6m6OzZOyeIRK4Oed5+rEtjqFDfqT0EVKjs6JAxv+f0DCc1xYRHl2yV8bahUPVKs+bHYdy4PVszFKa76M/Uae4jFA9Lv233JqWcxj+K2UoghuGhAFbV/JQIIswY2CBYI8JlVSifSqNEl9vvsTJ8bkVMm3MKbG2P7Q==",
48+
"encryption_iv": "8I2hhNIYNTrwxfHk"
49+
}
4450
}
4551
'''
4652
))
@@ -112,7 +118,13 @@ def test_read_full_response(self):
112118
"duration": "6",
113119
"price": null,
114120
"sid": "REaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
115-
"uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Recordings/REaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.json"
121+
"uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Recordings/REaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.json",
122+
"encryption_type": "public-key",
123+
"encryption_details": {
124+
"encryption_public_key_sid": "CRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
125+
"encryption_cek": "OV4h6zrsxMIW7h0Zfqwfn6TI2GCNl54KALlg8wn8YB8KYZhXt6HlgvBWAmQTlfYVeLWydMiCewY0YkDDT1xmNe5huEo9vjuKBS5OmYK4CZkSx1NVv3XOGrZHpd2Pl/5WJHVhUK//AUO87uh5qnUP2E0KoLh1nyCLeGcEkXU0RfpPn/6nxjof/n6m6OzZOyeIRK4Oed5+rEtjqFDfqT0EVKjs6JAxv+f0DCc1xYRHl2yV8bahUPVKs+bHYdy4PVszFKa76M/Uae4jFA9Lv233JqWcxj+K2UoghuGhAFbV/JQIIswY2CBYI8JlVSifSqNEl9vvsTJ8bkVMm3MKbG2P7Q==",
126+
"encryption_iv": "8I2hhNIYNTrwxfHk"
127+
}
116128
}
117129
],
118130
"start": 0,

‎tests/integration/api/v2010/account/test_key.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ def test_read_full_response(self):
123123
}
124124
],
125125
"first_page_uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Keys.json?PageSize=50&Page=0",
126-
"end": 3,
126+
"end": 0,
127127
"previous_page_uri": null,
128128
"uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Keys.json?PageSize=50&Page=0",
129129
"page_size": 50,
@@ -146,7 +146,7 @@ def test_read_empty_response(self):
146146
{
147147
"keys": [],
148148
"first_page_uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Keys.json?PageSize=50&Page=0",
149-
"end": 3,
149+
"end": 0,
150150
"previous_page_uri": null,
151151
"uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Keys.json?PageSize=50&Page=0",
152152
"page_size": 50,

‎tests/integration/api/v2010/account/test_recording.py

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,13 @@ def test_fetch_response(self):
4343
"status": "completed",
4444
"channels": 1,
4545
"source": "Trunking",
46-
"uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Recordings/REaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.json"
46+
"uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Recordings/REaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.json",
47+
"encryption_type": "public-key",
48+
"encryption_details": {
49+
"encryption_public_key_sid": "CRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
50+
"encryption_cek": "OV4h6zrsxMIW7h0Zfqwfn6TI2GCNl54KALlg8wn8YB8KYZhXt6HlgvBWAmQTlfYVeLWydMiCewY0YkDDT1xmNe5huEo9vjuKBS5OmYK4CZkSx1NVv3XOGrZHpd2Pl/5WJHVhUK//AUO87uh5qnUP2E0KoLh1nyCLeGcEkXU0RfpPn/6nxjof/n6m6OzZOyeIRK4Oed5+rEtjqFDfqT0EVKjs6JAxv+f0DCc1xYRHl2yV8bahUPVKs+bHYdy4PVszFKa76M/Uae4jFA9Lv233JqWcxj+K2UoghuGhAFbV/JQIIswY2CBYI8JlVSifSqNEl9vvsTJ8bkVMm3MKbG2P7Q==",
51+
"encryption_iv": "8I2hhNIYNTrwxfHk"
52+
}
4753
}
4854
'''
4955
))
@@ -115,7 +121,13 @@ def test_read_full_response(self):
115121
"status": "completed",
116122
"channels": 1,
117123
"source": "Trunking",
118-
"uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Recordings/REaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.json"
124+
"uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Recordings/REaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.json",
125+
"encryption_type": "public-key",
126+
"encryption_details": {
127+
"encryption_public_key_sid": "CRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
128+
"encryption_cek": "OV4h6zrsxMIW7h0Zfqwfn6TI2GCNl54KALlg8wn8YB8KYZhXt6HlgvBWAmQTlfYVeLWydMiCewY0YkDDT1xmNe5huEo9vjuKBS5OmYK4CZkSx1NVv3XOGrZHpd2Pl/5WJHVhUK//AUO87uh5qnUP2E0KoLh1nyCLeGcEkXU0RfpPn/6nxjof/n6m6OzZOyeIRK4Oed5+rEtjqFDfqT0EVKjs6JAxv+f0DCc1xYRHl2yV8bahUPVKs+bHYdy4PVszFKa76M/Uae4jFA9Lv233JqWcxj+K2UoghuGhAFbV/JQIIswY2CBYI8JlVSifSqNEl9vvsTJ8bkVMm3MKbG2P7Q==",
129+
"encryption_iv": "8I2hhNIYNTrwxfHk"
130+
}
119131
}
120132
],
121133
"start": 0,

‎tests/integration/api/v2010/account/test_signing_key.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,10 @@ def test_read_full_response(self):
122122
"date_updated": "Mon, 13 Jun 2016 22:50:08 +0000"
123123
}
124124
],
125-
"first_page_uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Keys.json?PageSize=50&Page=0",
126-
"end": 3,
125+
"first_page_uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/SigningKeys.json?PageSize=50&Page=0",
126+
"end": 0,
127127
"previous_page_uri": null,
128-
"uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Keys.json?PageSize=50&Page=0",
128+
"uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/SigningKeys.json?PageSize=50&Page=0",
129129
"page_size": 50,
130130
"start": 0,
131131
"next_page_uri": null,
@@ -145,10 +145,10 @@ def test_read_empty_response(self):
145145
'''
146146
{
147147
"signing_keys": [],
148-
"first_page_uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Keys.json?PageSize=50&Page=0",
149-
"end": 3,
148+
"first_page_uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/SigningKeys.json?PageSize=50&Page=0",
149+
"end": 0,
150150
"previous_page_uri": null,
151-
"uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Keys.json?PageSize=50&Page=0",
151+
"uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/SigningKeys.json?PageSize=50&Page=0",
152152
"page_size": 50,
153153
"start": 0,
154154
"next_page_uri": null,

‎tests/integration/video/v1/room/test_recording.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,14 @@ def test_read_results_response(self):
106106
"date_created": "2015-07-30T20:00:00Z",
107107
"sid": "RTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
108108
"source_sid": "MTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
109-
"size": 0,
109+
"size": 23,
110110
"type": "audio",
111-
"duration": 0,
111+
"duration": 10,
112112
"container_format": "mka",
113113
"codec": "OPUS",
114114
"grouping_sids": {
115-
"room_sid": "RMaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
115+
"room_sid": "RMaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
116+
"participant_sid": "PAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
116117
},
117118
"room_sid": "RMaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
118119
"url": "https://video.twilio.com/v1/Rooms/RMaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Recordings/RTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",

‎tests/integration/video/v1/test_recording.py

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,50 @@ def test_read_empty_response(self):
8989

9090
self.assertIsNotNone(actual)
9191

92+
def test_read_results_response(self):
93+
self.holodeck.mock(Response(
94+
200,
95+
'''
96+
{
97+
"recordings": [
98+
{
99+
"account_sid": "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
100+
"status": "completed",
101+
"date_created": "2015-07-30T20:00:00Z",
102+
"sid": "RTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
103+
"source_sid": "MTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
104+
"size": 23,
105+
"type": "audio",
106+
"duration": 10,
107+
"container_format": "mka",
108+
"codec": "OPUS",
109+
"grouping_sids": {
110+
"room_sid": "RMaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
111+
"participant_sid": "PAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
112+
},
113+
"url": "https://video.twilio.com/v1/Recordings/RTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
114+
"links": {
115+
"media": "https://video.twilio.com/v1/Recordings/RTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Media"
116+
}
117+
}
118+
],
119+
"meta": {
120+
"page": 0,
121+
"page_size": 50,
122+
"first_page_url": "https://video.twilio.com/v1/Recordings?PageSize=50&Page=0",
123+
"previous_page_url": null,
124+
"url": "https://video.twilio.com/v1/Recordings?PageSize=50&Page=0",
125+
"next_page_url": null,
126+
"key": "recordings"
127+
}
128+
}
129+
'''
130+
))
131+
132+
actual = self.client.video.v1.recordings.list()
133+
134+
self.assertIsNotNone(actual)
135+
92136
def test_delete_request(self):
93137
self.holodeck.mock(Response(500, ''))
94138

‎twilio/rest/api/v2010/account/call/recording.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,8 @@ def __init__(self, version, payload, account_sid, call_sid, sid=None):
324324
'sid': payload['sid'],
325325
'price': deserialize.decimal(payload['price']),
326326
'uri': payload['uri'],
327+
'encryption_type': payload['encryption_type'],
328+
'encryption_details': payload['encryption_details'],
327329
}
328330

329331
# Context
@@ -424,6 +426,22 @@ def uri(self):
424426
"""
425427
return self._properties['uri']
426428

429+
@property
430+
def encryption_type(self):
431+
"""
432+
:returns: The encryption_type
433+
:rtype: unicode
434+
"""
435+
return self._properties['encryption_type']
436+
437+
@property
438+
def encryption_details(self):
439+
"""
440+
:returns: The encryption_details
441+
:rtype: dict
442+
"""
443+
return self._properties['encryption_details']
444+
427445
def fetch(self):
428446
"""
429447
Fetch a RecordingInstance

‎twilio/rest/api/v2010/account/conference/participant.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ def fetch(self):
374374

375375
def update(self, muted=values.unset, hold=values.unset, hold_url=values.unset,
376376
hold_method=values.unset, announce_url=values.unset,
377-
announce_url_method=values.unset):
377+
announce_method=values.unset):
378378
"""
379379
Update the ParticipantInstance
380380
@@ -383,7 +383,7 @@ def update(self, muted=values.unset, hold=values.unset, hold_url=values.unset,
383383
:param unicode hold_url: The hold_url
384384
:param unicode hold_method: The hold_method
385385
:param unicode announce_url: The announce_url
386-
:param unicode announce_url_method: The announce_url_method
386+
:param unicode announce_method: The announce_method
387387
388388
:returns: Updated ParticipantInstance
389389
:rtype: twilio.rest.api.v2010.account.conference.participant.ParticipantInstance
@@ -394,7 +394,7 @@ def update(self, muted=values.unset, hold=values.unset, hold_url=values.unset,
394394
'HoldUrl': hold_url,
395395
'HoldMethod': hold_method,
396396
'AnnounceUrl': announce_url,
397-
'AnnounceUrlMethod': announce_url_method,
397+
'AnnounceMethod': announce_method,
398398
})
399399

400400
payload = self._version.update(
@@ -591,7 +591,7 @@ def fetch(self):
591591

592592
def update(self, muted=values.unset, hold=values.unset, hold_url=values.unset,
593593
hold_method=values.unset, announce_url=values.unset,
594-
announce_url_method=values.unset):
594+
announce_method=values.unset):
595595
"""
596596
Update the ParticipantInstance
597597
@@ -600,7 +600,7 @@ def update(self, muted=values.unset, hold=values.unset, hold_url=values.unset,
600600
:param unicode hold_url: The hold_url
601601
:param unicode hold_method: The hold_method
602602
:param unicode announce_url: The announce_url
603-
:param unicode announce_url_method: The announce_url_method
603+
:param unicode announce_method: The announce_method
604604
605605
:returns: Updated ParticipantInstance
606606
:rtype: twilio.rest.api.v2010.account.conference.participant.ParticipantInstance
@@ -611,7 +611,7 @@ def update(self, muted=values.unset, hold=values.unset, hold_url=values.unset,
611611
hold_url=hold_url,
612612
hold_method=hold_method,
613613
announce_url=announce_url,
614-
announce_url_method=announce_url_method,
614+
announce_method=announce_method,
615615
)
616616

617617
def delete(self):

‎twilio/rest/api/v2010/account/message/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ def status(self):
633633
@property
634634
def subresource_uris(self):
635635
"""
636-
:returns: The subresource_uris
636+
:returns: The URI for any subresources
637637
:rtype: unicode
638638
"""
639639
return self._properties['subresource_uris']

0 commit comments

Comments
 (0)