diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2015-04-10 10:29:28 (GMT) |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2015-04-10 10:29:28 (GMT) |
commit | 2116b12da59f77358cc539b90f58a3cdea43c2fd (patch) | |
tree | 693d26652b1dbf8b2ac058c5725f9726c3d14a0b /Lib/telnetlib.py | |
parent | fcbf8f3e3d46eb023dd9a3954c6f9ed9a533d427 (diff) | |
parent | 7e7a3dba5fd4262269f713dfe21ba7e4746fc2dd (diff) | |
download | cpython-2116b12da59f77358cc539b90f58a3cdea43c2fd.zip cpython-2116b12da59f77358cc539b90f58a3cdea43c2fd.tar.gz cpython-2116b12da59f77358cc539b90f58a3cdea43c2fd.tar.bz2 |
Issue #23865: close() methods in multiple modules now are idempotent and more
robust at shutdown. If needs to release multiple resources, they are released
even if errors are occured.
Diffstat (limited to 'Lib/telnetlib.py')
-rw-r--r-- | Lib/telnetlib.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Lib/telnetlib.py b/Lib/telnetlib.py index eebb952..72dabc7 100644 --- a/Lib/telnetlib.py +++ b/Lib/telnetlib.py @@ -261,12 +261,13 @@ class Telnet: def close(self): """Close the connection.""" - if self.sock: - self.sock.close() - self.sock = 0 - self.eof = 1 + sock = self.sock + self.sock = None + self.eof = True self.iacseq = b'' self.sb = 0 + if sock: + sock.close() def get_socket(self): """Return the socket object used internally.""" |