diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-11-24 02:38:13 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-11-24 02:38:13 (GMT) |
| commit | 6c22e65773c94ff810bd7adbb43c2b52e269598a (patch) | |
| tree | 30307d736adb065bbe175560f7d6f8528d552673 /Lib/test/test_logging.py | |
| parent | 83711e9bdf47d020d44997b74e1d24995130b992 (diff) | |
| parent | 43052a14c1412893ae76253f1323a41769d09b07 (diff) | |
| download | cpython-6c22e65773c94ff810bd7adbb43c2b52e269598a.zip cpython-6c22e65773c94ff810bd7adbb43c2b52e269598a.tar.gz cpython-6c22e65773c94ff810bd7adbb43c2b52e269598a.tar.bz2 | |
merge 3.4 (#22788)
Diffstat (limited to 'Lib/test/test_logging.py')
| -rw-r--r-- | Lib/test/test_logging.py | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py index c875e55..99b32c9 100644 --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -1663,21 +1663,11 @@ class HTTPHandlerTest(BaseTest): localhost_cert = os.path.join(here, "keycert.pem") sslctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) sslctx.load_cert_chain(localhost_cert) - # Unfortunately, HTTPHandler doesn't allow us to change the - # SSLContext used by HTTPSConnection, so we have to - # monkeypatch. This can be cleaned up if issue 22788 is - # fixed. - old = ssl._create_default_https_context - def restore_handler(): - ssl._create_default_https_context = old - self.addCleanup(restore_handler) - def hack_create_ctx(): - ctx = old() - ctx.load_verify_locations(localhost_cert) - return ctx - ssl._create_default_https_context = hack_create_ctx + + context = ssl.create_default_context(cafile=localhost_cert) else: sslctx = None + context = None self.server = server = TestHTTPServer(addr, self.handle_request, 0.01, sslctx=sslctx) server.start() @@ -1685,7 +1675,8 @@ class HTTPHandlerTest(BaseTest): host = 'localhost:%d' % server.server_port secure_client = secure and sslctx self.h_hdlr = logging.handlers.HTTPHandler(host, '/frob', - secure=secure_client) + secure=secure_client, + context=context) self.log_data = None root_logger.addHandler(self.h_hdlr) |