From 6314d0bed7bd61fffed89cdb56d224e6e5aaefc0 Mon Sep 17 00:00:00 2001 From: Jennifer Mah <42650198+JenniferMah@users.noreply.github.com> Date: Mon, 23 Jan 2023 11:11:43 -0800 Subject: [PATCH] chore: rename last_request/response (#639) --- tests/unit/http/test_http_client.py | 28 ++++++++++++++-------------- tests/unit/rest/test_client.py | 4 ++-- twilio/http/http_client.py | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/tests/unit/http/test_http_client.py b/tests/unit/http/test_http_client.py index 6db824c0ef..e2367c301e 100644 --- a/tests/unit/http/test_http_client.py +++ b/tests/unit/http/test_http_client.py @@ -38,8 +38,8 @@ def test_request_sets_host_header_if_missing(self): self.client.request('doesnt matter', 'doesnt matter') self.assertEqual('other.twilio.com', self.request_mock.headers['Host']) - self.assertIsNotNone(self.client.last_request) - self.assertIsNotNone(self.client.last_response) + self.assertIsNotNone(self.client._test_only_last_request) + self.assertIsNotNone(self.client._test_only_last_response) def test_request_with_timeout(self): self.request_mock.url = 'https://api.twilio.com/' @@ -117,17 +117,17 @@ def test_last_request_last_response_exist(self): {'headers-value': 'headers-key'}, ['a', 'b']) - self.assertIsNotNone(self.client.last_request) - self.assertEqual('doesnt-matter-url', self.client.last_request.url) - self.assertEqual('DOESNT-MATTER-METHOD', self.client.last_request.method) - self.assertEqual({'params-value': 'params-key'}, self.client.last_request.params) - self.assertEqual({'data-value': 'data-key'}, self.client.last_request.data) - self.assertEqual({'headers-value': 'headers-key'}, self.client.last_request.headers) - self.assertEqual(['a', 'b'], self.client.last_request.auth) + self.assertIsNotNone(self.client._test_only_last_request) + self.assertEqual('doesnt-matter-url', self.client._test_only_last_request.url) + self.assertEqual('DOESNT-MATTER-METHOD', self.client._test_only_last_request.method) + self.assertEqual({'params-value': 'params-key'}, self.client._test_only_last_request.params) + self.assertEqual({'data-value': 'data-key'}, self.client._test_only_last_request.data) + self.assertEqual({'headers-value': 'headers-key'}, self.client._test_only_last_request.headers) + self.assertEqual(['a', 'b'], self.client._test_only_last_request.auth) - self.assertIsNotNone(self.client.last_response) - self.assertEqual(200, self.client.last_response.status_code) - self.assertEqual('testing-unicode: Ω≈ç√, 💩', self.client.last_response.text) + self.assertIsNotNone(self.client._test_only_last_response) + self.assertEqual(200, self.client._test_only_last_response.status_code) + self.assertEqual('testing-unicode: Ω≈ç√, 💩', self.client._test_only_last_response.text) def test_last_response_empty_on_error(self): self.session_mock.send.side_effect = Exception('voltron') @@ -135,8 +135,8 @@ def test_last_response_empty_on_error(self): with self.assertRaises(Exception): self.client.request('doesnt-matter', 'doesnt-matter') - self.assertIsNotNone(self.client.last_request) - self.assertIsNone(self.client.last_response) + self.assertIsNotNone(self.client._test_only_last_request) + self.assertIsNone(self.client._test_only_last_response) def test_request_behind_proxy(self): self.request_mock.url = 'https://api.twilio.com/' diff --git a/tests/unit/rest/test_client.py b/tests/unit/rest/test_client.py index 63e639ee4d..49a3865372 100644 --- a/tests/unit/rest/test_client.py +++ b/tests/unit/rest/test_client.py @@ -64,13 +64,13 @@ def tearDown(self): def test_set_default_user_agent(self): self.client.request('GET', 'https://api.twilio.com/') - request_header = self.client.http_client.last_request.headers['User-Agent'] + request_header = self.client.http_client._test_only_last_request.headers['User-Agent'] self.assertRegex(request_header, r'^twilio-python\/[0-9.]+(-rc\.[0-9]+)?\s\(\w+\s\w+\)\sPython\/[^\s]+$') def test_set_user_agent_extensions(self): expected_user_agent_extensions = ['twilio-run/2.0.0-test', 'flex-plugin/3.4.0'] self.client.user_agent_extensions = expected_user_agent_extensions self.client.request('GET', 'https://api.twilio.com/') - user_agent_headers = self.client.http_client.last_request.headers['User-Agent'] + user_agent_headers = self.client.http_client._test_only_last_request.headers['User-Agent'] user_agent_extensions = user_agent_headers.split(" ")[-len(expected_user_agent_extensions):] self.assertEqual(user_agent_extensions, expected_user_agent_extensions) diff --git a/twilio/http/http_client.py b/twilio/http/http_client.py index dd67bb4ff2..5159aec107 100644 --- a/twilio/http/http_client.py +++ b/twilio/http/http_client.py @@ -31,8 +31,8 @@ def __init__(self, pool_connections=True, request_hooks=None, timeout=None, logg self.session = Session() if pool_connections else None if self.session and max_retries is not None: self.session.mount('https://', HTTPAdapter(max_retries=max_retries)) - self.last_request = None - self.last_response = None + self._test_only_last_request = None + self._test_only_last_response = None self.logger = logger self.request_hooks = request_hooks or hooks.default_hooks() @@ -74,10 +74,10 @@ def request(self, method, url, params=None, data=None, headers=None, auth=None, self._log_request(kwargs) - self.last_response = None + self._test_only_last_response = None session = self.session or Session() request = Request(**kwargs) - self.last_request = TwilioRequest(**kwargs) + self._test_only_last_request = TwilioRequest(**kwargs) prepped_request = session.prepare_request(request) @@ -90,9 +90,9 @@ def request(self, method, url, params=None, data=None, headers=None, auth=None, self._log_response(response) - self.last_response = Response(int(response.status_code), response.text, response.headers) + self._test_only_last_response = Response(int(response.status_code), response.text, response.headers) - return self.last_response + return self._test_only_last_response def _log_request(self, kwargs): self.logger.info('-- BEGIN Twilio API Request --')