summaryrefslogtreecommitdiffstats
path: root/bin
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 /bin
parentc8fdce011092f23efd55385b45db8e6f3886beb1 (diff)
reorder imports spacing
Diffstat (limited to 'bin')
-rwxr-xr-xbin/dhcpleasor.py5
-rwxr-xr-xbin/nova-api2
-rwxr-xr-xbin/nova-import-canonical-imagestore2
-rwxr-xr-xbin/nova-instancemonitor2
-rwxr-xr-xbin/nova-manage3
-rwxr-xr-xbin/nova-objectstore2
-rwxr-xr-xbin/nova-rsapi4
-rwxr-xr-xbin/nova-volume2
8 files changed, 6 insertions, 16 deletions
diff --git a/bin/dhcpleasor.py b/bin/dhcpleasor.py
index 31f4433fb..07ff325f1 100755
--- a/bin/dhcpleasor.py
+++ b/bin/dhcpleasor.py
@@ -31,11 +31,10 @@ sys.path.append(os.path.abspath(os.path.join(__file__, "../../")))
logging.debug(sys.path)
import getopt
from os import environ
-from nova.compute import linux_net
-from nova.compute import network
from nova import rpc
-
from nova import flags
+from nova.compute import linux_net
+from nova.compute import network
FLAGS = flags.FLAGS
diff --git a/bin/nova-api b/bin/nova-api
index ae274abf6..26f5dbc87 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -22,8 +22,6 @@ Tornado daemon for the main API endpoint.
"""
import logging
-
-
from tornado import httpserver
from tornado import ioloop
diff --git a/bin/nova-import-canonical-imagestore b/bin/nova-import-canonical-imagestore
index 82daf61ce..2e79f09b7 100755
--- a/bin/nova-import-canonical-imagestore
+++ b/bin/nova-import-canonical-imagestore
@@ -29,9 +29,9 @@ import subprocess
import sys
import urllib2
-from nova.objectstore import image
from nova import flags
from nova import utils
+from nova.objectstore import image
FLAGS = flags.FLAGS
diff --git a/bin/nova-instancemonitor b/bin/nova-instancemonitor
index d2ed82c9f..b195089b7 100755
--- a/bin/nova-instancemonitor
+++ b/bin/nova-instancemonitor
@@ -22,8 +22,6 @@
"""
import logging
-
-
from twisted.internet import task
from twisted.application import service
diff --git a/bin/nova-manage b/bin/nova-manage
index 5693a40f6..56f89ce30 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -23,6 +23,7 @@
"""
import sys
+import time
from nova import flags
from nova import utils
@@ -31,7 +32,7 @@ from nova.compute import model
from nova.compute import network
from nova.cloudpipe import pipelib
from nova.endpoint import cloud
-import time
+
FLAGS = flags.FLAGS
diff --git a/bin/nova-objectstore b/bin/nova-objectstore
index 8ae80707e..521f3d5d1 100755
--- a/bin/nova-objectstore
+++ b/bin/nova-objectstore
@@ -22,8 +22,6 @@
"""
import logging
-
-
from tornado import httpserver
from tornado import ioloop
diff --git a/bin/nova-rsapi b/bin/nova-rsapi
index cca5b3048..5cbe2d8c1 100755
--- a/bin/nova-rsapi
+++ b/bin/nova-rsapi
@@ -21,10 +21,8 @@
"""
import logging
-from wsgiref import simple_server
-
-
from tornado import ioloop
+from wsgiref import simple_server
from nova import flags
from nova import rpc
diff --git a/bin/nova-volume b/bin/nova-volume
index 8296eb1d8..df9fb5c7a 100755
--- a/bin/nova-volume
+++ b/bin/nova-volume
@@ -22,8 +22,6 @@
"""
import logging
-
-
from tornado import ioloop
from nova import flags