#7092 - Silence more py3k deprecation warnings, using test_support.check_py3k_warnings() helper.
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index d452317..f299d36 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -805,7 +805,7 @@
if test_support.verbose:
sys.stdout.write(pprint.pformat(cert) + '\n')
sys.stdout.write("Connection cipher is " + str(cipher) + '.\n')
- if not cert.has_key('subject'):
+ if 'subject' not in cert:
raise test_support.TestFailed(
"No subject field in certificate: %s." %
pprint.pformat(cert))
@@ -967,7 +967,8 @@
# now fetch the same data from the HTTPS server
url = 'https://127.0.0.1:%d/%s' % (
server.port, os.path.split(CERTFILE)[1])
- f = urllib.urlopen(url)
+ with test_support.check_py3k_warnings():
+ f = urllib.urlopen(url)
dlen = f.info().getheader("content-length")
if dlen and (int(dlen) > 0):
d2 = f.read(int(dlen))