Skip to content

Fix exception causes in client.py #4815

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
merged 2 commits into from
Oct 18, 2020
Merged

Fix exception causes in client.py #4815

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d93150c
Fix exception causes in client.py
cool-RR Jun 12, 2020
bb8072e
Merge branch 'master' into patch-1
asvetlov Oct 18, 2020
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
14 changes: 7 additions & 7 deletions aiohttp/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,8 +345,8 @@ async def _request(

try:
url = URL(str_or_url)
except ValueError:
raise InvalidURL(str_or_url)
except ValueError as e:
raise InvalidURL(str_or_url) from e

skip_headers = set(self._skip_auto_headers)
if skip_auto_headers is not None:
Expand All @@ -356,8 +356,8 @@ async def _request(
if proxy is not None:
try:
proxy = URL(proxy)
except ValueError:
raise InvalidURL(proxy)
except ValueError as e:
raise InvalidURL(proxy) from e

if timeout is sentinel:
real_timeout = self._timeout # type: ClientTimeout
Expand Down Expand Up @@ -529,8 +529,8 @@ async def _request(
parsed_url = URL(
r_url, encoded=not self._requote_redirect_url)

except ValueError:
raise InvalidURL(r_url)
except ValueError as e:
raise InvalidURL(r_url) from e

scheme = parsed_url.scheme
if scheme not in ('http', 'https', ''):
Expand Down Expand Up @@ -777,7 +777,7 @@ async def _ws_connect(
resp.history,
message=exc.args[0],
status=resp.status,
headers=resp.headers)
headers=resp.headers) from exc
else:
compress = 0
notakeover = False
Expand Down