From 236190c4526effb138db104998e947e0d7496f84 Mon Sep 17 00:00:00 2001
From: Joe Gordon <jogo@cloudscaling.com>
Date: Tue, 17 Jan 2012 18:21:12 -0800
Subject: [PATCH] Cleanup Imports to match HACKING guidelines

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

Change-Id: Ic010f0407e7a139f0f6436af2e72e817c140a4c3
---
 bin/nova-manage                      |  4 ++--
 nova/api/openstack/compute/limits.py |  4 ++--
 tools/euca-get-ajax-console          | 13 ++++++-------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/bin/nova-manage b/bin/nova-manage
index 3636d99eef9c..13522d770adf 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -60,7 +60,7 @@ import glob
 import json
 import math
 import netaddr
-from optparse import OptionParser
+import optparse
 import os
 import StringIO
 import sys
@@ -2355,7 +2355,7 @@ def main():
     options = getattr(fn, 'options', [])
 
     usage = "%%prog %s %s <args> [options]" % (category, action)
-    parser = OptionParser(usage=usage)
+    parser = optparse.OptionParser(usage=usage)
     for ar, kw in options:
         parser.add_option(*ar, **kw)
     (opts, fn_args) = parser.parse_args(argv)
diff --git a/nova/api/openstack/compute/limits.py b/nova/api/openstack/compute/limits.py
index 0a1b80057e7d..94f92700c83c 100644
--- a/nova/api/openstack/compute/limits.py
+++ b/nova/api/openstack/compute/limits.py
@@ -17,7 +17,7 @@
 Module dedicated functions/classes dealing with rate limiting requests.
 """
 
-from collections import defaultdict
+import collections
 import copy
 import httplib
 import json
@@ -283,7 +283,7 @@ class Limiter(object):
         @param limits: List of `Limit` objects
         """
         self.limits = copy.deepcopy(limits)
-        self.levels = defaultdict(lambda: copy.deepcopy(limits))
+        self.levels = collections.defaultdict(lambda: copy.deepcopy(limits))
 
         # Pick up any per-user limit information
         for key, value in kwargs.items():
diff --git a/tools/euca-get-ajax-console b/tools/euca-get-ajax-console
index a67c79d90a4f..26236f1d9bbd 100755
--- a/tools/euca-get-ajax-console
+++ b/tools/euca-get-ajax-console
@@ -34,9 +34,8 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
 
 import boto
 import nova
-from boto.ec2.connection import EC2Connection
+import boto.ec2.connection
 import euca2ools
-from euca2ools import Euca2ool, InstanceValidationError, Util
 
 usage_string = """
 Retrieves a url to an ajax console terminal
@@ -53,7 +52,7 @@ OPTIONAL PARAMETERS
 
 
 # This class extends boto to add AjaxConsole functionality
-class NovaEC2Connection(EC2Connection):
+class NovaEC2Connection(boto.ec2.connection.EC2Connection):
 
     def get_ajax_console(self, instance_id):
         """
@@ -104,12 +103,12 @@ euca2ools.EC2Connection = NovaEC2Connection
 
 def usage(status=1):
     print usage_string
-    Util().usage()
+    euca2ools.Util().usage()
     sys.exit(status)
 
 
 def version():
-    print Util().version()
+    print euca2ools.Util().version()
     sys.exit()
 
 
@@ -125,7 +124,7 @@ def display_ajax_console_output(console_output):
 
 def main():
     try:
-        euca = Euca2ool()
+        euca = euca2ools.Euca2ool()
     except Exception, e:
         print e
         usage()
@@ -147,7 +146,7 @@ def main():
     if instance_id:
         try:
             euca.validate_instance_id(instance_id)
-        except InstanceValidationError:
+        except euca2ools.InstanceValidationError:
             print 'Invalid instance id'
             sys.exit(1)