[Python-checkins] [3.6] bpo-35128: Fix spacing issues in warning.warn() messages. (GH-10268). (GH-10281)

Serhiy Storchaka webhook-mailer at python.org
Thu Nov 1 08:19:41 EDT 2018


https://github.com/python/cpython/commit/89138f286938753f273c90547491efe374e617c1
commit: 89138f286938753f273c90547491efe374e617c1
branch: 3.6
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2018-11-01T14:19:37+02:00
summary:

[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 <scorphus at gmail.com>

files:
M Lib/ftplib.py
M Lib/imaplib.py
M Lib/poplib.py
M Lib/smtplib.py

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 @@ def __init__(self, host='', user='', passwd='', acct='', keyfile=None,
                                  "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 @@ def __init__(self, host='', port=IMAP4_SSL_PORT, keyfile=None,
                                  "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 @@ def __init__(self, host, port=POP3_SSL_PORT, keyfile=None, certfile=None,
                                  "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 @@ def starttls(self, keyfile=None, certfile=None, context=None):
                                  "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 @@ def __init__(self, host='', port=0, local_hostname=None,
                                  "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



More information about the Python-checkins mailing list