diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2006-03-31 07:29:28 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2006-03-31 07:29:28 +0000 |
| commit | effb156b1ebf8924b69c59679fefbeed958af435 (patch) | |
| tree | 49c174d85db813be815086725f9f5f60fef2dcd8 /lib/sqlalchemy/mapping/mapper.py | |
| parent | 9bc6c43283dc384f9202c02419e9f8f22991846b (diff) | |
| download | sqlalchemy-effb156b1ebf8924b69c59679fefbeed958af435.tar.gz | |
tweak...
Diffstat (limited to 'lib/sqlalchemy/mapping/mapper.py')
| -rw-r--r-- | lib/sqlalchemy/mapping/mapper.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/sqlalchemy/mapping/mapper.py b/lib/sqlalchemy/mapping/mapper.py index 9d2286eb0..0f2b4e19f 100644 --- a/lib/sqlalchemy/mapping/mapper.py +++ b/lib/sqlalchemy/mapping/mapper.py @@ -19,8 +19,8 @@ import weakref # a dictionary mapping classes to their primary mappers mapper_registry = weakref.WeakKeyDictionary() -# a list of MapperExtensions that will be installed by default -extensions = [] +# a list of MapperExtensions that will be installed in all mappers by default +global_extensions = [] # a constant returned by _getattrbycolumn to indicate # this mapper is not handling an attribute for a particular @@ -56,13 +56,13 @@ class Mapper(object): ext = MapperExtension() - for ext_class in extensions: + for ext_class in global_extensions: ext = ext_class().chain(ext) + + for ext_obj in util.to_list(extension): + ext = ext_obj.chain(ext) - if extension is not None: - self.extension = extension.chain(ext) - else: - self.extension = ext + self.extension = ext self.class_ = class_ self.is_primary = is_primary |