From: Serhiy Storchaka Date: Thu, 1 Nov 2018 12:19:37 +0000 (+0200) Subject: [3.6] bpo-35128: Fix spacing issues in warning.warn() messages. (GH-10268). (GH-10281) X-Git-Tag: v3.6.8rc1~153 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89138f286938753f273c90547491efe374e617c1;p=thirdparty%2FPython%2Fcpython.git [3.6] bpo-35128: Fix spacing issues in warning.warn() messages. (GH-10268). (GH-10281) (cherry picked from commit 4b5e62dbb22a3593e0db266c12f805b727a42b00) Co-authored-by: Pablo Aguiar --- diff --git a/Lib/ftplib.py b/Lib/ftplib.py index a02e595cb022..2ff251a0f7d9 100644 --- a/Lib/ftplib.py +++ b/Lib/ftplib.py @@ -732,7 +732,7 @@ else: "exclusive") if keyfile is not None or certfile is not None: import warnings - warnings.warn("keyfile and certfile are deprecated, use a" + warnings.warn("keyfile and certfile are deprecated, use a " "custom context instead", DeprecationWarning, 2) self.keyfile = keyfile self.certfile = certfile diff --git a/Lib/imaplib.py b/Lib/imaplib.py index b9a01d636f78..67b2cc02c40f 100644 --- a/Lib/imaplib.py +++ b/Lib/imaplib.py @@ -1277,7 +1277,7 @@ if HAVE_SSL: "exclusive") if keyfile is not None or certfile is not None: import warnings - warnings.warn("keyfile and certfile are deprecated, use a" + warnings.warn("keyfile and certfile are deprecated, use a " "custom ssl_context instead", DeprecationWarning, 2) self.keyfile = keyfile self.certfile = certfile diff --git a/Lib/poplib.py b/Lib/poplib.py index d8a62c034327..9796f0d2f9c5 100644 --- a/Lib/poplib.py +++ b/Lib/poplib.py @@ -436,7 +436,7 @@ if HAVE_SSL: "exclusive") if keyfile is not None or certfile is not None: import warnings - warnings.warn("keyfile and certfile are deprecated, use a" + warnings.warn("keyfile and certfile are deprecated, use a " "custom context instead", DeprecationWarning, 2) self.keyfile = keyfile self.certfile = certfile diff --git a/Lib/smtplib.py b/Lib/smtplib.py index 5e1bc0b198ed..6091c7fb7aca 100755 --- a/Lib/smtplib.py +++ b/Lib/smtplib.py @@ -762,7 +762,7 @@ class SMTP: "exclusive") if keyfile is not None or certfile is not None: import warnings - warnings.warn("keyfile and certfile are deprecated, use a" + warnings.warn("keyfile and certfile are deprecated, use a " "custom context instead", DeprecationWarning, 2) if context is None: context = ssl._create_stdlib_context(certfile=certfile, @@ -1019,7 +1019,7 @@ if _have_ssl: "exclusive") if keyfile is not None or certfile is not None: import warnings - warnings.warn("keyfile and certfile are deprecated, use a" + warnings.warn("keyfile and certfile are deprecated, use a " "custom context instead", DeprecationWarning, 2) self.keyfile = keyfile self.certfile = certfile