[Librarian] Regenerated @ 465fc6e02813df5a05716e0b2f634a38db8c1038

twilio-ci · twilio-ci · commit 043d02d5084a · 2018-06-21T23:37:57.000-07:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -3,6 +3,19 @@ twilio-python Changelog
 
 Here you can see the full list of changes between each twilio-python release.
 
+[2018-06-21] Version 6.14.6
+----------------------------
+**Library**
+- PR #429: Do not use ElementTree.__nonzero__; add test for mixed content. Thanks to @ekarson!
+
+**Api**
+- Add Fraud Lookups category to usage records
+
+**Video**
+- Allow user to set `ContentDisposition` when obtaining media URLs for Room Recordings and Compositions
+- Add Composition Settings resource
+
+
 [2018-06-19] Version 6.14.5
 ----------------------------
 **Library**
diff --git a/twilio/rest/api/v2010/account/usage/record/__init__.py b/twilio/rest/api/v2010/account/usage/record/__init__.py
@@ -351,6 +351,7 @@ class Category(object):
         CONVERSATIONS_PARTICIPANT_EVENTS = "conversations-participant-events"
         CONVERSATIONS_PARTICIPANTS = "conversations-participants"
         CPS = "cps"
+        FRAUD_LOOKUPS = "fraud-lookups"
         GROUP_ROOMS = "group-rooms"
         GROUP_ROOMS_DATA_TRACK = "group-rooms-data-track"
         GROUP_ROOMS_ENCRYPTED_MEDIA_RECORDED = "group-rooms-encrypted-media-recorded"
diff --git a/twilio/rest/api/v2010/account/usage/record/all_time.py b/twilio/rest/api/v2010/account/usage/record/all_time.py
@@ -237,6 +237,7 @@ class Category(object):
         CONVERSATIONS_PARTICIPANT_EVENTS = "conversations-participant-events"
         CONVERSATIONS_PARTICIPANTS = "conversations-participants"
         CPS = "cps"
+        FRAUD_LOOKUPS = "fraud-lookups"
         GROUP_ROOMS = "group-rooms"
         GROUP_ROOMS_DATA_TRACK = "group-rooms-data-track"
         GROUP_ROOMS_ENCRYPTED_MEDIA_RECORDED = "group-rooms-encrypted-media-recorded"
diff --git a/twilio/rest/api/v2010/account/usage/record/daily.py b/twilio/rest/api/v2010/account/usage/record/daily.py
@@ -237,6 +237,7 @@ class Category(object):
         CONVERSATIONS_PARTICIPANT_EVENTS = "conversations-participant-events"
         CONVERSATIONS_PARTICIPANTS = "conversations-participants"
         CPS = "cps"
+        FRAUD_LOOKUPS = "fraud-lookups"
         GROUP_ROOMS = "group-rooms"
         GROUP_ROOMS_DATA_TRACK = "group-rooms-data-track"
         GROUP_ROOMS_ENCRYPTED_MEDIA_RECORDED = "group-rooms-encrypted-media-recorded"
diff --git a/twilio/rest/api/v2010/account/usage/record/last_month.py b/twilio/rest/api/v2010/account/usage/record/last_month.py
@@ -237,6 +237,7 @@ class Category(object):
         CONVERSATIONS_PARTICIPANT_EVENTS = "conversations-participant-events"
         CONVERSATIONS_PARTICIPANTS = "conversations-participants"
         CPS = "cps"
+        FRAUD_LOOKUPS = "fraud-lookups"
         GROUP_ROOMS = "group-rooms"
         GROUP_ROOMS_DATA_TRACK = "group-rooms-data-track"
         GROUP_ROOMS_ENCRYPTED_MEDIA_RECORDED = "group-rooms-encrypted-media-recorded"
diff --git a/twilio/rest/api/v2010/account/usage/record/monthly.py b/twilio/rest/api/v2010/account/usage/record/monthly.py
@@ -237,6 +237,7 @@ class Category(object):
         CONVERSATIONS_PARTICIPANT_EVENTS = "conversations-participant-events"
         CONVERSATIONS_PARTICIPANTS = "conversations-participants"
         CPS = "cps"
+        FRAUD_LOOKUPS = "fraud-lookups"
         GROUP_ROOMS = "group-rooms"
         GROUP_ROOMS_DATA_TRACK = "group-rooms-data-track"
         GROUP_ROOMS_ENCRYPTED_MEDIA_RECORDED = "group-rooms-encrypted-media-recorded"
diff --git a/twilio/rest/api/v2010/account/usage/record/this_month.py b/twilio/rest/api/v2010/account/usage/record/this_month.py
@@ -237,6 +237,7 @@ class Category(object):
         CONVERSATIONS_PARTICIPANT_EVENTS = "conversations-participant-events"
         CONVERSATIONS_PARTICIPANTS = "conversations-participants"
         CPS = "cps"
+        FRAUD_LOOKUPS = "fraud-lookups"
         GROUP_ROOMS = "group-rooms"
         GROUP_ROOMS_DATA_TRACK = "group-rooms-data-track"
         GROUP_ROOMS_ENCRYPTED_MEDIA_RECORDED = "group-rooms-encrypted-media-recorded"
diff --git a/twilio/rest/api/v2010/account/usage/record/today.py b/twilio/rest/api/v2010/account/usage/record/today.py
@@ -237,6 +237,7 @@ class Category(object):
         CONVERSATIONS_PARTICIPANT_EVENTS = "conversations-participant-events"
         CONVERSATIONS_PARTICIPANTS = "conversations-participants"
         CPS = "cps"
+        FRAUD_LOOKUPS = "fraud-lookups"
         GROUP_ROOMS = "group-rooms"
         GROUP_ROOMS_DATA_TRACK = "group-rooms-data-track"
         GROUP_ROOMS_ENCRYPTED_MEDIA_RECORDED = "group-rooms-encrypted-media-recorded"
diff --git a/twilio/rest/api/v2010/account/usage/record/yearly.py b/twilio/rest/api/v2010/account/usage/record/yearly.py
@@ -237,6 +237,7 @@ class Category(object):
         CONVERSATIONS_PARTICIPANT_EVENTS = "conversations-participant-events"
         CONVERSATIONS_PARTICIPANTS = "conversations-participants"
         CPS = "cps"
+        FRAUD_LOOKUPS = "fraud-lookups"
         GROUP_ROOMS = "group-rooms"
         GROUP_ROOMS_DATA_TRACK = "group-rooms-data-track"
         GROUP_ROOMS_ENCRYPTED_MEDIA_RECORDED = "group-rooms-encrypted-media-recorded"
diff --git a/twilio/rest/api/v2010/account/usage/record/yesterday.py b/twilio/rest/api/v2010/account/usage/record/yesterday.py
@@ -237,6 +237,7 @@ class Category(object):
         CONVERSATIONS_PARTICIPANT_EVENTS = "conversations-participant-events"
         CONVERSATIONS_PARTICIPANTS = "conversations-participants"
         CPS = "cps"
+        FRAUD_LOOKUPS = "fraud-lookups"
         GROUP_ROOMS = "group-rooms"
         GROUP_ROOMS_DATA_TRACK = "group-rooms-data-track"
         GROUP_ROOMS_ENCRYPTED_MEDIA_RECORDED = "group-rooms-encrypted-media-recorded"
diff --git a/twilio/rest/api/v2010/account/usage/trigger.py b/twilio/rest/api/v2010/account/usage/trigger.py
@@ -377,6 +377,7 @@ class UsageCategory(object):
         CONVERSATIONS_EVENTS = "conversations-events"
         CONVERSATIONS_PARTICIPANT_EVENTS = "conversations-participant-events"
         CONVERSATIONS_PARTICIPANTS = "conversations-participants"
+        FRAUD_LOOKUPS = "fraud-lookups"
         CPS = "cps"
         GROUP_ROOMS = "group-rooms"
         GROUP_ROOMS_DATA_TRACK = "group-rooms-data-track"
diff --git a/twilio/rest/preview/__init__.py b/twilio/rest/preview/__init__.py
@@ -180,18 +180,18 @@ def hosted_number_orders(self):
         return self.hosted_numbers.hosted_number_orders
 
     @property
-    def installed_add_ons(self):
+    def available_add_ons(self):
         """
-        :rtype: twilio.rest.preview.marketplace.installed_add_on.InstalledAddOnList
+        :rtype: twilio.rest.preview.marketplace.available_add_on.AvailableAddOnList
         """
-        return self.marketplace.installed_add_ons
+        return self.marketplace.available_add_ons
 
     @property
-    def available_add_ons(self):
+    def installed_add_ons(self):
         """
-        :rtype: twilio.rest.preview.marketplace.available_add_on.AvailableAddOnList
+        :rtype: twilio.rest.preview.marketplace.installed_add_on.InstalledAddOnList
         """
-        return self.marketplace.available_add_ons
+        return self.marketplace.installed_add_ons
 
     @property
     def services(self):
diff --git a/twilio/rest/preview/marketplace/__init__.py b/twilio/rest/preview/marketplace/__init__.py
@@ -22,17 +22,8 @@ def __init__(self, domain):
         """
         super(Marketplace, self).__init__(domain)
         self.version = 'marketplace'
-        self._installed_add_ons = None
         self._available_add_ons = None
-
-    @property
-    def installed_add_ons(self):
-        """
-        :rtype: twilio.rest.preview.marketplace.installed_add_on.InstalledAddOnList
-        """
-        if self._installed_add_ons is None:
-            self._installed_add_ons = InstalledAddOnList(self)
-        return self._installed_add_ons
+        self._installed_add_ons = None
 
     @property
     def available_add_ons(self):
@@ -43,6 +34,15 @@ def available_add_ons(self):
             self._available_add_ons = AvailableAddOnList(self)
         return self._available_add_ons
 
+    @property
+    def installed_add_ons(self):
+        """
+        :rtype: twilio.rest.preview.marketplace.installed_add_on.InstalledAddOnList
+        """
+        if self._installed_add_ons is None:
+            self._installed_add_ons = InstalledAddOnList(self)
+        return self._installed_add_ons
+
     def __repr__(self):
         """
         Provide a friendly representation
diff --git a/twilio/rest/video/__init__.py b/twilio/rest/video/__init__.py
@@ -37,18 +37,18 @@ def v1(self):
         return self._v1
 
     @property
-    def recordings(self):
+    def compositions(self):
         """
-        :rtype: twilio.rest.video.v1.recording.RecordingList
+        :rtype: twilio.rest.video.v1.composition.CompositionList
         """
-        return self.v1.recordings
+        return self.v1.compositions
 
     @property
-    def compositions(self):
+    def recordings(self):
         """
-        :rtype: twilio.rest.video.v1.composition.CompositionList
+        :rtype: twilio.rest.video.v1.recording.RecordingList
         """
-        return self.v1.compositions
+        return self.v1.recordings
 
     @property
     def rooms(self):
diff --git a/twilio/rest/video/v1/__init__.py b/twilio/rest/video/v1/__init__.py
@@ -23,19 +23,10 @@ def __init__(self, domain):
         """
         super(V1, self).__init__(domain)
         self.version = 'v1'
-        self._recordings = None
         self._compositions = None
+        self._recordings = None
         self._rooms = None
 
-    @property
-    def recordings(self):
-        """
-        :rtype: twilio.rest.video.v1.recording.RecordingList
-        """
-        if self._recordings is None:
-            self._recordings = RecordingList(self)
-        return self._recordings
-
     @property
     def compositions(self):
         """
@@ -45,6 +36,15 @@ def compositions(self):
             self._compositions = CompositionList(self)
         return self._compositions
 
+    @property
+    def recordings(self):
+        """
+        :rtype: twilio.rest.video.v1.recording.RecordingList
+        """
+        if self._recordings is None:
+            self._recordings = RecordingList(self)
+        return self._recordings
+
     @property
     def rooms(self):
         """
