commit 8d33598e5dd021aaac4f155ab319bad3ba4e1eef
author Benjamin Peterson <benjamin@python.org> Mon Dec 15 10:05:13 2014 -0500
committer Benjamin Peterson <benjamin@python.org> Mon Dec 15 10:05:13 2014 -0500
tree 9228bc46f8a872e48f1729dd4868ee1db19d555c
parent 65ee4674e290ba893509f51f192dd1c9aa3a0422
parent 4c11c92578c32f218f8840ab56c4cc8df9923172

merge 3.4 (#23053)

Lib/test/test_urllib2_localnet.py

diff --git a/Lib/test/test_urllib2_localnet.py b/Lib/test/test_urllib2_localnet.py
index e17b225..0650aa2 100644
--- a/Lib/test/test_urllib2_localnet.py
+++ b/Lib/test/test_urllib2_localnet.py
@@ -551,7 +551,6 @@
 
     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)