merge 3.4 (#23053)

benjaminp · benjaminp · commit 3f8326685973 · 2014-12-15T10:05:13.000-05:00
diff --git a/Lib/test/test_urllib2_localnet.py b/Lib/test/test_urllib2_localnet.py
@@ -551,7 +551,6 @@ def test_https(self):
 
     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)
