summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZackery Spytz <zspytz@gmail.com>2019-08-20 17:52:25 (GMT)
committerMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2019-08-20 17:52:25 (GMT)
commit46a7564578f208df1e0c54fc0520d3b7ca32c981 (patch)
tree49f7597afa53615cda37df0ab9b9651b336d98c3
parent9e66aba99925eebacfe137d9deb0ef1fdbc2d5db (diff)
downloadcpython-46a7564578f208df1e0c54fc0520d3b7ca32c981.zip
cpython-46a7564578f208df1e0c54fc0520d3b7ca32c981.tar.gz
cpython-46a7564578f208df1e0c54fc0520d3b7ca32c981.tar.bz2
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
-rwxr-xr-xLib/smtplib.py2
-rw-r--r--Misc/NEWS.d/next/Library/2019-08-20-05-17-32.bpo-32793.cgpXl6.rst1
2 files changed, 1 insertions, 2 deletions
diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index a634f7a..43a00d9 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 0000000..f715a81
--- /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.