`session.Query().iterate_instances()` has been renamed to just `instances()`. The old `instances()` method returning a list instead of an iterator no longer

exists. If you were relying on that behavior, you should use `list(your_query.instances())`.

1 files changed, 4 insertions, 15 deletions

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index a2a546caa..ed82a7ca5 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -1040,28 +1040,16 @@ class Query(object):
 
     def _execute_and_instances(self, querycontext):
         result = self.session.execute(querycontext.statement, params=self._params, mapper=self._mapper_zero_or_none(), _state=self._refresh_state)
-        return self.iterate_instances(result, querycontext)
+        return self.instances(result, querycontext)
 
     def instances(self, cursor, __context=None):
-        """Given a ResultProxy cursor as returned by connection.execute(), return an ORM result as a list.
+        """Given a ResultProxy cursor as returned by connection.execute(), return an ORM result as an iterator.
 
         e.g.::
-        
-            result = engine.execute("select * from users")
-            users = session.query(User).instances(result)
-
-        """
-        return list(self.iterate_instances(cursor, __context))
 
-    def iterate_instances(self, cursor, __context=None):
-        """Given a ResultProxy cursor as returned by connection.execute(), return an ORM result as an iterator.
-        
-        e.g.::
-        
             result = engine.execute("select * from users")
-            for u in session.query(User).iterate_instances(result):
+            for u in session.query(User).instances(result):
                 print u
-
         """
         session = self.session
 
@@ -1128,6 +1116,7 @@ class Query(object):
 
             if not self._yield_per:
                 break
+    iterate_instances = util.deprecated()(instances)
 
     def _get(self, key=None, ident=None, refresh_state=None, lockmode=None, only_load_props=None):
         lockmode = lockmode or self._lockmode