You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by an...@apache.org on 2016/03/21 11:23:11 UTC
[02/17] libcloud git commit: fixes except syntax to suppot python3
fixes except syntax to suppot python3
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/36b10f4b
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/36b10f4b
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/36b10f4b
Branch: refs/heads/trunk
Commit: 36b10f4bf9da0caa1d5fae033b38f898219e6645
Parents: 74e2bf7
Author: lostbird <lostbird@lostbird.(none)>
Authored: Wed Mar 16 01:28:55 2016 +0100
Committer: anthony-shaw <an...@gmail.com>
Committed: Mon Mar 21 21:20:31 2016 +1100
----------------------------------------------------------------------
libcloud/dns/drivers/nsone.py | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/36b10f4b/libcloud/dns/drivers/nsone.py
----------------------------------------------------------------------
diff --git a/libcloud/dns/drivers/nsone.py b/libcloud/dns/drivers/nsone.py
index 77442f2..06297e6 100644
--- a/libcloud/dns/drivers/nsone.py
+++ b/libcloud/dns/drivers/nsone.py
@@ -1,3 +1,4 @@
+import sys
try:
import simplejson as json
except ImportError:
@@ -56,7 +57,8 @@ class NsOneDNSDriver(DNSDriver):
action = '/v1/zones/%s' % zone_id
try:
response = self.connection.request(action=action, method='GET')
- except NsOneException, e:
+ except NsOneException:
+ e = sys.exc_info()[1]
if e.message == 'zone not found':
raise ZoneDoesNotExistError(value=e.message, driver=self,
zone_id=zone_id)
@@ -92,7 +94,8 @@ class NsOneDNSDriver(DNSDriver):
try:
response = self.connection.request(action=action, method='PUT',
data=post_data)
- except NsOneException, e:
+ except NsOneException:
+ e = sys.exc_info()[1]
if e.message == 'zone already exists':
raise ZoneAlreadyExistsError(value=e.message, driver=self,
zone_id=domain)
@@ -117,7 +120,8 @@ class NsOneDNSDriver(DNSDriver):
"""
try:
response = self.connection.request(action=action, method='DELETE')
- except NsOneException, e:
+ except NsOneException:
+ e = sys.exc_info()[1]
if e.message == 'zone not found':
raise ZoneDoesNotExistError(value=e.message, driver=self,
zone_id=zone.id)
@@ -136,7 +140,8 @@ class NsOneDNSDriver(DNSDriver):
action = '/v1/zones/%s' % zone.domain
try:
response = self.connection.request(action=action, method='GET')
- except NsOneException, e:
+ except NsOneException:
+ e = sys.exc_info()[1]
if e.message == 'zone not found':
raise ZoneDoesNotExistError(value=e.message, driver=self,
zone_id=zone.id)
@@ -160,7 +165,8 @@ class NsOneDNSDriver(DNSDriver):
action = '/v1/zones/%s/%s/%s' % (zone_id, zone_id, record_id)
try:
response = self.connection.request(action=action, method='GET')
- except NsOneException, e:
+ except NsOneException:
+ e = sys.exc_info()[1]
if e.message == 'record not found':
raise RecordDoesNotExistError(value=e.message, driver=self,
record_id=record_id)
@@ -182,7 +188,8 @@ class NsOneDNSDriver(DNSDriver):
record.type)
try:
response = self.connection.request(action=action, method='DELETE')
- except NsOneException, e:
+ except NsOneException:
+ e = sys.exc_info()[1]
if e.message == 'record not found':
raise RecordDoesNotExistError(value=e.message, driver=self,
record_id=record.id)
@@ -224,7 +231,8 @@ class NsOneDNSDriver(DNSDriver):
try:
response = self.connection.request(action=action, method='PUT',
data=post_data)
- except NsOneException, e:
+ except NsOneException:
+ e = sys.exc_info()[1]
if e.message == 'record already exists':
raise RecordAlreadyExistsError(value=e.message, driver=self,
record_id='')
@@ -265,7 +273,8 @@ class NsOneDNSDriver(DNSDriver):
try:
response = self.connection.request(action=action, data=post_data,
method='POST')
- except NsOneException, e:
+ except NsOneException:
+ e = sys.exc_info()[1]
if e.message == 'record does not exist':
raise RecordDoesNotExistError(value=e.message, driver=self,
id=record.id)