Skip to content

Commit deefcd6

Browse files
thinkingseriousthinkingserious
authored
Merge pull request sendgrid#533 from delirious-lettuce/fix_shadowed_builtins
Fix shadowed builtins, `id` -> `id_`
2 parents 8088e8d + c206553 commit deefcd6

2 files changed

Lines changed: 40 additions & 40 deletions

File tree

‎examples/whitelabel/whitelabel.py‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@
119119
data = {
120120
"ip": "192.168.0.1"
121121
}
122-
id = "test_url_param"
123-
response = sg.client.whitelabel.domains._(id).ips.post(request_body=data)
122+
id_ = "test_url_param"
123+
response = sg.client.whitelabel.domains._(id_).ips.post(request_body=data)
124124
print(response.status_code)
125125
print(response.body)
126126
print(response.headers)
@@ -129,9 +129,9 @@
129129
# Remove an IP from a domain whitelabel. #
130130
# DELETE /whitelabel/domains/{id}/ips/{ip} #
131131

132-
id = "test_url_param"
132+
id_ = "test_url_param"
133133
ip = "test_url_param"
134-
response = sg.client.whitelabel.domains._(id).ips._(ip).delete()
134+
response = sg.client.whitelabel.domains._(id_).ips._(ip).delete()
135135
print(response.status_code)
136136
print(response.body)
137137
print(response.headers)
@@ -140,8 +140,8 @@
140140
# Validate a domain whitelabel. #
141141
# POST /whitelabel/domains/{id}/validate #
142142

143-
id = "test_url_param"
144-
response = sg.client.whitelabel.domains._(id).validate.post()
143+
id_ = "test_url_param"
144+
response = sg.client.whitelabel.domains._(id_).validate.post()
145145
print(response.status_code)
146146
print(response.body)
147147
print(response.headers)
@@ -174,8 +174,8 @@
174174
# Retrieve an IP whitelabel #
175175
# GET /whitelabel/ips/{id} #
176176

177-
id = "test_url_param"
178-
response = sg.client.whitelabel.ips._(id).get()
177+
id_ = "test_url_param"
178+
response = sg.client.whitelabel.ips._(id_).get()
179179
print(response.status_code)
180180
print(response.body)
181181
print(response.headers)
@@ -184,8 +184,8 @@
184184
# Delete an IP whitelabel #
185185
# DELETE /whitelabel/ips/{id} #
186186

187-
id = "test_url_param"
188-
response = sg.client.whitelabel.ips._(id).delete()
187+
id_ = "test_url_param"
188+
response = sg.client.whitelabel.ips._(id_).delete()
189189
print(response.status_code)
190190
print(response.body)
191191
print(response.headers)
@@ -194,8 +194,8 @@
194194
# Validate an IP whitelabel #
195195
# POST /whitelabel/ips/{id}/validate #
196196

197-
id = "test_url_param"
198-
response = sg.client.whitelabel.ips._(id).validate.post()
197+
id_ = "test_url_param"
198+
response = sg.client.whitelabel.ips._(id_).validate.post()
199199
print(response.status_code)
200200
print(response.body)
201201
print(response.headers)
@@ -263,8 +263,8 @@
263263
data = {
264264
"default": True
265265
}
266-
id = "test_url_param"
267-
response = sg.client.whitelabel.links._(id).patch(request_body=data)
266+
id_ = "test_url_param"
267+
response = sg.client.whitelabel.links._(id_).patch(request_body=data)
268268
print(response.status_code)
269269
print(response.body)
270270
print(response.headers)
@@ -273,8 +273,8 @@
273273
# Retrieve a Link Whitelabel #
274274
# GET /whitelabel/links/{id} #
275275

276-
id = "test_url_param"
277-
response = sg.client.whitelabel.links._(id).get()
276+
id_ = "test_url_param"
277+
response = sg.client.whitelabel.links._(id_).get()
278278
print(response.status_code)
279279
print(response.body)
280280
print(response.headers)
@@ -283,8 +283,8 @@
283283
# Delete a Link Whitelabel #
284284
# DELETE /whitelabel/links/{id} #
285285

286-
id = "test_url_param"
287-
response = sg.client.whitelabel.links._(id).delete()
286+
id_ = "test_url_param"
287+
response = sg.client.whitelabel.links._(id_).delete()
288288
print(response.status_code)
289289
print(response.body)
290290
print(response.headers)
@@ -293,8 +293,8 @@
293293
# Validate a Link Whitelabel #
294294
# POST /whitelabel/links/{id}/validate #
295295

296-
id = "test_url_param"
297-
response = sg.client.whitelabel.links._(id).validate.post()
296+
id_ = "test_url_param"
297+
response = sg.client.whitelabel.links._(id_).validate.post()
298298
print(response.status_code)
299299
print(response.body)
300300
print(response.headers)

‎test/test_sendgrid.py‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2231,25 +2231,25 @@ def test_whitelabel_domains__id__ips_post(self):
22312231
data = {
22322232
"ip": "192.168.0.1"
22332233
}
2234-
id = "test_url_param"
2234+
id_ = "test_url_param"
22352235
headers = {'X-Mock': 200}
22362236
response = self.sg.client.whitelabel.domains._(
2237-
id).ips.post(request_body=data, request_headers=headers)
2237+
id_).ips.post(request_body=data, request_headers=headers)
22382238
self.assertEqual(response.status_code, 200)
22392239

22402240
def test_whitelabel_domains__id__ips__ip__delete(self):
2241-
id = "test_url_param"
2241+
id_ = "test_url_param"
22422242
ip = "test_url_param"
22432243
headers = {'X-Mock': 200}
22442244
response = self.sg.client.whitelabel.domains._(
2245-
id).ips._(ip).delete(request_headers=headers)
2245+
id_).ips._(ip).delete(request_headers=headers)
22462246
self.assertEqual(response.status_code, 200)
22472247

22482248
def test_whitelabel_domains__id__validate_post(self):
2249-
id = "test_url_param"
2249+
id_ = "test_url_param"
22502250
headers = {'X-Mock': 200}
22512251
response = self.sg.client.whitelabel.domains._(
2252-
id).validate.post(request_headers=headers)
2252+
id_).validate.post(request_headers=headers)
22532253
self.assertEqual(response.status_code, 200)
22542254

22552255
def test_whitelabel_ips_post(self):
@@ -2271,24 +2271,24 @@ def test_whitelabel_ips_get(self):
22712271
self.assertEqual(response.status_code, 200)
22722272

22732273
def test_whitelabel_ips__id__get(self):
2274-
id = "test_url_param"
2274+
id_ = "test_url_param"
22752275
headers = {'X-Mock': 200}
22762276
response = self.sg.client.whitelabel.ips._(
2277-
id).get(request_headers=headers)
2277+
id_).get(request_headers=headers)
22782278
self.assertEqual(response.status_code, 200)
22792279

22802280
def test_whitelabel_ips__id__delete(self):
2281-
id = "test_url_param"
2281+
id_ = "test_url_param"
22822282
headers = {'X-Mock': 204}
22832283
response = self.sg.client.whitelabel.ips._(
2284-
id).delete(request_headers=headers)
2284+
id_).delete(request_headers=headers)
22852285
self.assertEqual(response.status_code, 204)
22862286

22872287
def test_whitelabel_ips__id__validate_post(self):
2288-
id = "test_url_param"
2288+
id_ = "test_url_param"
22892289
headers = {'X-Mock': 200}
22902290
response = self.sg.client.whitelabel.ips._(
2291-
id).validate.post(request_headers=headers)
2291+
id_).validate.post(request_headers=headers)
22922292
self.assertEqual(response.status_code, 200)
22932293

22942294
def test_whitelabel_links_post(self):
@@ -2335,31 +2335,31 @@ def test_whitelabel_links__id__patch(self):
23352335
data = {
23362336
"default": True
23372337
}
2338-
id = "test_url_param"
2338+
id_ = "test_url_param"
23392339
headers = {'X-Mock': 200}
2340-
response = self.sg.client.whitelabel.links._(id).patch(
2340+
response = self.sg.client.whitelabel.links._(id_).patch(
23412341
request_body=data, request_headers=headers)
23422342
self.assertEqual(response.status_code, 200)
23432343

23442344
def test_whitelabel_links__id__get(self):
2345-
id = "test_url_param"
2345+
id_ = "test_url_param"
23462346
headers = {'X-Mock': 200}
23472347
response = self.sg.client.whitelabel.links._(
2348-
id).get(request_headers=headers)
2348+
id_).get(request_headers=headers)
23492349
self.assertEqual(response.status_code, 200)
23502350

23512351
def test_whitelabel_links__id__delete(self):
2352-
id = "test_url_param"
2352+
id_ = "test_url_param"
23532353
headers = {'X-Mock': 204}
23542354
response = self.sg.client.whitelabel.links._(
2355-
id).delete(request_headers=headers)
2355+
id_).delete(request_headers=headers)
23562356
self.assertEqual(response.status_code, 204)
23572357

23582358
def test_whitelabel_links__id__validate_post(self):
2359-
id = "test_url_param"
2359+
id_ = "test_url_param"
23602360
headers = {'X-Mock': 200}
23612361
response = self.sg.client.whitelabel.links._(
2362-
id).validate.post(request_headers=headers)
2362+
id_).validate.post(request_headers=headers)
23632363
self.assertEqual(response.status_code, 200)
23642364

23652365
def test_whitelabel_links__link_id__subuser_post(self):

0 commit comments

Comments
 (0)