Update to mypy v0.931 and add some ignores/workarounds for new false positives

3 files changed, 11 insertions, 6 deletions

diff --git a/requests_cache/models/raw_response.py b/requests_cache/models/raw_response.py
index de2a8f6..96d586d 100644
--- a/requests_cache/models/raw_response.py
+++ b/requests_cache/models/raw_response.py
@@ -4,7 +4,11 @@ from typing import Mapping
 
 from attr import define, field, fields_dict
 from requests import Response
-from urllib3.response import HTTPHeaderDict, HTTPResponse, is_fp_closed
+from urllib3.response import (  # type: ignore  # import location false positive
+    HTTPHeaderDict,
+    HTTPResponse,
+    is_fp_closed,
+)
 
 logger = getLogger(__name__)
 
@@ -19,7 +23,8 @@ class CachedHTTPResponse(HTTPResponse):
     """
 
     decode_content: bool = field(default=None)
-    headers: HTTPHeaderDict = None  # Not serialized; set in either init or CachedResponse post-init
+    # These headers are redundant and not serialized; copied in init and CachedResponse post-init
+    headers: HTTPHeaderDict = None  # type: ignore
     reason: str = field(default=None)
     request_url: str = field(default=None)
     status: int = field(default=0)
@@ -33,7 +38,7 @@ class CachedHTTPResponse(HTTPResponse):
 
         self._body = body
         self.headers = HTTPHeaderDict(headers)
-        self.__attrs_init__(*args, **kwargs)
+        self.__attrs_init__(*args, **kwargs)  # type: ignore # False positive in mypy 0.920+?
 
     @classmethod
     def from_response(cls, original_response: Response):
@@ -58,7 +63,7 @@ class CachedHTTPResponse(HTTPResponse):
             raw._fp_bytes_read = 0
             raw.length_remaining = len(body)
 
-        return cls(**kwargs)
+        return cls(**kwargs)  # type: ignore  # False positive in mypy 0.920+?
 
     def release_conn(self):
         """No-op for compatibility"""
diff --git a/requests_cache/models/request.py b/requests_cache/models/request.py
index dbeddd0..935c249 100644
--- a/requests_cache/models/request.py
+++ b/requests_cache/models/request.py
@@ -25,7 +25,7 @@ class CachedRequest:
         """Create a CachedRequest based on an original request object"""
         kwargs = {k: getattr(original_request, k, None) for k in fields_dict(cls).keys()}
         kwargs['cookies'] = getattr(original_request, '_cookies', None)
-        return cls(**kwargs)
+        return cls(**kwargs)  # type: ignore  # False positive in mypy 0.920+?
 
     def copy(self) -> 'CachedRequest':
         """Return a copy of the CachedRequest"""
diff --git a/requests_cache/models/response.py b/requests_cache/models/response.py
index 73b09fd..8fcdfb8 100755
--- a/requests_cache/models/response.py
+++ b/requests_cache/models/response.py
@@ -7,7 +7,7 @@ from attr import define, field
 from requests import PreparedRequest, Response
 from requests.cookies import RequestsCookieJar
 from requests.structures import CaseInsensitiveDict
-from urllib3.response import HTTPHeaderDict
+from urllib3._collections import HTTPHeaderDict
 
 from ..cache_control import ExpirationTime, get_expiration_datetime
 from . import CachedHTTPResponse, CachedRequest