Skip to content

Make backwards compatible with urllib3~=1.0 #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
susodapop merged 2 commits into from
Aug 16, 2023
Merged

Make backwards compatible with urllib3~=1.0 #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2646d8
Make backwards compatible with urllib3
Aug 15, 2023
106631d
Linter
Aug 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ numpy = [
sqlalchemy = "^1.3.24"
openpyxl = "^3.0.10"
alembic = "^1.0.11"
urllib3 = "^2.0.0"
urllib3 = ">=1.0"

[tool.poetry.dev-dependencies]
pytest = "^7.1.2"
Expand Down
8 changes: 7 additions & 1 deletion src/databricks/sql/auth/retry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@
from enum import Enum
from typing import List, Optional, Tuple, Union

from urllib3 import BaseHTTPResponse # type: ignore
# We only use this import for type hinting
try:
# If urllib3~=2.0 is installed
from urllib3 import BaseHTTPResponse # type: ignore
except ImportError:
# If urllib3~=1.0 is installed
from urllib3 import HTTPResponse as BaseHTTPResponse
from urllib3 import Retry
from urllib3.util.retry import RequestHistory

Expand Down