diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-07-30 00:32:35 +0000 |
|---|---|---|
| committer | Tarmac <> | 2010-07-30 00:32:35 +0000 |
| commit | 10d79c8ffef8e0c5f42b0dde490acbafa3c1776d (patch) | |
| tree | b4a4189e00459ade3f9342b0ae9702cbeb25fc3b | |
| parent | 73a47dfecf4b1ba66a45421bbd925f3e0db054c5 (diff) | |
| parent | fc433987e6adbca086bd2fa3d416658e9d3f04ba (diff) | |
| download | nova-10d79c8ffef8e0c5f42b0dde490acbafa3c1776d.tar.gz nova-10d79c8ffef8e0c5f42b0dde490acbafa3c1776d.tar.xz nova-10d79c8ffef8e0c5f42b0dde490acbafa3c1776d.zip | |
boto.s3 no longer imports connection, so we need to explicitly import it.
| -rw-r--r-- | nova/auth/signer.py | 4 | ||||
| -rw-r--r-- | nova/endpoint/images.py | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/nova/auth/signer.py b/nova/auth/signer.py index 7d7471575..3b9bc8f2c 100644 --- a/nova/auth/signer.py +++ b/nova/auth/signer.py @@ -34,7 +34,7 @@ # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL- # ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT -# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. @@ -48,7 +48,7 @@ import hashlib import hmac import logging import urllib -import boto.utils +import boto from nova.exception import Error diff --git a/nova/endpoint/images.py b/nova/endpoint/images.py index 12876da30..32f7cc228 100644 --- a/nova/endpoint/images.py +++ b/nova/endpoint/images.py @@ -21,10 +21,8 @@ Proxy AMI-related calls from the cloud controller, to the running objectstore daemon. """ -import boto -import boto.s3 +import boto.s3.connection import json -import random import urllib from nova import flags |