From: Mike Bayer Date: Sat, 2 Oct 2010 15:00:22 +0000 (-0400) Subject: merge tip X-Git-Tag: rel_0_7b1~253^2~20 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25c08f6def19e1034a887e972ad286ef122473d0;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git merge tip --- 25c08f6def19e1034a887e972ad286ef122473d0 diff --cc lib/sqlalchemy/orm/mapper.py index d1fb47e23e,378570723b..b3aa7fb294 --- a/lib/sqlalchemy/orm/mapper.py +++ b/lib/sqlalchemy/orm/mapper.py @@@ -20,16 -20,17 +20,18 @@@ import operato from itertools import chain, groupby deque = __import__('collections').deque -from sqlalchemy import sql, util, log, exc as sa_exc +from sqlalchemy import sql, util, log, exc as sa_exc, event - from sqlalchemy.sql import expression, visitors, operators, \ - util as sqlutil - from sqlalchemy.orm import instrumentation, sync, exc as orm_exc, \ - unitofwork, attributes - from sqlalchemy.orm.interfaces import MapperProperty, EXT_CONTINUE, \ - PropComparator - from sqlalchemy.orm.util import ExtensionCarrier, _INSTRUMENTOR, \ - _class_to_mapper, _state_mapper, class_mapper, instance_str, \ - state_str + from sqlalchemy.sql import expression, visitors, operators, util as sqlutil -from sqlalchemy.orm import attributes, sync, exc as orm_exc, unitofwork ++from sqlalchemy.orm import instrumentation, attributes, sync, \ ++ exc as orm_exc, unitofwork + from sqlalchemy.orm.interfaces import ( + MapperProperty, EXT_CONTINUE, PropComparator + ) + from sqlalchemy.orm.util import ( + ExtensionCarrier, _INSTRUMENTOR, _class_to_mapper, + _state_mapper, class_mapper, instance_str, state_str, + ) + import sys __all__ = ( 'Mapper',