merge 3.4 (#23053)

2014-12-15 10:05:13 -05:00 · 2014-12-15 10:05:13 -05:00 · 8d33598e5d
parent 65ee4674e2 4c11c92578
commit 8d33598e5d
1 changed files with 0 additions and 1 deletions
--- a/Lib/test/test_urllib2_localnet.py
+++ b/Lib/test/test_urllib2_localnet.py
@ -551,7 +551,6 @@ class TestUrlopen(unittest.TestCase):

    def test_https_with_cafile(self):
        handler = self.start_https_server(certfile=CERT_localhost)
-        import ssl
        # Good cert
        data = self.urlopen("https://localhost:%s/bizarre" % handler.port,
                            cafile=CERT_localhost)