diff options
author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2017-01-11 17:41:28 +0000 |
---|---|---|
committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2017-01-11 17:41:28 +0000 |
commit | 18a41f9ca5f1835f041dcf25d99b3a5195be66fb (patch) | |
tree | 1a63ef0fcfaa8e2fd9ba04db0f2cf18d8abd1df5 /Lib/asyncio/test_utils.py | |
parent | e949ac52e0cb36421bf7712eaba1aadedaa301d1 (diff) | |
parent | 19beb8e093de4933bd572a06fff7b1271e8d71dd (diff) | |
download | cpython-18a41f9ca5f1835f041dcf25d99b3a5195be66fb.tar.gz |
Issue #292Merged fixes from 3.5.
Diffstat (limited to 'Lib/asyncio/test_utils.py')
-rw-r--r-- | Lib/asyncio/test_utils.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/asyncio/test_utils.py b/Lib/asyncio/test_utils.py index 9d32822fa9..99e3839f45 100644 --- a/Lib/asyncio/test_utils.py +++ b/Lib/asyncio/test_utils.py @@ -119,10 +119,10 @@ class SSLWSGIServerMixin: 'test', 'test_asyncio') keyfile = os.path.join(here, 'ssl_key.pem') certfile = os.path.join(here, 'ssl_cert.pem') - ssock = ssl.wrap_socket(request, - keyfile=keyfile, - certfile=certfile, - server_side=True) + context = ssl.SSLContext() + context.load_cert_chain(certfile, keyfile) + + ssock = context.wrap_socket(request, server_side=True) try: self.RequestHandlerClass(ssock, client_address, self) ssock.close() |