From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 17 Jun 2010 18:32:32 +0000 (-0400)
Subject: fix import
X-Git-Tag: rel_0_6_2~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=caa465512cae22d2a5288ff7b424904d246459fa;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fix import
---

diff --git a/lib/sqlalchemy/orm/dynamic.py b/lib/sqlalchemy/orm/dynamic.py
index 92632ac890..d0aa2c20b0 100644
--- a/lib/sqlalchemy/orm/dynamic.py
+++ b/lib/sqlalchemy/orm/dynamic.py
@@ -13,7 +13,7 @@ basic add/delete mutation.
 
 from sqlalchemy import log, util
 from sqlalchemy import exc as sa_exc
-from sqlalchemy.orm import exc as sa_exc
+from sqlalchemy.orm import exc as orm_exc
 from sqlalchemy.sql import operators
 from sqlalchemy.orm import (
     attributes, object_session, util as mapperutil, strategies, object_mapper