Merge pull request #638 from JWCook/path-url-0.9

(0.9) Add CachedRequest.path_url property

HISTORY.md

@@ -2,6 +2,7 @@
 
 ## 0.9.5 (Unreleased)
 * Fix usage of memory backend with `install_cache()`
+* Add `CachedRequest.path_url` property
 * Add compatibility with cattrs 22.1
 
 ## 0.9.4 (2022-04-22)

requests_cache/models/request.py

@@ -1,4 +1,5 @@
 from logging import getLogger
+from urllib.parse import urlsplit
 
 from attr import asdict, define, field, fields_dict
 from requests import PreparedRequest
@@ -27,6 +28,13 @@ def from_request(cls, original_request: PreparedRequest) -> 'CachedRequest':
         kwargs['cookies'] = getattr(original_request, '_cookies', None)
         return cls(**kwargs)  # type: ignore  # False positive in mypy 0.920+?
 
+    @property
+    def path_url(self):
+        p = urlsplit(self.url)
+        url = p.path or '/'
+        url += f'?{p.query}' if p.query else ''
+        return url
+
     def copy(self) -> 'CachedRequest':
         """Return a copy of the CachedRequest"""
         return self.__class__(**asdict(self))

tests/unit/models/test_request.py

@@ -10,7 +10,7 @@ def test_from_request(mock_session):
     expected_headers = {**default_headers(), 'Content-Length': '12', 'foo': 'bar'}
 
     assert response.request.body == request.body == b'mock request'
-    assert response.request._cookies == request.cookies == {}
     assert response.request.headers == request.headers == expected_headers
     assert response.request.method == request.method == 'GET'
+    assert response.request.path_url == request.path_url == '/text'
     assert response.request.url == request.url == MOCKED_URL