From: Mike Bayer Date: Wed, 7 Jun 2006 23:16:35 +0000 (+0000) Subject: fixed [ticket:200] X-Git-Tag: rel_0_2_3~21 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97bef495a3cf0a8e2051dec067c21d8b0799ff6e;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git fixed [ticket:200] --- diff --git a/lib/sqlalchemy/ext/selectresults.py b/lib/sqlalchemy/ext/selectresults.py index 17e92ef32d..e4ae62162b 100644 --- a/lib/sqlalchemy/ext/selectresults.py +++ b/lib/sqlalchemy/ext/selectresults.py @@ -1,7 +1,6 @@ import sqlalchemy.sql as sql import sqlalchemy.orm as orm - class SelectResultsExt(orm.MapperExtension): """a MapperExtension that provides SelectResults functionality for the results of query.select_by() and query.select()""" diff --git a/lib/sqlalchemy/orm/__init__.py b/lib/sqlalchemy/orm/__init__.py index 662736f221..45280408cb 100644 --- a/lib/sqlalchemy/orm/__init__.py +++ b/lib/sqlalchemy/orm/__init__.py @@ -18,7 +18,7 @@ from session import Session as create_session __all__ = ['relation', 'backref', 'eagerload', 'lazyload', 'noload', 'deferred', 'defer', 'undefer', 'mapper', 'clear_mappers', 'sql', 'extension', 'class_mapper', 'object_mapper', 'MapperExtension', 'Query', - 'cascade_mappers', 'polymorphic_union', 'create_session', + 'cascade_mappers', 'polymorphic_union', 'create_session', 'EXT_PASS' ] def relation(*args, **kwargs): diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py index 3ce7d9a807..21f19da02e 100644 --- a/lib/sqlalchemy/orm/mapper.py +++ b/lib/sqlalchemy/orm/mapper.py @@ -12,7 +12,7 @@ import query as querylib import session as sessionlib import sys, weakref, sets -__all__ = ['Mapper', 'MapperExtension', 'class_mapper', 'object_mapper'] +__all__ = ['Mapper', 'MapperExtension', 'class_mapper', 'object_mapper', 'EXT_PASS'] # a dictionary mapping classes to their primary mappers mapper_registry = weakref.WeakKeyDictionary()