Revert "Fix SSL3 error on Ubuntu 12.04"

This reverts commit c19650b00f0c169cdf6372a093425830e11a8771.

diff --git a/requests/packages/urllib3/connectionpool.py b/requests/packages/urllib3/connectionpool.py
index 26f0176..97da544 100644 (file)
--- a/requests/packages/urllib3/connectionpool.py
+++ b/requests/packages/urllib3/connectionpool.py
@@ -96,17 +96,9 @@ class VerifiedHTTPSConnection(HTTPSConnection):
 
         # Wrap socket using verification with the root certs in
         # trusted_root_certs
-        try:
-          self.sock = ssl.wrap_socket(sock, self.key_file, self.cert_file,
-                                      cert_reqs=self.cert_reqs,
-                                      ca_certs=self.ca_certs,
-                                      ssl_version=ssl.PROTOCOL_SSLv3)
-        except ssl.SSLError:
-          self.sock = ssl.wrap_socket(sock, self.key_file, self.cert_file,
-                                      cert_reqs=self.cert_reqs,
-                                      ca_certs=self.ca_certs,
-                                      ssl_version=ssl.PROTOCOL_SSLv23)
-
+        self.sock = ssl.wrap_socket(sock, self.key_file, self.cert_file,
+                                    cert_reqs=self.cert_reqs,
+                                    ca_certs=self.ca_certs)
         if self.ca_certs:
             match_hostname(self.sock.getpeercert(), self.host)