More cleanup of Imports to match HACKING

Found using https://github.com/cloudscaling/nova-HACKING

Change-Id: Iaf95d7c65d4c6ff1fa4b045d83a4266cc8f27efe

4 files changed, 10 insertions, 12 deletions

diff --git a/bin/instance-usage-audit b/bin/instance-usage-audit
index 6a781ea61..bceb3022b 100755
--- a/bin/instance-usage-audit
+++ b/bin/instance-usage-audit
@@ -49,16 +49,14 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')):
     sys.path.insert(0, POSSIBLE_TOPDIR)
 
 gettext.install('nova', unicode=1)
-
-
 from nova import context
 from nova import db
 from nova import exception
 from nova import flags
 from nova import log as logging
 from nova import utils
+import nova.compute.utils
 
-from nova.compute.utils import notify_usage_exists
 
 FLAGS = flags.FLAGS
 
@@ -74,4 +72,4 @@ if __name__ == '__main__':
                                                         end)
     print "%s instances" % len(instances)
     for instance_ref in instances:
-        notify_usage_exists(instance_ref)
+        nova.compute.utils.notify_usage_exists(instance_ref)
diff --git a/nova/api/ec2/apirequest.py b/nova/api/ec2/apirequest.py
index 156037a87..ae7204740 100644
--- a/nova/api/ec2/apirequest.py
+++ b/nova/api/ec2/apirequest.py
@@ -24,7 +24,7 @@ import datetime
 # TODO(termie): replace minidom with etree
 from xml.dom import minidom
 
-from nova.api.ec2.admin import AdminController
+from nova.api.ec2 import admin
 from nova.api.ec2 import ec2utils
 from nova import exception
 from nova import flags
@@ -59,8 +59,8 @@ class APIRequest(object):
         try:
             # Raise NotImplemented exception for Admin specific request if
             # admin flag is set to false in nova.conf
-            if (isinstance(self.controller, AdminController) and
-                          (not FLAGS.allow_ec2_admin_api)):
+            if (isinstance(self.controller, admin.AdminController)
+                          and (not FLAGS.allow_ec2_admin_api)):
                 ## Raise InvalidRequest exception for EC2 Admin interface ##
                 LOG.exception("Unsupported API request")
                 raise exception.InvalidRequest()
diff --git a/nova/api/openstack/compute/limits.py b/nova/api/openstack/compute/limits.py
index 94f92700c..cc78b3006 100644
--- a/nova/api/openstack/compute/limits.py
+++ b/nova/api/openstack/compute/limits.py
@@ -25,7 +25,7 @@ import math
 import re
 import time
 
-from webob.dec import wsgify
+import webob.dec
 import webob.exc
 
 from nova.api.openstack.compute.views import limits as limits_views
@@ -240,7 +240,7 @@ class RateLimitingMiddleware(base_wsgi.Middleware):
 
         self._limiter = limiter(limits or DEFAULT_LIMITS, **kwargs)
 
-    @wsgify(RequestClass=wsgi.Request)
+    @webob.dec.wsgify(RequestClass=wsgi.Request)
     def __call__(self, req):
         """
         Represents a single call through this middleware. We should record the
@@ -401,7 +401,7 @@ class WsgiLimiter(object):
         """
         self._limiter = Limiter(limits or DEFAULT_LIMITS)
 
-    @wsgify(RequestClass=wsgi.Request)
+    @webob.dec.wsgify(RequestClass=wsgi.Request)
     def __call__(self, request):
         """
         Handles a call to this application. Returns 204 if the request is
diff --git a/nova/api/openstack/compute/versions.py b/nova/api/openstack/compute/versions.py
index ddc31e9f0..adc083caf 100644
--- a/nova/api/openstack/compute/versions.py
+++ b/nova/api/openstack/compute/versions.py
@@ -15,7 +15,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from datetime import datetime
+import datetime
 
 from lxml import etree
 
@@ -117,7 +117,7 @@ class AtomSerializer(wsgi.XMLDictSerializer):
     def _get_most_recent_update(self, versions):
         recent = None
         for version in versions:
-            updated = datetime.strptime(version['updated'],
+            updated = datetime.datetime.strptime(version['updated'],
                                         '%Y-%m-%dT%H:%M:%SZ')
             if not recent:
                 recent = updated