THRIFT-1773. Revert "Thrift-1604:Python exxception handeling for changes from PEP3110"
This reverts commit 6c5ee6ad2067e245ab5364f9a6019d8b63d7ed52.
This commit is being reverted since it broke compatibility with
Python 2.4, which is the latest version included in RHEL5 releases.
diff --git a/lib/py/src/transport/TSSLSocket.py b/lib/py/src/transport/TSSLSocket.py
index 7bf28aa..0ab1502 100644
--- a/lib/py/src/transport/TSSLSocket.py
+++ b/lib/py/src/transport/TSSLSocket.py
@@ -86,13 +86,13 @@
self.handle.settimeout(self._timeout)
try:
self.handle.connect(ip_port)
- except socket.error as e:
+ except socket.error, e:
if res is not res0[-1]:
continue
else:
raise e
break
- except socket.error as e:
+ except socket.error, e:
if self._unix_socket:
message = 'Could not connect to secure socket %s: %s' \
% (self._unix_socket, e)
@@ -189,7 +189,7 @@
try:
client = ssl.wrap_socket(plain_client, certfile=self.certfile,
server_side=True, ssl_version=self.SSL_VERSION)
- except ssl.SSLError as ssl_exc:
+ except ssl.SSLError, ssl_exc:
# failed handshake/ssl wrap, close socket to client
plain_client.close()
# raise ssl_exc