summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Fedoseev <fedoseev.sergey@gmail.com>2017-07-14 14:15:00 +0500
committerSergey Fedoseev <fedoseev.sergey@gmail.com>2017-07-14 14:15:00 +0500
commit18db55bb31d8dffffd94af2f553eb4e982cd9785 (patch)
tree3c838df4e30d4bd5950a9eae3594a21d2ccf538c
parent37b2602c895139ff5a44626ed8469c681c438fe4 (diff)
Replaced Oracle CursorIterator with generator expression.
-rw-r--r--django/db/backends/oracle/base.py18
1 files changed, 1 insertions, 17 deletions
diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py
index 2493bd791f..224b3ae0ff 100644
--- a/django/db/backends/oracle/base.py
+++ b/django/db/backends/oracle/base.py
@@ -524,23 +524,7 @@ class FormatStylePlaceholderCursor:
return getattr(self.cursor, attr)
def __iter__(self):
- return CursorIterator(self.cursor)
-
-
-class CursorIterator:
- """
- Cursor iterator wrapper that invokes our custom row factory.
- """
-
- def __init__(self, cursor):
- self.cursor = cursor
- self.iter = iter(cursor)
-
- def __iter__(self):
- return self
-
- def __next__(self):
- return _rowfactory(next(self.iter), self.cursor)
+ return (_rowfactory(r, self.cursor) for r in self.cursor)
def _rowfactory(row, cursor):