diff options
| author | Senthil Kumaran <orsenthil@gmail.com> | 2010-01-08 19:04:16 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <orsenthil@gmail.com> | 2010-01-08 19:04:16 (GMT) |
| commit | ce8e33a095030e7af94f58f9da196b240bdf0476 (patch) | |
| tree | b0ba50cbb6e85c6be6f6e6a870e4232be50a0f9c /Lib/test/test_ssl.py | |
| parent | 3ddc435af6873c6304058d7bcbcb19ee4fba7781 (diff) | |
| download | cpython-ce8e33a095030e7af94f58f9da196b240bdf0476.zip cpython-ce8e33a095030e7af94f58f9da196b240bdf0476.tar.gz cpython-ce8e33a095030e7af94f58f9da196b240bdf0476.tar.bz2 | |
Reverting the Revision: 77368. I committed Flox's big patch for tests by
mistake. ( It may come in for sure tough)
Diffstat (limited to 'Lib/test/test_ssl.py')
| -rw-r--r-- | Lib/test/test_ssl.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 4ba2e2a..5aca135 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -808,7 +808,7 @@ else: if test_support.verbose: sys.stdout.write(pprint.pformat(cert) + '\n') sys.stdout.write("Connection cipher is " + str(cipher) + '.\n') - if 'subject' not in cert: + if not cert.has_key('subject'): raise test_support.TestFailed( "No subject field in certificate: %s." % pprint.pformat(cert)) @@ -970,9 +970,7 @@ else: # now fetch the same data from the HTTPS server url = 'https://127.0.0.1:%d/%s' % ( server.port, os.path.split(CERTFILE)[1]) - # Silence Py3k warning - with test_support.check_warnings(): - f = urllib.urlopen(url) + f = urllib.urlopen(url) dlen = f.info().getheader("content-length") if dlen and (int(dlen) > 0): d2 = f.read(int(dlen)) |