From 46a7564578f208df1e0c54fc0520d3b7ca32c981 Mon Sep 17 00:00:00 2001 From: Zackery Spytz Date: Tue, 20 Aug 2019 11:52:25 -0600 Subject: [PATCH] bpo-32793: Fix a duplicate debug message in smtplib (GH-15341) _get_socket() already prints a debug message for the host and port. https://bugs.python.org/issue32793 Automerge-Triggered-By: @maxking --- Lib/smtplib.py | 2 -- .../next/Library/2019-08-20-05-17-32.bpo-32793.cgpXl6.rst | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2019-08-20-05-17-32.bpo-32793.cgpXl6.rst diff --git a/Lib/smtplib.py b/Lib/smtplib.py index a634f7ae733..43a00d9a4e3 100755 --- a/Lib/smtplib.py +++ b/Lib/smtplib.py @@ -333,8 +333,6 @@ class SMTP: raise OSError("nonnumeric port") if not port: port = self.default_port - if self.debuglevel > 0: - self._print_debug('connect:', (host, port)) sys.audit("smtplib.connect", self, host, port) self.sock = self._get_socket(host, port, self.timeout) self.file = None diff --git a/Misc/NEWS.d/next/Library/2019-08-20-05-17-32.bpo-32793.cgpXl6.rst b/Misc/NEWS.d/next/Library/2019-08-20-05-17-32.bpo-32793.cgpXl6.rst new file mode 100644 index 00000000000..f715a816efd --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-08-20-05-17-32.bpo-32793.cgpXl6.rst @@ -0,0 +1 @@ +Fix a duplicated debug message when :meth:`smtplib.SMTP.connect` is called.