Skip to content
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

Response context release #1571

Merged
merged 5 commits into from
Feb 1, 2017
Merged

Response context release #1571

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fd9b060
Merge remote-tracking branch 'KeepSafe/master'
thehesiod Dec 6, 2016
f86a899
Merge remote-tracking branch 'KeepSafe/master'
thehesiod Jan 3, 2017
a1ed703
Merge remote-tracking branch 'KeepSafe/master'
thehesiod Jan 31, 2017
476fca8
Merge remote-tracking branch 'KeepSafe/master'
thehesiod Feb 1, 2017
3fb73b2
don't close the connection on exceptions
thehesiod Feb 1, 2017
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
10 changes: 6 additions & 4 deletions aiohttp/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,10 +599,12 @@ class _RequestContextManager(_BaseRequestContextManager):
if PY_35:
@asyncio.coroutine
def __aexit__(self, exc_type, exc, tb):
if exc_type is not None:
self._resp.close()
else:
yield from self._resp.release()
# We're basing behavior on the exception as it can be caused by
# user code unrelated to the status of the connection. If you
# would like to close a connection you must do that
# explicitly. Otherwise connection error handling should kick in
# and close/recycle the connection as required.
yield from self._resp.release()


class _WSRequestContextManager(_BaseRequestContextManager):
Expand Down