diff --git a/wayback/_client.py b/wayback/_client.py index abee7cd..83b74b8 100644 --- a/wayback/_client.py +++ b/wayback/_client.py @@ -38,6 +38,13 @@ ReadTimeoutError, ProxyError, TimeoutError) +# The Header dict lives in a different place for urllib3 v2: +try: + from urllib3 import HTTPHeaderDict as Urllib3HTTPHeaderDict +# vs. urllib3 v1: +except ImportError: + from urllib3.response import HTTPHeaderDict as Urllib3HTTPHeaderDict + from warnings import warn from . import _utils, __version__ from ._models import CdxRecord, Memento diff --git a/wayback/tests/test_client.py b/wayback/tests/test_client.py index 63d63d7..57fcb12 100644 --- a/wayback/tests/test_client.py +++ b/wayback/tests/test_client.py @@ -8,8 +8,14 @@ from urllib.parse import urlparse, ParseResult, parse_qs from urllib3 import (HTTPConnectionPool, HTTPResponse, - HTTPHeaderDict, Timeout as Urllib3Timeout) +# The Header dict lives in a different place for urllib3 v2: +try: + from urllib3 import HTTPHeaderDict +# vs. urllib3 v1: +except ImportError: + from urllib3.response import HTTPHeaderDict + from .support import create_vcr from .._client import (CdxRecord, Mode,