10000 Merge remote-tracking branch 'public/release-6x' into release-6x · randy3465/twilio-python@0db18e1 · GitHub
[go: up one dir, main page]
Skip to content

Commit 0db18e1

Browse files
author
matt
committed
Merge remote-tracking branch 'public/release-6x' into release-6x
2 parents 5505ec0 + b79679d commit 0db18e1

File tree

95 files changed

+885
-744
lines changed

Some content is hidden

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

95 files changed

+885
-744
lines changed

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,7 @@ def page(self, friendly_name=values.unset, status=values.unset,
161161
params=params,
162162
)
163163

164-
return AccountPage(
165-
self._version,
166-
response,
167-
)
164+
return AccountPage(self._version, response, self._solution)
168165

169166
def get(self, sid):
170167
"""
@@ -206,7 +203,7 @@ def __repr__(self):
206203

207204
class AccountPage(Page):
208205

209-
def __init__(self, version, response):
206+
def __init__(self, version, response, solution):
210207
"""
211208
Initialize the AccountPage
212209
@@ -219,7 +216,7 @@ def __init__(self, version, response):
219216
super(AccountPage, self).__init__(version, response)
220217

221218
# Path Solution
222-
self._solution = {}
219+
self._solution = solution
223220

224221
def get_instance(self, payload):
225222
"""

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,7 @@ def page(self, customer_name=values.unset, friendly_name=values.unset,
165165
params=params,
166166
)
167167

168-
return AddressPage(
169-
self._version,
170-
response,
171-
account_sid=self._solution['account_sid'],
172-
)
168+
return AddressPage(self._version, response, self._solution)
173169

174170
def get(self, sid):
175171
"""
@@ -213,7 +209,7 @@ def __repr__(self):
213209

214210
class AddressPage(Page):
215211

216-
def __init__(self, version, response, account_sid):
212+
def __init__(self, version, response, solution):
217213
"""
218214
Initialize the AddressPage
219215
@@ -227,9 +223,7 @@ def __init__(self, version, response, account_sid):
227223
super(AddressPage, self).__init__(version, response)
228224

229225
# Path Solution
230-
self._solution = {
231-
'account_sid': account_sid,
232-
}
226+
self._solution = solution
233227

234228
def get_instance(self, payload):
235229
"""

‎twilio/rest/api/v2010/account/address/dependent_phone_number.py

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,7 @@ def page(self, page_token=values.unset, page_number=values.unset,
106106
params=params,
107107
)
108108

109-
return DependentPhoneNumberPage(
110-
self._version,
111-
response,
112-
account_sid=self._solution['account_sid'],
113-
address_sid=self._solution['address_sid'],
114-
)
109+
return DependentPhoneNumberPage(self._version, response, self._solution)
115110

116111
def __repr__(self):
117112
"""
@@ -125,7 +120,7 @@ def __repr__(self):
125120

126121
class DependentPhoneNumberPage(Page):
127122

128-
def __init__(self, version, response, account_sid, address_sid):
123+
def __init__(self, version, response, solution):
129124
"""
130125
Initialize the DependentPhoneNumberPage
131126
@@ -140,10 +135,7 @@ def __init__(self, version, response, account_sid, address_sid):
140135
super(DependentPhoneNumberPage, self).__init__(version, response)
141136

142137
# Path Solution
143-
self._solution = {
144-
'account_sid': account_sid,
145-
'address_sid': address_sid,
146-
}
138+
self._solution = solution
147139

148140
def get_instance(self, payload):
149141
"""

‎twilio/rest/api/v2010/account/application.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,7 @@ def page(self, friendly_name=values.unset, page_token=values.unset,
171171
params=params,
172172
)
173173

174-
return ApplicationPage(
175-
self._version,
176-
response,
177-
account_sid=self._solution['account_sid'],
178-
)
174+
return ApplicationPage(self._version, response, self._solution)
179175

180176
def get(self, sid):
181177
"""
@@ -219,7 +215,7 @@ def __repr__(self):
219215

220216
class ApplicationPage(Page):
221217

222-
def __init__(self, version, response, account_sid):
218+
def __init__(self, version, response, solution):
223219
"""
224220
Initialize the ApplicationPage
225221
@@ -233,9 +229,7 @@ def __init__(self, version, response, account_sid):
233229
super(ApplicationPage, self).__init__(version, response)
234230

235231
# Path Solution
236-
self._solution = {
237-
'account_sid': account_sid,
238-
}
232+
self._solution = solution
239233

240234
def get_instance(self, payload):
241235
"""

‎twilio/rest/api/v2010/account/authorized_connect_app.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,7 @@ def page(self, page_token=values.unset, page_number=values.unset,
105105
params=params,
106106
)
107107

108-
return AuthorizedConnectAppPage(
109-
self._version,
110-
response,
111-
account_sid=self._solution['account_sid'],
112-
)
108+
return AuthorizedConnectAppPage(self._version, response, self._solution)
113109

114110
def get(self, connect_app_sid):
115111
"""
@@ -153,7 +149,7 @@ def __repr__(self):
153149

154150
class AuthorizedConnectAppPage(Page):
155151

156-
def __init__(self, version, response, account_sid):
152+
def __init__(self, version, response, solution):
157153
"""
158154
Initialize the AuthorizedConnectAppPage
159155
@@ -167,9 +163,7 @@ def __init__(self, version, response, account_sid):
167163
super(AuthorizedConnectAppPage, self).__init__(version, response)
168164

169165
# Path Solution
170-
self._solution = {
171-
'account_sid': account_sid,
172-
}
166+
self._solution = solution
173167

174168
def get_instance(self, payload):
175169
"""

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,7 @@ def page(self, page_token=values.unset, page_number=values.unset,
107107
params=params,
108108
)
109109

110-
return AvailablePhoneNumberCountryPage(
111-
self._version,
112-
response,
113-
account_sid=self._solution['account_sid'],
114-
)
110+
return AvailablePhoneNumberCountryPage(self._version, response, self._solution)
115111

116112
def get(self, country_code):
117113
"""
@@ -155,7 +151,7 @@ def __repr__(self):
155151

156152
class AvailablePhoneNumberCountryPage(Page):
157153

158-
def __init__(self, version, response, account_sid):
154+
def __init__(self, version, response, solution):
159155
"""
160156
Initialize the AvailablePhoneNumberCountryPage
161157
@@ -169,9 +165,7 @@ def __init__(self, version, response, account_sid):
169165
super(AvailablePhoneNumberCountryPage, self).__init__(version, response)
170166

171167
# Path Solution
172-
self._solution = {
173-
'account_sid': account_sid,
174-
}
168+
self._solution = solution
175169

176170
def get_instance(self, payload):
177171
"""

‎twilio/rest/api/v2010/account/available_phone_number/local.py

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,7 @@ def page(self, area_code=values.unset, contains=values.unset,
176176
params=params,
177177
)
178178

179-
return LocalPage(
180-
self._version,
181-
response,
182-
account_sid=self._solution['account_sid'],
183-
country_code=self._solution['country_code'],
184-
)
179+
return LocalPage(self._version, response, self._solution)
185180

186181
def __repr__(self):
187182
"""
@@ -195,7 +190,7 @@ def __repr__(self):
195190

196191
class LocalPage(Page):
197192

198-
def __init__(self, version, response, account_sid, country_code):
193+
def __init__(self, version, response, solution):
199194
"""
200195
Initialize the LocalPage
201196
@@ -210,10 +205,7 @@ def __init__(self, version, response, account_sid, country_code):
210205
super(LocalPage, self).__init__(version, response)
211206

212207
# Path Solution
213-
self._solution = {
214-
'account_sid': account_sid,
215-
'country_code': country_code,
216-
}
208+
self._solution = solution
217209

218210
def get_instance(self, payload):
219211
"""

‎twilio/rest/api/v2010/account/available_phone_number/mobile.py

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,7 @@ def page(self, area_code=values.unset, contains=values.unset,
176176
params=params,
177177
)
178178

179-
return MobilePage(
180-
self._version,
181-
response,
182-
account_sid=self._solution['account_sid'],
183-
country_code=self._solution['country_code'],
184-
)
179+
return MobilePage(self._version, response, self._solution)
185180

186181
def __repr__(self):
187182
"""
@@ -195,7 +190,7 @@ def __repr__(self):
195190

196191
class MobilePage(Page):
197192

198-
def __init__(self, version, response, account_sid, country_code):
193+
def __init__(self, version, response, solution):
199194
"""
200195
Initialize the MobilePage
201196
@@ -210,10 +205,7 @@ def __init__(self, version, response, account_sid, country_code):
210205
super(MobilePage, self).__init__(version, response)
211206

212207
# Path Solution
213-
self._solution = {
214-
'account_sid': account_sid,
215-
'country_code': country_code,
216-
}
208+
self._solution = solution
217209

218210
def get_instance(self, payload):
219211
"""

‎twilio/rest/api/v2010/account/available_phone_number/toll_free.py

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,7 @@ def page(self, area_code=values.unset, contains=values.unset,
176176
params=params,
177177
)
178178

179-
return TollFreePage(
180-
self._version,
181-
response,
182-
account_sid=self._solution['account_sid'],
183-
country_code=self._solution['country_code'],
184-
)
179+
return TollFreePage(self._version, response, self._solution)
185180

186181
def __repr__(self):
187182
"""
@@ -195,7 +190,7 @@ def __repr__(self):
195190

196191
class TollFreePage(Page):
197192

198-
def __init__(self, version, response, account_sid, country_code):
193+
def __init__(self, version, response, solution):
199194
"""
200195
Initialize the TollFreePage
201196
@@ -210,10 +205,7 @@ def __init__(self, version, response, account_sid, country_code):
210205
super(TollFreePage, self).__init__(version, response)
211206

212207
# Path Solution
213-
self._solution = {
214-
'account_sid': account_sid,
215-
'country_code': country_code,
216-
}
208+
self._solution = solution
217209

218210
def get_instance(self, payload):
219211
"""

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -241,11 +241,7 @@ def page(self, to=values.unset, from_=values.unset,
241241
params=params,
242242
)
243243

244-
return CallPage(
245-
self._version,
246-
response,
247-
account_sid=self._solution['account_sid'],
248-
)
244+
return CallPage(self._version, response, self._solution)
249245

250246
@property
251247
def feedback_summaries(self):
@@ -304,7 +300,7 @@ def __repr__(self):
304300

305301
class CallPage(Page):
306302

307-
def __init__(self, version, response, account_sid):
303+
def __init__(self, version, response, solution):
308304
"""
309305
Initialize the CallPage
310306
@@ -318,9 +314,7 @@ def __init__(self, version, response, account_sid):
318314
super(CallPage, self).__init__(version, response)
319315

320316
# Path Solution
321-
self._solution = {
322-
'account_sid': account_sid,
323-
}
317+
self._solution = solution
324318

325319
def get_instance(self, payload):
326320
"""

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def __repr__(self):
7373

7474
class FeedbackPage(Page):
7575

76-
def __init__(self, version, response, account_sid, call_sid):
76+
def __init__(self, version, response, solution):
7777
"""
7878
Initialize the FeedbackPage
7979
@@ -88,10 +88,7 @@ def __init__(self, version, response, account_sid, call_sid):
8888
super(FeedbackPage, self).__init__(version, response)
8989

9090
# Path Solution
91-
self._solution = {
92-
'account_sid': account_sid,
93-
'call_sid': call_sid,
94-
}
91+
self._solution = solution
9592

9693
def get_instance(self, payload):
9794
"""

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def __repr__(self):
111111

112112
class FeedbackSummaryPage(Page):
113113

114-
def __init__(self, version, response, account_sid):
114+
def __init__(self, version, response, solution):
115115
"""
116116
Initialize the FeedbackSummaryPage
117117
@@ -125,9 +125,7 @@ def __init__(self, version, response, account_sid):
125125
super(FeedbackSummaryPage, self).__init__(version, response)
126126

127127
# Path Solution
128-
self._solution = {
129-
'account_sid': account_sid,
130-
}
128+
self._solution = solution
131129

132130
def get_instance(self, payload):
133131
"""

0 commit comments

Comments
 (0)
0