From 091cf4ec5851e87bf722ed0bbbbfdf64dd599389 Mon Sep 17 00:00:00 2001
From: mdietz <mdietz@openstack>
Date: Tue, 5 Oct 2010 19:52:12 +0000
Subject: A little more clean up

---
 nova/db/sqlalchemy/api.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 7429057ca..6f1ea7c23 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -29,8 +29,7 @@ from nova.db.sqlalchemy import models
 from nova.db.sqlalchemy.session import get_session
 from sqlalchemy import or_
 from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm import joinedload_all
-from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.orm import joinedload, joinedload_all
 from sqlalchemy.sql import exists, func
 
 FLAGS = flags.FLAGS
@@ -451,7 +450,6 @@ def fixed_ip_create(_context, values):
     fixed_ip_ref.save()
     return fixed_ip_ref['address']
 
-
 @require_context
 def fixed_ip_disassociate(context, address):
     session = get_session()
-- 
cgit