diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-09-22 10:33:51 +0000 |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-09-22 10:33:51 +0000 |
| commit | 3217b1243e03f93ceefa273f6d9941332750cc60 (patch) | |
| tree | 23706197ab67f4f82706aed7025845929c46a1cc | |
| parent | f3b0639417bf788d9a7133ec26e52c406e6c8f4c (diff) | |
| parent | 463ef2b3cf4ac4555fca7de1e671d179e63909b4 (diff) | |
| download | cpython-git-3217b1243e03f93ceefa273f6d9941332750cc60.tar.gz | |
Merge socketserver fixes from 3.5 into 3.6
| -rw-r--r-- | Lib/test/ssl_servers.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_ssl.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Lib/test/ssl_servers.py b/Lib/test/ssl_servers.py index f9d30cf0bd..b99ea45972 100644 --- a/Lib/test/ssl_servers.py +++ b/Lib/test/ssl_servers.py @@ -16,7 +16,7 @@ here = os.path.dirname(__file__) 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 index 46ec8223e8..1905df0f43 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -2734,7 +2734,7 @@ if _have_threads: 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: @@ -4952,7 +4952,7 @@ Library - 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. |