diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-08-02 19:56:05 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-08-02 19:56:05 (GMT) |
| commit | a65e2afe804743332b37234d66c7fe0789da760d (patch) | |
| tree | 40668ea69e19b7780617ffb21a986bc3a2aebdfe /Lib/test/test_ssl.py | |
| parent | edabc7bca29766539bfbaa2e25aac8fdc79bdb60 (diff) | |
| download | cpython-a65e2afe804743332b37234d66c7fe0789da760d.zip cpython-a65e2afe804743332b37234d66c7fe0789da760d.tar.gz cpython-a65e2afe804743332b37234d66c7fe0789da760d.tar.bz2 | |
Merged revisions 79165 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79165 | florent.xicluna | 2010-03-21 03:14:24 +0200 (Sun, 21 Mar 2010) | 2 lines
#7092 - Silence more py3k deprecation warnings, using test_support.check_py3k_warnings() helper.
........
Diffstat (limited to 'Lib/test/test_ssl.py')
| -rw-r--r-- | Lib/test/test_ssl.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 6d49994..c1e53ec 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -975,7 +975,8 @@ 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]) - 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)) |