https://github.com/python/cpython/commit/b0f77c4d250789fd1deaab4912919e2e6b89e583
commit: b0f77c4d250789fd1deaab4912919e2e6b89e583
branch: main
author: Thomas Grainger <[email protected]>
committer: vstinner <[email protected]>
date: 2025-04-02T14:30:19+02:00
summary:
gh-131888: fix ResourceWarning in test_ftplib (#131889)
files:
M Lib/test/test_ftplib.py
diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py
index bed0e6d973b8da..c864d401f9ed67 100644
--- a/Lib/test/test_ftplib.py
+++ b/Lib/test/test_ftplib.py
@@ -81,7 +81,7 @@ def handle_close(self):
# (behaviour witnessed with test_data_connection)
if not self.dtp_conn_closed:
self.baseclass.push('226 transfer complete')
- self.close()
+ self.shutdown()
self.dtp_conn_closed = True
def push(self, what):
@@ -95,6 +95,9 @@ def push(self, what):
def handle_error(self):
default_error_handler()
+ def shutdown(self):
+ self.close()
+
class DummyFTPHandler(asynchat.async_chat):
@@ -227,7 +230,7 @@ def cmd_type(self, arg):
def cmd_quit(self, arg):
self.push('221 quit ok')
- self.close()
+ self.shutdown()
def cmd_abor(self, arg):
self.push('226 abor ok')
@@ -314,7 +317,7 @@ def handle_accepted(self, conn, addr):
self.handler_instance = self.handler(conn, encoding=self.encoding)
def handle_connect(self):
- self.close()
+ self.shutdown()
handle_read = handle_connect
def writable(self):
@@ -426,12 +429,12 @@ def recv(self, buffer_size):
def handle_error(self):
default_error_handler()
- def close(self):
+ def shutdown(self):
if (isinstance(self.socket, ssl.SSLSocket) and
self.socket._sslobj is not None):
self._do_ssl_shutdown()
else:
- super(SSLConnection, self).close()
+ self.close()
class DummyTLS_DTPHandler(SSLConnection, DummyDTPHandler):
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
