merged in trunk and fixed import merge errors

13 files changed, 18 insertions, 38 deletions

diff --git a/nova/tests/access_unittest.py b/nova/tests/access_unittest.py
index 609bda901..8500dd0cb 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 0ccf69525..23a88f083 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 aee57b514..e5e2afe26 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
-
-from nova import vendor
-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 9df83ec62..b8614fdc8 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 nova import vendor
 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 be4218c39..da5470ffe 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
-
-from nova import vendor
-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 f70cab40d..1bd7e527f 100644
--- a/nova/tests/model_unittest.py
+++ b/nova/tests/model_unittest.py
@@ -18,8 +18,6 @@
 
 import logging
 import time
-
-from nova import vendor
 from twisted.internet import defer
 
 from nova import exception
diff --git a/nova/tests/network_unittest.py b/nova/tests/network_unittest.py
index d24ae133c..444063d0f 100644
--- a/nova/tests/network_unittest.py
+++ b/nova/tests/network_unittest.py
@@ -16,12 +16,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import IPy
 import os
 import logging
 
-from nova import vendor
-import IPy
-
 from nova import flags
 from nova import test
 from nova import utils
diff --git a/nova/tests/node_unittest.py b/nova/tests/node_unittest.py
index 4f7bbd587..93942d79e 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 nova import vendor
 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 ca2d31159..f47ca7f00 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 vendor
-
 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 671ab05cd..01648961f 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 nova import vendor
 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/storage_unittest.py b/nova/tests/storage_unittest.py
index b04602b71..60576d74f 100644
--- a/nova/tests/storage_unittest.py
+++ b/nova/tests/storage_unittest.py
@@ -69,13 +69,11 @@ class StorageTestCase(test.TrialTestCase):
         vols = []
         for i in xrange(total_slots):
             vid = self.mystorage.create_volume(vol_size, user_id, project_id)
-            print vid
             vols.append(vid)
         self.assertRaises(storage.NoMoreVolumes,
                           self.mystorage.create_volume,
                           vol_size, user_id, project_id)
         for id in vols:
-            print id
             self.mystorage.delete_volume(id)
 
     def test_run_attach_detach_volume(self):
diff --git a/nova/tests/users_unittest.py b/nova/tests/users_unittest.py
index 6110248b5..301721075 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 nova import vendor
 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 38cddfef1..84daa135e 100644
--- a/nova/tests/validator_unittest.py
+++ b/nova/tests/validator_unittest.py
@@ -19,8 +19,6 @@
 import logging
 import unittest
 
-from nova import vendor
-
 from nova import flags
 from nova import test
 from nova import validate