summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2010-12-21 03:43:47 +0000
committerVishvananda Ishaya <vishvananda@gmail.com>2010-12-21 03:43:47 +0000
commitfb24146290e6cf49397441d36878652da376f66d (patch)
tree45ff868a8c03815750bf9ffbe6bec2972cca1b5b
parenta2019a14f7e7902c0bfef9fe3e9b576d9f45defe (diff)
downloadnova-fb24146290e6cf49397441d36878652da376f66d.tar.gz
nova-fb24146290e6cf49397441d36878652da376f66d.tar.xz
nova-fb24146290e6cf49397441d36878652da376f66d.zip
pep8 and removed extra imports
-rw-r--r--nova/compute/api.py1
-rw-r--r--nova/tests/cloud_unittest.py6
2 files changed, 2 insertions, 5 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 606344c03..1dbe6e02d 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -275,4 +275,3 @@ class ComputeAPI(base.Base):
self.db.queue_get_for(context, FLAGS.compute_topic, host),
{"method": "unrescue_instance",
"args": {"instance_id": instance['id']}})
-
diff --git a/nova/tests/cloud_unittest.py b/nova/tests/cloud_unittest.py
index 185e4b4e5..af544e3cb 100644
--- a/nova/tests/cloud_unittest.py
+++ b/nova/tests/cloud_unittest.py
@@ -22,12 +22,10 @@ import logging
from M2Crypto import BIO
from M2Crypto import RSA
import os
-import StringIO
import tempfile
import time
from eventlet import greenthread
-from xml.etree import ElementTree
from nova import context
from nova import crypto
@@ -36,7 +34,6 @@ from nova import flags
from nova import rpc
from nova import service
from nova import test
-from nova import utils
from nova.auth import manager
from nova.compute import power_state
from nova.api.ec2 import cloud
@@ -75,7 +72,8 @@ class CloudTestCase(test.TestCase):
self.user = self.manager.create_user('admin', 'admin', 'admin', True)
self.project = self.manager.create_project('proj', 'admin', 'proj')
self.context = context.RequestContext(user=self.user,
- project=self.project)
+ project=self.project)
+
def tearDown(self):
self.manager.delete_project(self.project)
self.manager.delete_user(self.user)