mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-23 09:19:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[3.12] gh-131888: fix ResourceWarning in test_ftplib (GH-131889) (#132010)

Browse source 
gh-131888: fix ResourceWarning in test_ftplib (GH-131889)
(cherry picked from commit b0f77c4d25)

Co-authored-by: Thomas Grainger <tagrain@gmail.com>
This commit is contained in:
Miss Islington (bot) 2025-04-02 14:46:40 +02:00 • committed by GitHub
parent b3cf1f27e9
commit e4fe4d9d53
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Lib/test/test_ftplib.py
View file

@ -80,7 +80,7 @@ class DummyDTPHandler(asynchat.async_chat):
# (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):
@ -94,6 +94,9 @@ class DummyDTPHandler(asynchat.async_chat):
def handle_error(self):
default_error_handler()
def shutdown(self):
self.close()
class DummyFTPHandler(asynchat.async_chat):
@ -226,7 +229,7 @@ class DummyFTPHandler(asynchat.async_chat):
def cmd_quit(self, arg):
self.push('221 quit ok')
self.close()
self.shutdown()
def cmd_abor(self, arg):
self.push('226 abor ok')
@ -313,7 +316,7 @@ class DummyFTPServer(asyncore.dispatcher, threading.Thread):
self.handler_instance = self.handler(conn, encoding=self.encoding)
def handle_connect(self):
self.close()
self.shutdown()
handle_read = handle_connect
def writable(self):
@ -425,12 +428,12 @@ if ssl is not None:
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):