summaryrefslogtreecommitdiffstats
path: root/nova/cloudpipe
diff options
context:
space:
mode:
authorJesse Andrews <jesse@gigantor.local>2010-07-15 18:13:48 -0500
committerJesse Andrews <jesse@gigantor.local>2010-07-15 18:13:48 -0500
commit3ce6ec1a83731da868c5a77c4684808a54ffd8fd (patch)
tree9d92e81ec74926526841583737169d034c70de3a /nova/cloudpipe
parentc8fdce011092f23efd55385b45db8e6f3886beb1 (diff)
downloadnova-3ce6ec1a83731da868c5a77c4684808a54ffd8fd.tar.gz
nova-3ce6ec1a83731da868c5a77c4684808a54ffd8fd.tar.xz
nova-3ce6ec1a83731da868c5a77c4684808a54ffd8fd.zip
reorder imports spacing
Diffstat (limited to 'nova/cloudpipe')
-rw-r--r--nova/cloudpipe/api.py5
-rw-r--r--nova/cloudpipe/pipelib.py9
2 files changed, 7 insertions, 7 deletions
diff --git a/nova/cloudpipe/api.py b/nova/cloudpipe/api.py
index e071167bb..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
-
-
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()