Merge with trunk.

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 nova import vendor
 from tornado import httpserver
 from tornado import ioloop
 

bin/nova-compute

@@ -33,7 +33,7 @@ NOVA_PATH = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'nova')
 if os.path.exists(NOVA_PATH):
     sys.path.insert(0, os.path.dirname(NOVA_PATH))
 
-from nova import vendor
+
 from carrot import connection
 from carrot import messaging
 from twisted.internet import task

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 nova import vendor
 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-rsapi

@@ -21,10 +21,8 @@
 """
 
 import logging
-from wsgiref import simple_server
-
-from nova import vendor
 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 nova import vendor
 from tornado import ioloop
 
 from nova import flags