[Python-checkins] cpython (merge 3.5 -> 3.6): Merge socketserver fixes from 3.5 into 3.6
martin.panter
python-checkins at python.org
Thu Sep 22 06:56:37 EDT 2016
https://hg.python.org/cpython/rev/9929462be9c7
changeset: 104008:9929462be9c7
branch: 3.6
parent: 104007:d1455d14accd
parent: 104006:6c880906b214
user: Martin Panter <vadmium+py at gmail.com>
date: Thu Sep 22 10:33:51 2016 +0000
summary:
Merge socketserver fixes from 3.5 into 3.6
files:
Lib/test/ssl_servers.py | 2 +-
Lib/test/test_ssl.py | 2 +-
Misc/NEWS | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Lib/test/ssl_servers.py b/Lib/test/ssl_servers.py
--- a/Lib/test/ssl_servers.py
+++ b/Lib/test/ssl_servers.py
@@ -16,7 +16,7 @@
HOST = support.HOST
CERTFILE = os.path.join(here, 'keycert.pem')
-# This one's based on HTTPServer, which is based on SocketServer
+# This one's based on HTTPServer, which is based on socketserver
class HTTPSServer(_HTTPServer):
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -2734,7 +2734,7 @@
s.close()
def test_socketserver(self):
- """Using a SocketServer to create and manage SSL connections."""
+ """Using socketserver to create and manage SSL connections."""
server = make_https_server(self, certfile=CERTFILE)
# try to connect
if support.verbose:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -4952,7 +4952,7 @@
- Issue #18643: Add socket.socketpair() on Windows.
-- Issue #22435: Fix a file descriptor leak when SocketServer bind fails.
+- Issue #22435: Fix a file descriptor leak when socketserver bind fails.
- Issue #13096: Fixed segfault in CTypes POINTER handling of large
values.
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list