diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-07-16 11:09:15 -0500 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-07-16 11:09:15 -0500 |
| commit | 63c5ab9806aeb732dc8a8cb7b902592fb5db9363 (patch) | |
| tree | e2b930eeed60476634a14b33588aba3a179a3d09 /nova/cloudpipe | |
| parent | 47b81061d6282c2b8173e9fc1177098d94b5a1bd (diff) | |
| parent | 3ce6ec1a83731da868c5a77c4684808a54ffd8fd (diff) | |
Merge lp:~anotherjesse/nova/remove-vendor
Diffstat (limited to 'nova/cloudpipe')
| -rw-r--r-- | nova/cloudpipe/api.py | 5 | ||||
| -rw-r--r-- | nova/cloudpipe/pipelib.py | 9 |
2 files changed, 7 insertions, 7 deletions
diff --git a/nova/cloudpipe/api.py b/nova/cloudpipe/api.py index 99a0a1d6d..a5f78a16d 100644 --- a/nova/cloudpipe/api.py +++ b/nova/cloudpipe/api.py @@ -21,14 +21,13 @@ Tornado REST API Request Handlers for CloudPipe """ import logging -import urllib - -from nova import vendor import tornado.web +import urllib from nova import crypto from nova.auth import users + _log = logging.getLogger("api") _log.setLevel(logging.DEBUG) diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py index de5326c5e..63f7ae222 100644 --- a/nova/cloudpipe/pipelib.py +++ b/nova/cloudpipe/pipelib.py @@ -22,18 +22,19 @@ an instance with it. """ +import base64 import logging import os import tempfile -import base64 -from zipfile import ZipFile, ZIP_DEFLATED +import zipfile from nova import exception from nova import flags -from nova.auth import users from nova import utils +from nova.auth import users from nova.endpoint import api + FLAGS = flags.FLAGS flags.DEFINE_string('boot_script_template', @@ -52,7 +53,7 @@ class CloudPipe(object): tmpfolder = tempfile.mkdtemp() filename = "payload.zip" zippath = os.path.join(tmpfolder, filename) - z = ZipFile(zippath, "w", ZIP_DEFLATED) + z = zipfile.ZipFile(zippath, "w", zipfile.ZIP_DEFLATED) z.write(FLAGS.boot_script_template,'autorun.sh') z.close() |