From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 23 Jun 2012 18:59:42 +0000 (-0400)
Subject: - fix this import
X-Git-Tag: rel_0_8_0b1~354
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee8b7d317850dc0852116efe457751f41e7c6cf8;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- fix this import
- call loading.instances
---

diff --git a/lib/sqlalchemy/dialects/__init__.py b/lib/sqlalchemy/dialects/__init__.py
index 4d5aebf62c..4b34da82e7 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 f0ef520f40..ed600a2f08 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):