From c206553050438b1777da4f66d72407bcd704de20 Mon Sep 17 00:00:00 2001 From: Delirious Lettuce Date: Tue, 31 Oct 2017 18:45:13 -0600 Subject: [PATCH] Append a trailing underscore to fix shadowed builtin (id) --- examples/whitelabel/whitelabel.py | 40 +++++++++++++++---------------- test/test_sendgrid.py | 40 +++++++++++++++---------------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/examples/whitelabel/whitelabel.py b/examples/whitelabel/whitelabel.py index f529d3ed2..8515d45e3 100644 --- a/examples/whitelabel/whitelabel.py +++ b/examples/whitelabel/whitelabel.py @@ -117,8 +117,8 @@ data = { "ip": "192.168.0.1" } -id = "test_url_param" -response = sg.client.whitelabel.domains._(id).ips.post(request_body=data) +id_ = "test_url_param" +response = sg.client.whitelabel.domains._(id_).ips.post(request_body=data) print(response.status_code) print(response.body) print(response.headers) @@ -127,9 +127,9 @@ # Remove an IP from a domain whitelabel. # # DELETE /whitelabel/domains/{id}/ips/{ip} # -id = "test_url_param" +id_ = "test_url_param" ip = "test_url_param" -response = sg.client.whitelabel.domains._(id).ips._(ip).delete() +response = sg.client.whitelabel.domains._(id_).ips._(ip).delete() print(response.status_code) print(response.body) print(response.headers) @@ -138,8 +138,8 @@ # Validate a domain whitelabel. # # POST /whitelabel/domains/{id}/validate # -id = "test_url_param" -response = sg.client.whitelabel.domains._(id).validate.post() +id_ = "test_url_param" +response = sg.client.whitelabel.domains._(id_).validate.post() print(response.status_code) print(response.body) print(response.headers) @@ -172,8 +172,8 @@ # Retrieve an IP whitelabel # # GET /whitelabel/ips/{id} # -id = "test_url_param" -response = sg.client.whitelabel.ips._(id).get() +id_ = "test_url_param" +response = sg.client.whitelabel.ips._(id_).get() print(response.status_code) print(response.body) print(response.headers) @@ -182,8 +182,8 @@ # Delete an IP whitelabel # # DELETE /whitelabel/ips/{id} # -id = "test_url_param" -response = sg.client.whitelabel.ips._(id).delete() +id_ = "test_url_param" +response = sg.client.whitelabel.ips._(id_).delete() print(response.status_code) print(response.body) print(response.headers) @@ -192,8 +192,8 @@ # Validate an IP whitelabel # # POST /whitelabel/ips/{id}/validate # -id = "test_url_param" -response = sg.client.whitelabel.ips._(id).validate.post() +id_ = "test_url_param" +response = sg.client.whitelabel.ips._(id_).validate.post() print(response.status_code) print(response.body) print(response.headers) @@ -260,8 +260,8 @@ data = { "default": True } -id = "test_url_param" -response = sg.client.whitelabel.links._(id).patch(request_body=data) +id_ = "test_url_param" +response = sg.client.whitelabel.links._(id_).patch(request_body=data) print(response.status_code) print(response.body) print(response.headers) @@ -270,8 +270,8 @@ # Retrieve a Link Whitelabel # # GET /whitelabel/links/{id} # -id = "test_url_param" -response = sg.client.whitelabel.links._(id).get() +id_ = "test_url_param" +response = sg.client.whitelabel.links._(id_).get() print(response.status_code) print(response.body) print(response.headers) @@ -280,8 +280,8 @@ # Delete a Link Whitelabel # # DELETE /whitelabel/links/{id} # -id = "test_url_param" -response = sg.client.whitelabel.links._(id).delete() +id_ = "test_url_param" +response = sg.client.whitelabel.links._(id_).delete() print(response.status_code) print(response.body) print(response.headers) @@ -290,8 +290,8 @@ # Validate a Link Whitelabel # # POST /whitelabel/links/{id}/validate # -id = "test_url_param" -response = sg.client.whitelabel.links._(id).validate.post() +id_ = "test_url_param" +response = sg.client.whitelabel.links._(id_).validate.post() print(response.status_code) print(response.body) print(response.headers) diff --git a/test/test_sendgrid.py b/test/test_sendgrid.py index c73c44bbf..6d706421f 100644 --- a/test/test_sendgrid.py +++ b/test/test_sendgrid.py @@ -2227,25 +2227,25 @@ def test_whitelabel_domains__id__ips_post(self): data = { "ip": "192.168.0.1" } - id = "test_url_param" + id_ = "test_url_param" headers = {'X-Mock': 200} response = self.sg.client.whitelabel.domains._( - id).ips.post(request_body=data, request_headers=headers) + id_).ips.post(request_body=data, request_headers=headers) self.assertEqual(response.status_code, 200) def test_whitelabel_domains__id__ips__ip__delete(self): - id = "test_url_param" + id_ = "test_url_param" ip = "test_url_param" headers = {'X-Mock': 200} response = self.sg.client.whitelabel.domains._( - id).ips._(ip).delete(request_headers=headers) + id_).ips._(ip).delete(request_headers=headers) self.assertEqual(response.status_code, 200) def test_whitelabel_domains__id__validate_post(self): - id = "test_url_param" + id_ = "test_url_param" headers = {'X-Mock': 200} response = self.sg.client.whitelabel.domains._( - id).validate.post(request_headers=headers) + id_).validate.post(request_headers=headers) self.assertEqual(response.status_code, 200) def test_whitelabel_ips_post(self): @@ -2267,24 +2267,24 @@ def test_whitelabel_ips_get(self): self.assertEqual(response.status_code, 200) def test_whitelabel_ips__id__get(self): - id = "test_url_param" + id_ = "test_url_param" headers = {'X-Mock': 200} response = self.sg.client.whitelabel.ips._( - id).get(request_headers=headers) + id_).get(request_headers=headers) self.assertEqual(response.status_code, 200) def test_whitelabel_ips__id__delete(self): - id = "test_url_param" + id_ = "test_url_param" headers = {'X-Mock': 204} response = self.sg.client.whitelabel.ips._( - id).delete(request_headers=headers) + id_).delete(request_headers=headers) self.assertEqual(response.status_code, 204) def test_whitelabel_ips__id__validate_post(self): - id = "test_url_param" + id_ = "test_url_param" headers = {'X-Mock': 200} response = self.sg.client.whitelabel.ips._( - id).validate.post(request_headers=headers) + id_).validate.post(request_headers=headers) self.assertEqual(response.status_code, 200) def test_whitelabel_links_post(self): @@ -2331,31 +2331,31 @@ def test_whitelabel_links__id__patch(self): data = { "default": True } - id = "test_url_param" + id_ = "test_url_param" headers = {'X-Mock': 200} - response = self.sg.client.whitelabel.links._(id).patch( + response = self.sg.client.whitelabel.links._(id_).patch( request_body=data, request_headers=headers) self.assertEqual(response.status_code, 200) def test_whitelabel_links__id__get(self): - id = "test_url_param" + id_ = "test_url_param" headers = {'X-Mock': 200} response = self.sg.client.whitelabel.links._( - id).get(request_headers=headers) + id_).get(request_headers=headers) self.assertEqual(response.status_code, 200) def test_whitelabel_links__id__delete(self): - id = "test_url_param" + id_ = "test_url_param" headers = {'X-Mock': 204} response = self.sg.client.whitelabel.links._( - id).delete(request_headers=headers) + id_).delete(request_headers=headers) self.assertEqual(response.status_code, 204) def test_whitelabel_links__id__validate_post(self): - id = "test_url_param" + id_ = "test_url_param" headers = {'X-Mock': 200} response = self.sg.client.whitelabel.links._( - id).validate.post(request_headers=headers) + id_).validate.post(request_headers=headers) self.assertEqual(response.status_code, 200) def test_whitelabel_links__link_id__subuser_post(self):