Thanks to visit codestin.com
Credit goes to github.com

Skip to content

asyncio: __del__() keep reference to warnings.warn #11491

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
Jan 10, 2019
Merged

asyncio: __del__() keep reference to warnings.warn #11491

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
ac3452f
asyncio: __del__() keep reference to warnings.warn
vstinner Jan 10, 2019
0961f09
Rename warn parameter to _warn
vstinner Jan 10, 2019
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: 2 additions & 3 deletions Lib/asyncio/base_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,10 +622,9 @@ def is_closed(self):
"""Returns True if the event loop was closed."""
return self._closed

def __del__(self):
def __del__(self, _warn=warnings.warn):
if not self.is_closed():
warnings.warn(f"unclosed event loop {self!r}", ResourceWarning,
source=self)
_warn(f"unclosed event loop {self!r}", ResourceWarning, source=self)
if not self.is_running():
self.close()

Expand Down
5 changes: 2 additions & 3 deletions Lib/asyncio/base_subprocess.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,9 @@ def close(self):

# Don't clear the _proc reference yet: _post_init() may still run

def __del__(self):
def __del__(self, _warn=warnings.warn):
if not self._closed:
warnings.warn(f"unclosed transport {self!r}", ResourceWarning,
source=self)
_warn(f"unclosed transport {self!r}", ResourceWarning, source=self)
self.close()

def get_pid(self):
Expand Down
5 changes: 2 additions & 3 deletions Lib/asyncio/proactor_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,9 @@ def close(self):
self._read_fut.cancel()
self._read_fut = None

def __del__(self):
def __del__(self, _warn=warnings.warn):
if self._sock is not None:
warnings.warn(f"unclosed transport {self!r}", ResourceWarning,
source=self)
_warn(f"unclosed transport {self!r}", ResourceWarning, source=self)
self.close()

def _fatal_error(self, exc, message='Fatal error on pipe transport'):
Expand Down
5 changes: 2 additions & 3 deletions Lib/asyncio/selector_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,10 +658,9 @@ def close(self):
self._loop._remove_writer(self._sock_fd)
self._loop.call_soon(self._call_connection_lost, None)

def __del__(self):
def __del__(self, _warn=warnings.warn):
if self._sock is not None:
warnings.warn(f"unclosed transport {self!r}", ResourceWarning,
source=self)
_warn(f"unclosed transport {self!r}", ResourceWarning, source=self)
self._sock.close()

def _fatal_error(self, exc, message='Fatal error on transport'):
Expand Down
5 changes: 2 additions & 3 deletions Lib/asyncio/sslproto.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,10 +316,9 @@ def close(self):
self._closed = True
self._ssl_protocol._start_shutdown()

def __del__(self):
def __del__(self, _warn=warnings.warn):
if not self._closed:
warnings.warn(f"unclosed transport {self!r}", ResourceWarning,
source=self)
_warn(f"unclosed transport {self!r}", ResourceWarning, source=self)
self.close()

def is_reading(self):
Expand Down
10 changes: 4 additions & 6 deletions Lib/asyncio/unix_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,10 +511,9 @@ def close(self):
if not self._closing:
self._close(None)

def __del__(self):
def __del__(self, _warn=warnings.warn):
if self._pipe is not None:
warnings.warn(f"unclosed transport {self!r}", ResourceWarning,
source=self)
_warn(f"unclosed transport {self!r}", ResourceWarning, source=self)
self._pipe.close()

def _fatal_error(self, exc, message='Fatal error on pipe transport'):
Expand Down Expand Up @@ -707,10 +706,9 @@ def close(self):
# write_eof is all what we needed to close the write pipe
self.write_eof()

def __del__(self):
def __del__(self, _warn=warnings.warn):
if self._pipe is not None:
warnings.warn(f"unclosed transport {self!r}", ResourceWarning,
source=self)
_warn(f"unclosed transport {self!r}", ResourceWarning, source=self)
self._pipe.close()

def abort(self):
Expand Down
5 changes: 2 additions & 3 deletions Lib/asyncio/windows_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,9 @@ def close(self, *, CloseHandle=_winapi.CloseHandle):
CloseHandle(self._handle)
self._handle = None

def __del__(self):
def __del__(self, _warn=warnings.warn):
if self._handle is not None:
warnings.warn(f"unclosed {self!r}", ResourceWarning,
source=self)
_warn(f"unclosed {self!r}", ResourceWarning, source=self)
self.close()

def __enter__(self):
Expand Down