From 3ce6ec1a83731da868c5a77c4684808a54ffd8fd Mon Sep 17 00:00:00 2001 From: Jesse Andrews Date: Thu, 15 Jul 2010 18:13:48 -0500 Subject: [PATCH] reorder imports spacing --- HACKING | 1 - bin/dhcpleasor.py | 5 ++--- bin/nova-api | 2 -- bin/nova-import-canonical-imagestore | 2 +- bin/nova-instancemonitor | 2 -- bin/nova-manage | 3 ++- bin/nova-objectstore | 2 -- bin/nova-rsapi | 4 +--- bin/nova-volume | 2 -- nova/adminclient.py | 2 -- nova/auth/signer.py | 5 +++-- nova/auth/users.py | 3 --- nova/cloudpipe/api.py | 5 ++--- nova/cloudpipe/pipelib.py | 9 +++++---- nova/compute/disk.py | 3 +-- nova/compute/exception.py | 1 + nova/compute/linux_net.py | 3 ++- nova/compute/model.py | 2 -- nova/compute/monitor.py | 14 +++++++------- nova/compute/network.py | 11 ++++------- nova/compute/node.py | 6 +++--- nova/crypto.py | 4 +--- nova/datastore.py | 2 -- nova/endpoint/api.py | 9 ++++----- nova/endpoint/cloud.py | 5 ++--- nova/endpoint/images.py | 7 +++---- nova/endpoint/rackspace.py | 6 ++---- nova/exception.py | 2 +- nova/fakerabbit.py | 3 +-- nova/objectstore/bucket.py | 3 ++- nova/objectstore/handler.py | 5 +---- nova/objectstore/stored.py | 5 +++-- nova/process.py | 2 -- nova/rpc.py | 6 ++---- nova/server.py | 6 ++---- nova/test.py | 6 ++---- nova/tests/access_unittest.py | 5 +++-- nova/tests/api_integration.py | 3 ++- nova/tests/api_unittest.py | 6 ++---- nova/tests/cloud_unittest.py | 6 ++---- nova/tests/future_unittest.py | 8 +++----- nova/tests/model_unittest.py | 2 -- nova/tests/network_unittest.py | 4 +--- nova/tests/node_unittest.py | 6 ++---- nova/tests/objectstore_unittest.py | 4 +--- nova/tests/process_unittest.py | 4 +--- nova/tests/users_unittest.py | 4 +--- nova/tests/validator_unittest.py | 2 -- nova/twistd.py | 7 +++---- nova/utils.py | 2 +- nova/volume/storage.py | 4 +--- 51 files changed, 83 insertions(+), 142 deletions(-) diff --git a/HACKING b/HACKING index 325ae9198a14..3af2381bfb83 100644 --- a/HACKING +++ b/HACKING @@ -16,7 +16,6 @@ Imports # vim: tabstop=4 shiftwidth=4 softtabstop=4 {{stdlib imports in human alphabetical order}} \n - \n {{nova imports in human alphabetical order}} \n \n diff --git a/bin/dhcpleasor.py b/bin/dhcpleasor.py index 31f4433fb3fe..07ff325f1655 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 import rpc +from nova import flags from nova.compute import linux_net from nova.compute import network -from nova import rpc - -from nova import flags FLAGS = flags.FLAGS diff --git a/bin/nova-api b/bin/nova-api index ae274abf63a1..26f5dbc8772d 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 82daf61ce654..2e79f09b7019 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 d2ed82c9f7f7..b195089b74fc 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 5693a40f6a31..56f89ce30f13 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 8ae80707e43f..521f3d5d1175 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 cca5b3048c86..5cbe2d8c11f3 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 8296eb1d8b0a..df9fb5c7ac95 100755 --- a/bin/nova-volume +++ b/bin/nova-volume @@ -22,8 +22,6 @@ """ import logging - - from tornado import ioloop from nova import flags diff --git a/nova/adminclient.py b/nova/adminclient.py index 42297faf3a48..db392feb17f9 100644 --- a/nova/adminclient.py +++ b/nova/adminclient.py @@ -20,8 +20,6 @@ Nova User API client library. """ import base64 - - import boto from boto.ec2.regioninfo import RegionInfo diff --git a/nova/auth/signer.py b/nova/auth/signer.py index a3d3c5329a44..83831bfac1e1 100644 --- a/nova/auth/signer.py +++ b/nova/auth/signer.py @@ -43,11 +43,12 @@ Utility class for parsing signed AMI manifests. """ -import logging +import base64 import hashlib import hmac +import logging import urllib -import base64 + from nova.exception import Error class Signer(object): diff --git a/nova/auth/users.py b/nova/auth/users.py index 72edcc2aa464..2c153c788a3f 100644 --- a/nova/auth/users.py +++ b/nova/auth/users.py @@ -26,7 +26,6 @@ import os import shutil import signer import string -from string import Template import tempfile import uuid import zipfile @@ -44,8 +43,6 @@ from nova import exception from nova import flags from nova import crypto from nova import utils - - from nova import objectstore # for flags FLAGS = flags.FLAGS diff --git a/nova/cloudpipe/api.py b/nova/cloudpipe/api.py index e071167bb411..a5f78a16d9ec 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 de5326c5e0be..63f7ae222362 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() diff --git a/nova/compute/disk.py b/nova/compute/disk.py index b476987bb092..08a22556e574 100644 --- a/nova/compute/disk.py +++ b/nova/compute/disk.py @@ -24,12 +24,11 @@ Includes injection of SSH PGP keys into authorized_keys file. import logging import os import tempfile - - from twisted.internet import defer from nova import exception + @defer.inlineCallbacks def partition(infile, outfile, local_bytes=0, local_type='ext2', execute=None): """Takes a single partition represented by infile and writes a bootable diff --git a/nova/compute/exception.py b/nova/compute/exception.py index fefa7451daff..13e4f0a51670 100644 --- a/nova/compute/exception.py +++ b/nova/compute/exception.py @@ -22,6 +22,7 @@ Exceptions for Compute Node errors, mostly network addressing. from nova.exception import Error + class NoMoreAddresses(Error): pass diff --git a/nova/compute/linux_net.py b/nova/compute/linux_net.py index 358f184af965..7b6ae693a6ae 100644 --- a/nova/compute/linux_net.py +++ b/nova/compute/linux_net.py @@ -19,11 +19,12 @@ import logging import signal import os -import nova.utils import subprocess # todo(ja): does the definition of network_path belong here? +from nova import utils + from nova import flags FLAGS=flags.FLAGS diff --git a/nova/compute/model.py b/nova/compute/model.py index 2d8a036a52a0..cda188183b2c 100644 --- a/nova/compute/model.py +++ b/nova/compute/model.py @@ -42,8 +42,6 @@ True import logging import time - - import redis from nova import datastore diff --git a/nova/compute/monitor.py b/nova/compute/monitor.py index 64852838de83..fdc86b031cff 100644 --- a/nova/compute/monitor.py +++ b/nova/compute/monitor.py @@ -24,11 +24,18 @@ Instance Monitoring: in the object store. """ +import boto +import boto.s3 import datetime +import libxml2 import logging import os +import rrdtool import sys import time +from twisted.internet import defer +from twisted.internet import task +from twisted.application import service try: import libvirt @@ -37,13 +44,6 @@ except Exception, err: from nova import flags -import boto -import boto.s3 -import libxml2 -import rrdtool -from twisted.internet import defer -from twisted.internet import task -from twisted.application import service FLAGS = flags.FLAGS flags.DEFINE_integer( diff --git a/nova/compute/network.py b/nova/compute/network.py index faac74e54f39..1a8bc4ca1d4c 100644 --- a/nova/compute/network.py +++ b/nova/compute/network.py @@ -20,22 +20,19 @@ Classes for network control, including VLANs, DHCP, and IP allocation. """ +import IPy import logging import os import time -# TODO(termie): clean up these imports - -import IPy - from nova import datastore +from nova import exception from nova import flags from nova import utils -from nova import exception -from nova.compute import exception as compute_exception from nova.auth import users +from nova.compute import exception as compute_exception +from nova.compute import linux_net -import linux_net FLAGS = flags.FLAGS flags.DEFINE_string('networks_path', utils.abspath('../networks'), diff --git a/nova/compute/node.py b/nova/compute/node.py index 488e8870f794..d681ec66116b 100644 --- a/nova/compute/node.py +++ b/nova/compute/node.py @@ -30,12 +30,11 @@ import logging import os import shutil import sys - - from twisted.internet import defer from twisted.internet import task from twisted.application import service + try: import libvirt except Exception, err: @@ -49,8 +48,9 @@ from nova import utils from nova.compute import disk from nova.compute import model from nova.compute import network -from nova.volume import storage from nova.objectstore import image # for image_path flag +from nova.volume import storage + FLAGS = flags.FLAGS flags.DEFINE_string('libvirt_xml_template', diff --git a/nova/crypto.py b/nova/crypto.py index f6e9717d0af3..cc84f5e45cce 100644 --- a/nova/crypto.py +++ b/nova/crypto.py @@ -24,6 +24,7 @@ SSH keypairs and x509 certificates. import base64 import hashlib import logging +import M2Crypto import os import shutil import struct @@ -31,9 +32,6 @@ import tempfile import time import utils - -import M2Crypto - from nova import exception from nova import flags diff --git a/nova/datastore.py b/nova/datastore.py index ab6da7043cb3..dae78f50c652 100644 --- a/nova/datastore.py +++ b/nova/datastore.py @@ -24,8 +24,6 @@ before trying to run this. """ import logging - - import redis from nova import exception diff --git a/nova/endpoint/api.py b/nova/endpoint/api.py index 2046d01ae9f8..79a2aaddbdbc 100755 --- a/nova/endpoint/api.py +++ b/nova/endpoint/api.py @@ -25,21 +25,20 @@ import logging import multiprocessing import random import re +import tornado.web +from twisted.internet import defer import urllib # TODO(termie): replace minidom with etree from xml.dom import minidom - -import tornado.web -from twisted.internet import defer - from nova import crypto from nova import exception from nova import flags from nova import utils -from nova.endpoint import cloud from nova.auth import users import nova.cloudpipe.api +from nova.endpoint import cloud + FLAGS = flags.FLAGS flags.DEFINE_integer('cc_port', 8773, 'cloud controller port') diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py index 97f31349c08d..3b7b4804b2e6 100644 --- a/nova/endpoint/cloud.py +++ b/nova/endpoint/cloud.py @@ -27,15 +27,13 @@ import json import logging import os import time - - from twisted.internet import defer from nova import datastore +from nova import exception from nova import flags from nova import rpc from nova import utils -from nova import exception from nova.auth import rbac from nova.auth import users from nova.compute import model @@ -44,6 +42,7 @@ from nova.compute import node from nova.endpoint import images from nova.volume import storage + FLAGS = flags.FLAGS flags.DEFINE_string('cloud_topic', 'cloud', 'the topic clouds listen on') diff --git a/nova/endpoint/images.py b/nova/endpoint/images.py index 34da907cba89..40234d7088ba 100644 --- a/nova/endpoint/images.py +++ b/nova/endpoint/images.py @@ -21,17 +21,16 @@ Proxy AMI-related calls from the cloud controller, to the running objectstore daemon. """ +import boto +import boto.s3 import json import random import urllib - -import boto -import boto.s3 - from nova import flags from nova import utils + FLAGS = flags.FLAGS def modify(context, image_id, operation): diff --git a/nova/endpoint/rackspace.py b/nova/endpoint/rackspace.py index 18cb201a756a..9208ddab7658 100644 --- a/nova/endpoint/rackspace.py +++ b/nova/endpoint/rackspace.py @@ -26,21 +26,19 @@ import logging import multiprocessing import os import time - - import tornado.web from twisted.internet import defer from nova import datastore +from nova import exception from nova import flags from nova import rpc from nova import utils -from nova import exception from nova.auth import users from nova.compute import model from nova.compute import network -from nova.endpoint import wsgi from nova.endpoint import images +from nova.endpoint import wsgi from nova.volume import storage diff --git a/nova/exception.py b/nova/exception.py index 09d894e4b39d..bda002d1e442 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -22,8 +22,8 @@ Nova-type exceptions. SHOULD include dedicated exception logging. """ import logging -import traceback import sys +import traceback class Error(Exception): def __init__(self, message=None): diff --git a/nova/fakerabbit.py b/nova/fakerabbit.py index 00eb183272b0..689194513cde 100644 --- a/nova/fakerabbit.py +++ b/nova/fakerabbit.py @@ -18,11 +18,10 @@ """ Based a bit on the carrot.backeds.queue backend... but a lot better """ +from carrot.backends import base import logging import Queue as queue -from carrot.backends import base - class Message(base.BaseMessage): pass diff --git a/nova/objectstore/bucket.py b/nova/objectstore/bucket.py index 61feb4a4c3a3..090ef4e61c39 100644 --- a/nova/objectstore/bucket.py +++ b/nova/objectstore/bucket.py @@ -20,17 +20,18 @@ Simple object store using Blobs and JSON files on disk. """ +import bisect import datetime import glob import json import os -import bisect from nova import exception from nova import flags from nova import utils from nova.objectstore import stored + FLAGS = flags.FLAGS flags.DEFINE_string('buckets_path', utils.abspath('../buckets'), 'path to s3 buckets') diff --git a/nova/objectstore/handler.py b/nova/objectstore/handler.py index 79f01169c4c0..8377a57a667c 100644 --- a/nova/objectstore/handler.py +++ b/nova/objectstore/handler.py @@ -38,14 +38,11 @@ S3 client with this module:: import datetime import os -import urllib import json import logging import multiprocessing - - - from tornado import escape, web +import urllib from nova import exception from nova import flags diff --git a/nova/objectstore/stored.py b/nova/objectstore/stored.py index f1730cbc71aa..81c047b22c67 100644 --- a/nova/objectstore/stored.py +++ b/nova/objectstore/stored.py @@ -20,10 +20,11 @@ Properties of an object stored within a bucket. """ +import os + +import nova.crypto from nova.exception import NotFound, NotAuthorized -import os -import nova.crypto class Object(object): def __init__(self, bucket, key): diff --git a/nova/process.py b/nova/process.py index 4c1cef58c89f..ff789a08afda 100644 --- a/nova/process.py +++ b/nova/process.py @@ -23,8 +23,6 @@ Process pool, still buggy right now. import logging import multiprocessing import StringIO - - from twisted.internet import defer from twisted.internet import error from twisted.internet import process diff --git a/nova/rpc.py b/nova/rpc.py index 1b171f5d9505..58a2b29cf942 100644 --- a/nova/rpc.py +++ b/nova/rpc.py @@ -21,14 +21,12 @@ AMQP-based RPC. Queues have consumers and publishers. No fan-out support yet. """ +from carrot import connection +from carrot import messaging import json import logging import sys import uuid - - -from carrot import connection -from carrot import messaging from twisted.internet import defer from twisted.internet import reactor from twisted.internet import task diff --git a/nova/server.py b/nova/server.py index 8f4ea91a3bfb..7a1901a2f4d3 100644 --- a/nova/server.py +++ b/nova/server.py @@ -20,6 +20,8 @@ Base functionality for nova daemons - gradually being replaced with twistd.py. """ +import daemon +from daemon import pidlockfile import logging import logging.handlers import os @@ -27,10 +29,6 @@ import signal import sys import time - -import daemon -from daemon import pidlockfile - from nova import flags diff --git a/nova/test.py b/nova/test.py index 864bc3f5add2..5dcf0b9b0565 100644 --- a/nova/test.py +++ b/nova/test.py @@ -23,16 +23,14 @@ and some black magic for inline callbacks. """ import logging +import mox +import stubout import time import unittest - - -import mox from tornado import ioloop from twisted.internet import defer from twisted.python import failure from twisted.trial import unittest as trial_unittest -import stubout from nova import fakerabbit from nova import flags diff --git a/nova/tests/access_unittest.py b/nova/tests/access_unittest.py index 609bda901eb1..8500dd0cbdf8 100644 --- a/nova/tests/access_unittest.py +++ b/nova/tests/access_unittest.py @@ -19,11 +19,12 @@ import unittest import logging -from nova.auth.users import UserManager -from nova.auth import rbac from nova import exception from nova import flags from nova import test +from nova.auth.users import UserManager +from nova.auth import rbac + FLAGS = flags.FLAGS class Context(object): diff --git a/nova/tests/api_integration.py b/nova/tests/api_integration.py index 0ccf69525492..23a88f08336d 100644 --- a/nova/tests/api_integration.py +++ b/nova/tests/api_integration.py @@ -16,10 +16,11 @@ # License for the specific language governing permissions and limitations # under the License. -import unittest import boto from boto.ec2.regioninfo import RegionInfo +import unittest + ACCESS_KEY = 'fake' SECRET_KEY = 'fake' diff --git a/nova/tests/api_unittest.py b/nova/tests/api_unittest.py index 2937ef0b4862..e5e2afe263a1 100644 --- a/nova/tests/api_unittest.py +++ b/nova/tests/api_unittest.py @@ -16,13 +16,11 @@ # License for the specific language governing permissions and limitations # under the License. +import boto +from boto.ec2 import regioninfo import httplib import random import StringIO - - -import boto -from boto.ec2 import regioninfo from tornado import httpserver from twisted.internet import defer diff --git a/nova/tests/cloud_unittest.py b/nova/tests/cloud_unittest.py index 6bafe2ea7340..b8614fdc85ae 100644 --- a/nova/tests/cloud_unittest.py +++ b/nova/tests/cloud_unittest.py @@ -19,12 +19,10 @@ import logging import StringIO import time -import unittest -from xml.etree import ElementTree - - from tornado import ioloop from twisted.internet import defer +import unittest +from xml.etree import ElementTree from nova import flags from nova import rpc diff --git a/nova/tests/future_unittest.py b/nova/tests/future_unittest.py index a4523a3153e6..da5470ffe545 100644 --- a/nova/tests/future_unittest.py +++ b/nova/tests/future_unittest.py @@ -17,15 +17,13 @@ # under the License. import logging +import mox import StringIO import time -import unittest -from xml.etree import ElementTree - - -import mox from tornado import ioloop from twisted.internet import defer +import unittest +from xml.etree import ElementTree from nova import cloud from nova import exception diff --git a/nova/tests/model_unittest.py b/nova/tests/model_unittest.py index 37a4c3e80ae7..1bd7e527f01c 100644 --- a/nova/tests/model_unittest.py +++ b/nova/tests/model_unittest.py @@ -18,8 +18,6 @@ import logging import time - - from twisted.internet import defer from nova import exception diff --git a/nova/tests/network_unittest.py b/nova/tests/network_unittest.py index af9efffbd225..a822cc1d982e 100644 --- a/nova/tests/network_unittest.py +++ b/nova/tests/network_unittest.py @@ -16,13 +16,11 @@ # License for the specific language governing permissions and limitations # under the License. +import IPy import os import logging import unittest - -import IPy - from nova import flags from nova import test from nova import exception diff --git a/nova/tests/node_unittest.py b/nova/tests/node_unittest.py index 60f97741e76f..93942d79e778 100644 --- a/nova/tests/node_unittest.py +++ b/nova/tests/node_unittest.py @@ -18,11 +18,8 @@ import logging import time - -from xml.etree import ElementTree - - from twisted.internet import defer +from xml.etree import ElementTree from nova import exception from nova import flags @@ -31,6 +28,7 @@ from nova import utils from nova.compute import model from nova.compute import node + FLAGS = flags.FLAGS diff --git a/nova/tests/objectstore_unittest.py b/nova/tests/objectstore_unittest.py index 0c700ff96146..f47ca7f00c14 100644 --- a/nova/tests/objectstore_unittest.py +++ b/nova/tests/objectstore_unittest.py @@ -23,15 +23,13 @@ import os import shutil import tempfile - - from nova import flags from nova import objectstore from nova import test from nova.auth import users -FLAGS = flags.FLAGS +FLAGS = flags.FLAGS oss_tempdir = tempfile.mkdtemp(prefix='test_oss-') diff --git a/nova/tests/process_unittest.py b/nova/tests/process_unittest.py index fe625b6c8096..01648961fce8 100644 --- a/nova/tests/process_unittest.py +++ b/nova/tests/process_unittest.py @@ -17,11 +17,9 @@ # under the License. import logging -from xml.etree import ElementTree - - from twisted.internet import defer from twisted.internet import reactor +from xml.etree import ElementTree from nova import exception from nova import flags diff --git a/nova/tests/users_unittest.py b/nova/tests/users_unittest.py index 4bc66ca5c7e0..30172107506b 100644 --- a/nova/tests/users_unittest.py +++ b/nova/tests/users_unittest.py @@ -17,12 +17,10 @@ # under the License. import logging -import unittest - - from M2Crypto import BIO from M2Crypto import RSA from M2Crypto import X509 +import unittest from nova import crypto from nova import flags diff --git a/nova/tests/validator_unittest.py b/nova/tests/validator_unittest.py index fba5b3060dd1..84daa135e56f 100644 --- a/nova/tests/validator_unittest.py +++ b/nova/tests/validator_unittest.py @@ -19,8 +19,6 @@ import logging import unittest - - from nova import flags from nova import test from nova import validate diff --git a/nova/twistd.py b/nova/twistd.py index 3d7fdeb6e6ef..32a46ce03c1c 100644 --- a/nova/twistd.py +++ b/nova/twistd.py @@ -22,22 +22,21 @@ manage pid files and support syslogging. """ import logging +import logging.handlers import os import signal import sys import time -import UserDict -import logging.handlers - - from twisted.scripts import twistd from twisted.python import log from twisted.python import reflect from twisted.python import runtime from twisted.python import usage +import UserDict from nova import flags + if runtime.platformType == "win32": from twisted.scripts._twistw import ServerOptions else: diff --git a/nova/utils.py b/nova/utils.py index 25181332dd95..c5b9356731ee 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -20,6 +20,7 @@ System-level utilities and helper functions. """ +from datetime import datetime import inspect import logging import os @@ -27,7 +28,6 @@ import random import subprocess import socket import sys -from datetime import datetime from nova import flags diff --git a/nova/volume/storage.py b/nova/volume/storage.py index dc67aaeec195..de20f30b5d80 100644 --- a/nova/volume/storage.py +++ b/nova/volume/storage.py @@ -25,12 +25,10 @@ Currently uses Ata-over-Ethernet. import glob import logging import os -import socket import shutil +import socket import tempfile import time - - from tornado import ioloop from twisted.internet import defer