Merge lp:~ewanmellor/nova/lp652103 into lp:~hudson-openstack/nova/trunk

[Ewan Mellor]

  Bug #652103: NameError in exception handler in sqlalchemy API layer

  Fix reference to NoResultFound.

[Jay Pipes (jaypipes)]

straightforward fix...setting to Approve.

review: Approve

[Jay Pipes (jaypipes)]

Come to think of it, couldn't you just extend the from sqlalchemy.exc import IntegrityError to include NoResultFound as well, instead of adding a whole other import line?

[Ewan Mellor (ewanmellor)]

HACKING says "thou shalt not import more than one module per line". I'm
just doing what I'm told ;-)

On Thu, Sep 30, 2010 at 05:09:39PM +0100, Jay Pipes wrote:

> Come to think of it, couldn't you just extend the from sqlalchemy.exc import IntegrityError to include NoResultFound as well, instead of adding a whole other import line?
> --
> https://code.launchpad.net/~ewanmellor/nova/lp652103/+merge/37137
> You are the owner of lp:~ewanmellor/nova/lp652103.

[Jay Pipes (jaypipes)]

:) why yes you are, Ewan.

[Todd Willey (xtoddx)]

Those imports need to be cleaned up in general to import modules instead of objects, per HACKIKNG. But I don't think anybody is too concerned about it. Working right is much more important.

=== modified file 'nova/db/sqlalchemy/api.py'
--- nova/db/sqlalchemy/api.py	2010-09-29 02:38:15 +0000
+++ nova/db/sqlalchemy/api.py	2010-09-30 15:03:40 +0000
@@ -30,6 +30,7 @@
 from sqlalchemy import or_
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import joinedload_all
+from sqlalchemy.orm.exc import NoResultFound
 from sqlalchemy.sql import exists, func
 
 FLAGS = flags.FLAGS
@@ -348,7 +349,7 @@
                          ).filter_by(address=address
                          ).filter_by(deleted=False
                          ).one()
-        except exc.NoResultFound:
+        except NoResultFound:
             new_exc = exception.NotFound("No model for address %s" % address)
             raise new_exc.__class__, new_exc, sys.exc_info()[2]