Update exception handling.
git-svn-id: https://svn.apache.org/repos/asf/libcloud/branches/py3k@1209975 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/libcloud/common/base.py b/libcloud/common/base.py
index 00a0038..9c53908 100644
--- a/libcloud/common/base.py
+++ b/libcloud/common/base.py
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+import sys
import ssl
import time
@@ -488,10 +489,9 @@
else:
self.connection.request(method=method, url=url, body=data,
headers=headers)
- #except ssl.SSLError, e:
except ssl.SSLError:
- raise ssl.SSLError()
- #raise ssl.SSLError(str(e))
+ e = sys.exc_info()[1]
+ raise ssl.SSLError(str(e))
if raw:
response = self.rawResponseCls(connection=self)
diff --git a/libcloud/compute/base.py b/libcloud/compute/base.py
index b52a230..e6961b0 100644
--- a/libcloud/compute/base.py
+++ b/libcloud/compute/base.py
@@ -17,6 +17,7 @@
Provides base classes for working with drivers
"""
+import sys
import time
import hashlib
import os
@@ -564,9 +565,8 @@
ssh_client=ssh_client,
max_tries=3)
except Exception:
- #except Exception, e:
- #raise DeploymentError(node, e)
- raise DeploymentError(node, None)
+ e = sys.exc_info()[1]
+ raise DeploymentError(node, e)
return node
def _wait_until_running(self, node, wait_period=3, timeout=600):
