diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-06-23 14:59:42 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-06-23 14:59:42 -0400 |
| commit | ee8b7d317850dc0852116efe457751f41e7c6cf8 (patch) | |
| tree | 5dec78a4e7a687bd35755078e35ddfa21af1b25d /lib/sqlalchemy | |
| parent | 794fa13ce207c90b6cd124f044798c457c652683 (diff) | |
| download | sqlalchemy-ee8b7d317850dc0852116efe457751f41e7c6cf8.tar.gz | |
- fix this import
- call loading.instances
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/dialects/__init__.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/query.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/dialects/__init__.py b/lib/sqlalchemy/dialects/__init__.py index 4d5aebf62..4b34da82e 100644 --- a/lib/sqlalchemy/dialects/__init__.py +++ b/lib/sqlalchemy/dialects/__init__.py @@ -18,7 +18,7 @@ __all__ = ( 'sybase', ) -from . import util +from .. import util def _auto_fn(name): """default dialect importer. diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index f0ef520f4..ed600a2f0 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -2242,7 +2242,7 @@ class Query(object): close_with_result=True) result = conn.execute(querycontext.statement, self._params) - return self.instances(result, querycontext) + return loading.instances(self, result, querycontext) @property def column_descriptions(self): |