From c15c4bc1b78ce3c8cf2bb9f2ae66320cd13968e8 Mon Sep 17 00:00:00 2001 From: Robin <167366979+allrob23@users.noreply.github.com> Date: Thu, 24 Apr 2025 20:13:23 -0400 Subject: [PATCH 1/2] refactor: ensure / in the end of uri --- stackinabox/util/requests_mock/core.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/stackinabox/util/requests_mock/core.py b/stackinabox/util/requests_mock/core.py index 0dd9208..75f7279 100644 --- a/stackinabox/util/requests_mock/core.py +++ b/stackinabox/util/requests_mock/core.py @@ -52,6 +52,9 @@ def session_registration(uri, session): reqcallable.RequestMockCallable(uri) ) + if not uri.endswith('/'): + uri += '/' + # Tell the session about the adapter and the URI session.mount('http://{0}'.format(uri), StackInABox.hold_out('adapter')) session.mount('https://{0}'.format(uri), StackInABox.hold_out('adapter')) From 694f236a812cdb1f7fe734047a1af5d95b8af6bf Mon Sep 17 00:00:00 2001 From: Robin <167366979+allrob23@users.noreply.github.com> Date: Sat, 26 Apr 2025 08:59:08 -0400 Subject: [PATCH 2/2] fix: handle missing requests_mock.compat import gracefully --- stackinabox/util/requests_mock/core.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/stackinabox/util/requests_mock/core.py b/stackinabox/util/requests_mock/core.py index 75f7279..d49c706 100644 --- a/stackinabox/util/requests_mock/core.py +++ b/stackinabox/util/requests_mock/core.py @@ -17,7 +17,6 @@ from requests.adapters import HTTPAdapter from urllib3.response import HTTPResponse import requests_mock -import requests_mock.compat import requests_mock.response import six @@ -25,6 +24,11 @@ from stackinabox.util import deprecator from stackinabox.util.requests_mock import reqcallable +try: + import requests_mock.compat +except ImportError: + pass + logger = logging.getLogger(__name__)