diff options
| author | Nick Tarleton <nick@quixey.com> | 2011-04-01 23:07:16 -0700 |
|---|---|---|
| committer | garnaat <mitch@garnaat.com> | 2011-04-02 17:48:59 -0400 |
| commit | c6d6943fbd86598e31ae06d884a22ae95cc577e3 (patch) | |
| tree | 521ae19a45d23eba967367f0635a670ee9a2661c | |
| parent | 37ec52e890aa6c1cb2ae2d1d7a3163f3d1eebc9e (diff) | |
| download | boto-c6d6943fbd86598e31ae06d884a22ae95cc577e3.tar.gz | |
fix route53 imports
| -rw-r--r-- | boto/route53/connection.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/boto/route53/connection.py b/boto/route53/connection.py index bbd218ca..18fc1396 100644 --- a/boto/route53/connection.py +++ b/boto/route53/connection.py @@ -30,8 +30,8 @@ from boto.connection import AWSAuthConnection from boto import handler from boto.resultset import ResultSet import boto.jsonresponse -import exception -import hostedzone +import boto.exception +import boto.route53.hostedzone HZXML = """<?xml version="1.0" encoding="UTF-8"?> <CreateHostedZoneRequest xmlns="%(xmlns)s"> @@ -63,7 +63,7 @@ class Route53Connection(AWSAuthConnection): def make_request(self, action, path, headers=None, data='', params=None): if params: pairs = [] - for key, val in params.iteritems(): + for key, val in params.items(): if val is None: continue pairs.append(key + '=' + urllib.quote(str(val))) path += '?' + '&'.join(pairs) @@ -80,7 +80,7 @@ class Route53Connection(AWSAuthConnection): body = response.read() boto.log.debug(body) if response.status >= 300: - raise exception.DNSServerError(response.status, + raise boto.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 exception.DNSServerError(response.status, + raise boto.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 exception.DNSServerError(response.status, + raise boto.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 exception.DNSServerError(response.status, + raise boto.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 exception.DNSServerError(response.status, + raise boto.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 exception.DNSServerError(response.status, + raise boto.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 exception.DNSServerError(response.status, + raise boto.exception.DNSServerError(response.status, response.reason, body) e = boto.jsonresponse.Element() |