From c8fdce011092f23efd55385b45db8e6f3886beb1 Mon Sep 17 00:00:00 2001
From: Jesse Andrews <jesse@gigantor.local>
Date: Thu, 15 Jul 2010 11:07:40 -0500
Subject: remove import of vendor since we have PPA now

---
 bin/nova-api             | 2 +-
 bin/nova-compute         | 2 +-
 bin/nova-instancemonitor | 2 +-
 bin/nova-objectstore     | 2 +-
 bin/nova-rsapi           | 2 +-
 bin/nova-volume          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'bin')

diff --git a/bin/nova-api b/bin/nova-api
index 7bc9166b8..ae274abf6 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -23,7 +23,7 @@ Tornado daemon for the main API endpoint.
 
 import logging
 
-from nova import vendor
+
 from tornado import httpserver
 from tornado import ioloop
 
diff --git a/bin/nova-compute b/bin/nova-compute
index 803887039..5635efbaf 100755
--- a/bin/nova-compute
+++ b/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
diff --git a/bin/nova-instancemonitor b/bin/nova-instancemonitor
index d3f0ae221..d2ed82c9f 100755
--- a/bin/nova-instancemonitor
+++ b/bin/nova-instancemonitor
@@ -23,7 +23,7 @@
 
 import logging
 
-from nova import vendor
+
 from twisted.internet import task
 from twisted.application import service
 
diff --git a/bin/nova-objectstore b/bin/nova-objectstore
index 7876864c0..8ae80707e 100755
--- a/bin/nova-objectstore
+++ b/bin/nova-objectstore
@@ -23,7 +23,7 @@
 
 import logging
 
-from nova import vendor 
+ 
 from tornado import httpserver
 from tornado import ioloop
 
diff --git a/bin/nova-rsapi b/bin/nova-rsapi
index c2f2c9d70..cca5b3048 100755
--- a/bin/nova-rsapi
+++ b/bin/nova-rsapi
@@ -23,7 +23,7 @@
 import logging
 from wsgiref import simple_server
 
-from nova import vendor
+
 from tornado import ioloop
 
 from nova import flags
diff --git a/bin/nova-volume b/bin/nova-volume
index 9b7787c96..8296eb1d8 100755
--- a/bin/nova-volume
+++ b/bin/nova-volume
@@ -23,7 +23,7 @@
 
 import logging
 
-from nova import vendor
+
 from tornado import ioloop
 
 from nova import flags
-- 
cgit 


From 3ce6ec1a83731da868c5a77c4684808a54ffd8fd Mon Sep 17 00:00:00 2001
From: Jesse Andrews <jesse@gigantor.local>
Date: Thu, 15 Jul 2010 18:13:48 -0500
Subject: reorder imports spacing

---
 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 --
 8 files changed, 6 insertions(+), 16 deletions(-)

(limited to 'bin')

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
-- 
cgit