diff options
| author | Nick Tarleton <nick@quixey.com> | 2011-04-01 23:30:30 -0700 |
|---|---|---|
| committer | garnaat <mitch@garnaat.com> | 2011-04-02 17:48:59 -0400 |
| commit | 43fead341c2f471e5a652a1b238a159c8314bc4d (patch) | |
| tree | 8d7d39a7b4ed67d8001e4e6f0f0a97be678abe0e | |
| parent | fb54c2100f6cee45ae9ab619dbe3b63a07cf6b7a (diff) | |
| download | boto-43fead341c2f471e5a652a1b238a159c8314bc4d.tar.gz | |
use the right route53 exception module
| -rw-r--r-- | boto/route53/connection.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/boto/route53/connection.py b/boto/route53/connection.py index 18fc1396..05e49f9a 100644 --- a/boto/route53/connection.py +++ b/boto/route53/connection.py @@ -30,7 +30,7 @@ from boto.connection import AWSAuthConnection from boto import handler from boto.resultset import ResultSet import boto.jsonresponse -import boto.exception +import boto.route53.exception import boto.route53.hostedzone HZXML = """<?xml version="1.0" encoding="UTF-8"?> @@ -80,7 +80,7 @@ class Route53Connection(AWSAuthConnection): body = response.read() boto.log.debug(body) if response.status >= 300: - raise boto.exception.DNSServerError(response.status, + raise boto.route53.exception.DNSServerError(response.status, response.reason, body) e = boto.jsonresponse.Element(list_marker='HostedZones', @@ -102,7 +102,7 @@ class Route53Connection(AWSAuthConnection): body = response.read() boto.log.debug(body) if response.status >= 300: - raise boto.exception.DNSServerError(response.status, + raise boto.route53.exception.DNSServerError(response.status, response.reason, body) e = boto.jsonresponse.Element(list_marker='NameServers', @@ -161,7 +161,7 @@ class Route53Connection(AWSAuthConnection): h.parse(body) return e else: - raise boto.exception.DNSServerError(response.status, + raise boto.route53.exception.DNSServerError(response.status, response.reason, body) @@ -171,7 +171,7 @@ class Route53Connection(AWSAuthConnection): body = response.read() boto.log.debug(body) if response.status not in (200, 204): - raise boto.exception.DNSServerError(response.status, + raise boto.route53.exception.DNSServerError(response.status, response.reason, body) e = boto.jsonresponse.Element() @@ -220,7 +220,7 @@ class Route53Connection(AWSAuthConnection): body = response.read() boto.log.debug(body) if response.status >= 300: - raise boto.exception.DNSServerError(response.status, + raise boto.route53.exception.DNSServerError(response.status, response.reason, body) rs = ResourceRecordSets(connection=self, hosted_zone_id=hosted_zone_id) @@ -250,7 +250,7 @@ class Route53Connection(AWSAuthConnection): body = response.read() boto.log.debug(body) if response.status >= 300: - raise boto.exception.DNSServerError(response.status, + raise boto.route53.exception.DNSServerError(response.status, response.reason, body) e = boto.jsonresponse.Element() @@ -276,7 +276,7 @@ class Route53Connection(AWSAuthConnection): body = response.read() boto.log.debug(body) if response.status >= 300: - raise boto.exception.DNSServerError(response.status, + raise boto.route53.exception.DNSServerError(response.status, response.reason, body) e = boto.jsonresponse.Element() |