summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-09-22 09:37:56 +0000
committerMartin Panter <vadmium+py@gmail.com>2016-09-22 09:37:56 +0000
commit463ef2b3cf4ac4555fca7de1e671d179e63909b4 (patch)
treef72315f6460176480bb6d46950e50f22dd5b5c5c
parentbb8b1cb6af830b40f9be398d1e1bf8bdca772140 (diff)
downloadcpython-git-463ef2b3cf4ac4555fca7de1e671d179e63909b4.tar.gz
Fix references to Python 3’s socketserver (lowercase) module
-rw-r--r--Lib/test/ssl_servers.py2
-rw-r--r--Lib/test/test_ssl.py2
-rw-r--r--Misc/NEWS2
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 0f4faa09bd..f162c6eee6 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -2661,7 +2661,7 @@ else:
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
index 4d2fc0a39b..9c00ee5520 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -3494,7 +3494,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.