summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/util.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2011-02-12 18:00:45 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2011-02-12 18:00:45 -0500
commit53aab63b6c24dfdcc249ada5c9d712dc42e5ae40 (patch)
tree04d0b282c7b5e2c43b2e46a0d87c242521dc3545 /lib/sqlalchemy/orm/util.py
parentde9ec22de972ec66f07db8b745108c6248bec6ad (diff)
downloadsqlalchemy-53aab63b6c24dfdcc249ada5c9d712dc42e5ae40.tar.gz
- remove some remaining sys.modules shenanigansrel_0_7b1
- The "sqlalchemy.exceptions" alias in sys.modules has been removed. Base SQLA exceptions are available via "from sqlalchemy import exc". The "exceptions" alias for "exc" remains in "sqlalchemy" for now, it's just not patched into sys.modules.
Diffstat (limited to 'lib/sqlalchemy/orm/util.py')
-rw-r--r--lib/sqlalchemy/orm/util.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py
index a1a50f2ad..ecdf804bd 100644
--- a/lib/sqlalchemy/orm/util.py
+++ b/lib/sqlalchemy/orm/util.py
@@ -4,8 +4,8 @@
# This module is part of SQLAlchemy and is released under
# the MIT License: http://www.opensource.org/licenses/mit-license.php
-import sqlalchemy.exceptions as sa_exc
-from sqlalchemy import sql, util, event
+
+from sqlalchemy import sql, util, event, exc as sa_exc
from sqlalchemy.sql import expression, util as sql_util, operators
from sqlalchemy.orm.interfaces import MapperExtension, EXT_CONTINUE,\
PropComparator, MapperProperty