Skip to content

Commit 35e40d9

Browse files
authored
Avoid DeprecationWarning from urllib3 (#719)
* Avoid DeprecationWarning from urllib3 * Don't use a version check * Add coverage of deprecated kwarg * Skip deprecation coverage
1 parent fd57198 commit 35e40d9

1 file changed

Lines changed: 9 additions & 2 deletions

File tree

twine/repository.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,19 @@ def __init__(
7777

7878
@staticmethod
7979
def _make_adapter_with_retries() -> adapters.HTTPAdapter:
80-
retry = urllib3.Retry(
80+
retry_kwargs = dict(
8181
connect=5,
8282
total=10,
83-
method_whitelist=["GET"],
8483
status_forcelist=[500, 501, 502, 503],
8584
)
85+
86+
try:
87+
retry = urllib3.Retry(allowed_methods=["GET"], **retry_kwargs)
88+
except TypeError: # pragma: no cover
89+
# Avoiding DeprecationWarning starting in urllib3 1.26
90+
# Remove when that's the mininum version
91+
retry = urllib3.Retry(method_whitelist=["GET"], **retry_kwargs)
92+
8693
return adapters.HTTPAdapter(max_retries=retry)
8794

8895
@staticmethod

0 commit comments

Comments
 (0)