diff options
Diffstat (limited to 'lib/sqlalchemy/mapping/mapper.py')
| -rw-r--r-- | lib/sqlalchemy/mapping/mapper.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/sqlalchemy/mapping/mapper.py b/lib/sqlalchemy/mapping/mapper.py index 3a900569c..24bf11fd8 100644 --- a/lib/sqlalchemy/mapping/mapper.py +++ b/lib/sqlalchemy/mapping/mapper.py @@ -204,7 +204,7 @@ class Mapper(object): oldinit = self.class_.__init__ def init(self, *args, **kwargs): nohist = kwargs.pop('_mapper_nohistory', False) - session = kwargs.pop('_sa_session', objectstore.session()) + session = kwargs.pop('_sa_session', objectstore.get_session()) if oldinit is not None: try: oldinit(self, *args, **kwargs) @@ -244,7 +244,7 @@ class Mapper(object): # store new stuff in the identity map for value in imap.values(): - objectstore.session().register_clean(value) + objectstore.get_session().register_clean(value) if len(mappers): return [result] + otherresults @@ -261,7 +261,7 @@ class Mapper(object): def _get(self, key, ident=None): try: - return objectstore.session()._get(key) + return objectstore.get_session()._get(key) except KeyError: if ident is None: ident = key[2] @@ -688,8 +688,8 @@ class Mapper(object): # including modifying any of its related items lists, as its already # been exposed to being modified by the application. identitykey = self._identity_key(row) - if objectstore.session().has_key(identitykey): - instance = objectstore.session()._get(identitykey) + if objectstore.get_session().has_key(identitykey): + instance = objectstore.get_session()._get(identitykey) isnew = False if populate_existing: |