reorder imports spacing

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

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
 
 

bin/nova-api

@@ -22,8 +22,6 @@ Tornado daemon for the main API endpoint.
 """
 
 import logging
-
-
 from tornado import httpserver
 from tornado import ioloop
 

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
 

bin/nova-instancemonitor

@@ -22,8 +22,6 @@
 """
 
 import logging
-
-
 from twisted.internet import task
 from twisted.application import service
 

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
 

bin/nova-objectstore

@@ -22,8 +22,6 @@
 """
 
 import logging
-
- 
 from tornado import httpserver
 from tornado import ioloop
 

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

bin/nova-volume

@@ -22,8 +22,6 @@
 """
 
 import logging
-
-
 from tornado import ioloop
 
 from nova import flags

nova/adminclient.py

@@ -20,8 +20,6 @@ Nova User API client library.
 """
 
 import base64
-
-
 import boto
 from boto.ec2.regioninfo import RegionInfo
 

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):

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

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)
 

nova/cloudpipe/pipelib.py

@@ -22,18 +22,19 @@ an instance with it.
 
 """
 
+import base64
 import logging
 import os
 import tempfile
-import base64
+import zipfile
-from zipfile import ZipFile, ZIP_DEFLATED
 
 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()

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

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
 

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
 

nova/compute/model.py

@@ -42,8 +42,6 @@ True
 
 import logging
 import time
-
-
 import redis
 
 from nova import datastore

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(

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'),

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',

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
 

nova/datastore.py

@@ -24,8 +24,6 @@ before trying to run this.
 """
 
 import logging
-
-
 import redis
 
 from nova import exception

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')

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')

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):

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
 
 

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):

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

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')

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

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):

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

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

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
 
 

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

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):

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'

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
 

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

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

nova/tests/model_unittest.py

@@ -18,8 +18,6 @@
 
 import logging
 import time
-
-
 from twisted.internet import defer
 
 from nova import exception

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

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
 
 

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-')
 

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

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

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

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:

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
 

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