Skip to content

Fix httpx exception imports on httpx 0.13.x #40

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
allisson merged 1 commit into from
May 28, 2020
Merged

Fix httpx exception imports on httpx 0.13.x #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Changelog
---------

1.0.6
~~~~~

* Fix httpx exception imports on httpx 0.13.x (thanks @denravonska).

1.0.5
~~~~~

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
httpx>=0.12.1
httpx>=0.13.2
python-slugify>=4.0.0
python-status>=1.0.1
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
changelog = f.read()


install_requirements = ["python-status>=1.0.1", "httpx>=0.12.1", "python-slugify>=4.0.0"]
install_requirements = ["python-status>=1.0.1", "httpx>=0.13.2", "python-slugify>=4.0.0"]
tests_requirements = ["pytest", "pytest-asyncio", "pytest-cov", "pytest-httpserver", "coveralls"]


Expand Down
4 changes: 2 additions & 2 deletions simple_rest_client/decorators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def handle_request_error(f):
def wrapper(*args, **kwargs):
try:
response = f(*args, **kwargs)
except (httpx.TimeoutException,) as exc:
except (httpx.ConnectTimeout, httpx.ReadTimeout, httpx.WriteTimeout, httpx.PoolTimeout) as exc:
logger.exception(exc)
raise ClientConnectionError() from exc

Expand All @@ -41,7 +41,7 @@ def handle_async_request_error(f):
async def wrapper(*args, **kwargs):
try:
response = await f(*args, **kwargs)
except (httpx.TimeoutException,) as exc:
except (httpx.ConnectTimeout, httpx.ReadTimeout, httpx.WriteTimeout, httpx.PoolTimeout) as exc:
logger.exception(exc)
raise ClientConnectionError() from exc

Expand Down