8000 [Librarian] Regenerated @ 465fc6e02813df5a05716e0b2f634a38db8c1038 · DataXujing/twilio-python@043d02d · GitHub
[go: up one dir, main page]
Skip to content

Commit 043d02d

Browse files
twilio-citwilio-ci
committed
[Librarian] Regenerated @ 465fc6e02813df5a05716e0b2f634a38db8c1038
1 parent 6f7e2af commit 043d02d

File tree

15 files changed

+55
-32
lines changed

15 files changed

+55
-32
lines changed

‎CHANGES.md

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

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

6+
[2018-06-21] Version 6.14.6
7+
----------------------------
8+
**Library**
9+
- PR #429: Do not use ElementTree.__nonzero__; add test for mixed content. Thanks to @ekarson!
10+
11+
**Api**
12+
- Add Fraud Lookups category to usage records
13+
14+
**Video**
15+
- Allow user to set `ContentDisposition` when obtaining media URLs for Room Recordings and Compositions
16+
- Add Composition Settings resource
17+
18+
619
[2018-06-19] Version 6.14.5
720
----------------------------
821
**Library**

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,7 @@ class Category(object):
351351
CONVERSATIONS_PARTICIPANT_EVENTS = "conversations-participant-events"
352352
CONVERSATIONS_PARTICIPANTS = "conversations-participants"
353353
CPS = "cps"
354+
FRAUD_LOOKUPS = "fraud-lookups"
354355
GROUP_ROOMS = "group-rooms"
355356
GROUP_ROOMS_DATA_TRACK = "group-rooms-data-track"
356357
GROUP_ROOMS_ENCRYPTED_MEDIA_RECORDED = "group-rooms-encrypted-media-recorded"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ class Category(object):
237237
CONVERSATIONS_PARTICIPANT_EVENTS = "conversations-participant-events"
238238
CONVERSATIONS_PARTICIPANTS = "conversations-participants"
239239
CPS = "cps"
240+
FRAUD_LOOKUPS = "fraud-lookups"
240241
GROUP_ROOMS = "group-rooms"
241242
GROUP_ROOMS_DATA_TRACK = "group-rooms-data-track"
242243
GROUP_ROOMS_ENCRYPTED_MEDIA_RECORDED = "group-rooms-encrypted-media-recorded"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ class Category(object):
237237
CONVERSATIONS_PARTICIPANT_EVENTS = "conversations-participant-events"
238238
CONVERSATIONS_PARTICIPANTS = "conversations-participants"
239239
CPS = "cps"
240+
FRAUD_LOOKUPS = "fraud-lookups"
240241
GROUP_ROOMS = "group-rooms"
241242
GROUP_ROOMS_DATA_TRACK = "group-rooms-data-track"
242243
GROUP_ROOMS_ENCRYPTED_MEDIA_RECORDED = "group-rooms-encrypted-media-recorded"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ class Category(object):
237237
CONVERSATIONS_PARTICIPANT_EVENTS = "conversations-participant-events"
238238
CONVERSATIONS_PARTICIPANTS = "conversations-participants"
239239
CPS = "cps"
240+
FRAUD_LOOKUPS = "fraud-lookups"
240241
GROUP_ROOMS = "group-rooms"
241242
GROUP_ROOMS_DATA_TRACK = "group-rooms-data-track"
242243
GROUP_ROOMS_ENCRYPTED_MEDIA_RECORDED = "group-rooms-encrypted-media-recorded"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ class Category(object):
237237
CONVERSATIONS_PARTICIPANT_EVENTS = "conversations-participant-events"
238238
CONVERSATIONS_PARTICIPANTS = "conversations-participants"
239239
CPS = "cps"
240+
FRAUD_LOOKUPS = "fraud-lookups"
240241
GROUP_ROOMS = "group-rooms"
241242
GROUP_ROOMS_DATA_TRACK = "group-rooms-data-track"
242243
GROUP_ROOMS_ENCRYPTED_MEDIA_RECORDED = "group-rooms-encrypted-media-recorded"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ class Category(object):
237237
CONVERSATIONS_PARTICIPANT_EVENTS = "conversations-participant-events"
238238
CONVERSATIONS_PARTICIPANTS = "conversations-participants"
239239
CPS = "cps"
240+
FRAUD_LOOKUPS = "fraud-lookups"
240241
GROUP_ROOMS = "group-rooms"
241242
GROUP_ROOMS_DATA_TRACK = "group-rooms-data-track"
242243
GROUP_ROOMS_ENCRYPTED_MEDIA_RECORDED = "group-rooms-encrypted-media-recorded"

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

< F438 button class="Button Button--iconOnly Button--invisible flex-shrink-0 js-expand-all-difflines-button" aria-label="Expand all lines: twilio/rest/api/v2010/account/usage/record/today.py" data-file-path="twilio/rest/api/v2010/account/usage/record/today.py" aria-describedby=":R26sdlab:">
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ class Category(object):
237237
CONVERSATIONS_PARTICIPANT_EVENTS = "conversations-participant-events"
238238
CONVERSATIONS_PARTICIPANTS = "conversations-participants"
239239
CPS = "cps"
240+
FRAUD_LOOKUPS = "fraud-lookups"
240241
GROUP_ROOMS = "group-rooms"
241242
GROUP_ROOMS_DATA_TRACK = "group-rooms-data-track"
242243
GROUP_ROOMS_ENCRYPTED_MEDIA_RECORDED = "group-rooms-encrypted-media-recorded"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ class Category(object):
237237
CONVERSATIONS_PARTICIPANT_EVENTS = "conversations-participant-events"
238238
CONVERSATIONS_PARTICIPANTS = "conversations-participants"
239239
CPS = "cps"
240+
FRAUD_LOOKUPS = "fraud-lookups"
240241
GROUP_ROOMS = "group-rooms"
241242
GROUP_ROOMS_DATA_TRACK = "group-rooms-data-track"
242243
GROUP_ROOMS_ENCRYPTED_MEDIA_RECORDED = "group-rooms-encrypted-media-recorded"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ class Category(object):
237237
CONVERSATIONS_PARTICIPANT_EVENTS = "conversations-participant-events"
238238
CONVERSATIONS_PARTICIPANTS = "conversations-participants"
239239
CPS = "cps"
240+
FRAUD_LOOKUPS = "fraud-lookups"
240241
GROUP_ROOMS = "group-rooms"
241242
GROUP_ROOMS_DATA_TRACK = "group-rooms-data-track"
242243
GROUP_ROOMS_ENCRYPTED_MEDIA_RECORDED = "group-rooms-encrypted-media-recorded"

‎twilio/rest/api/v2010/account/usage/trigger.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,7 @@ class UsageCategory(object):
377377
CONVERSATIONS_EVENTS = "conversations-events"
378378
CONVERSATIONS_PARTICIPANT_EVENTS = "conversations-participant-events"
379379
CONVERSATIONS_PARTICIPANTS = "conversations-participants"
380+
FRAUD_LOOKUPS = "fraud-lookups"
380381
CPS = "cps"
381382
GROUP_ROOMS = "group-rooms"
382383
GROUP_ROOMS_DATA_TRACK = "group-rooms-data-track"

‎twilio/rest/preview/__init__.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -180,18 +180,18 @@ def hosted_number_orders(self):
180180
return self.hosted_numbers.hosted_number_orders
181181

182182
@property
183-
def installed_add_ons(self):
183+
def available_add_ons(self):
184184
"""
185-
:rtype: twilio.rest.preview.marketplace.installed_add_on.InstalledAddOnList
185+
:rtype: twilio.rest.preview.marketplace.available_add_on.AvailableAddOnList
186186
"""
187-
return self.marketplace.installed_add_ons
187+
return self.marketplace.available_add_ons
188188

189189
@property
190-
def available_add_ons(self):
190+
def installed_add_ons(self):
191191
"""
192-
:rtype: twilio.rest.preview.marketplace.available_add_on.AvailableAddOnList
192+
:rtype: twilio.rest.preview.marketplace.installed_add_on.InstalledAddOnList
193193
"""
194-
return self.marketplace.available_add_ons
194+
return self.marketplace.installed_add_ons
195195

196196
@property
197197
def services(self):

‎twilio/rest/preview/marketplace/__init__.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,8 @@ def __init__(self, domain):
2222
"""
2323
super(Marketplace, self).__init__(domain)
2424
self.version = 'marketplace'
25-
self._installed_add_ons = None
2625
self._available_add_ons = None
27-
28-
@property
29-
def installed_add_ons(self):
30-
"""
31-
:rtype: twilio.rest.preview.marketplace.installed_add_on.InstalledAddOnList
32-
"""
33-
if self._installed_add_ons is None:
34-
self._installed_add_ons = InstalledAddOnList(self)
35-
return self._installed_add_ons
26+
self._installed_add_ons = None
3627

3728
@property
3829
def available_add_ons(self):
@@ -43,6 +34,15 @@ def available_add_ons(self):
4334
self._available_add_ons = AvailableAddOnList(self)
4435
return self._available_add_ons
4536

37+
@property
38+
def installed_add_ons(self):
39+
"""
40+
:rtype: twilio.rest.preview.marketplace.installed_add_on.InstalledAddOnList
41+
"""
42+
if self._installed_add_ons is None:
43+
self._installed_add_ons = InstalledAddOnList(self)
44+
return self._installed_add_ons
45+
4646
def __repr__(self):
4747
"""
4848
Provide a friendly representation

‎twilio/rest/video/__init__.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,18 @@ def v1(self):
3737
return self._v1
3838

3939
@property
40-
def recordings(self):
40+
def compositions(self):
4141
"""
42-
:rtype: twilio.rest.video.v1.recording.RecordingList
42+
:rtype: twilio.rest.video.v1.composition.CompositionList
4343
"""
44-
return self.v1.recordings
44+
return self.v1.compositions
4 F438 545

4646
@property
47-
def compositions(self):
47+
def recordings(self):
4848
"""
49-
:rtype: twilio.rest.video.v1.composition.CompositionList
49+
:rtype: twilio.rest.video.v1.recording.RecordingList
5050
"""
51-
return self.v1.compositions
51+
return self.v1.recordings
5252

5353
@property
5454
def rooms(self):

‎twilio/rest/video/v1/__init__.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,10 @@ def __init__(self, domain):
2323
"""
2424
super(V1, self).__init__(domain)
2525
self.version = 'v1'
26-
self._recordings = None
2726
self._compositions = None
27+
self._recordings = None
2828
self._rooms = None
2929

30-
@property
31-
def recordings(self):
32-
"""
33-
:rtype: twilio.rest.video.v1.recording.RecordingList
34-
"""
35-
if self._recordings is None:
36-
self._recordings = RecordingList(self)
37-
return self._recordings
38-
3930
@property
4031
def compositions(self):
4132
"""
@@ -45,6 +36,15 @@ def compositions(self):
4536
self._compositions = CompositionList(self)
4637
return self._compositions
4738

39+
@property
40+
def recordings(self):
41+
"""
42+
:rtype: twilio.rest.video.v1.recording.RecordingList
43+
"""
44+
if self._recordings is None:
45+
self._recordings = RecordingList(self)
46+
return self._recordings
47+
4848
@property
4949
def rooms(self):
5050
"""

0 commit comments

Comments
 (0)
0