Merge "Use the six provided iterator mix-in"

1 files changed, 1 insertions, 4 deletions

diff --git a/oslo/db/sqlalchemy/models.py b/oslo/db/sqlalchemy/models.py
index ae01bb3..818c1b4 100644
--- a/oslo/db/sqlalchemy/models.py
+++ b/oslo/db/sqlalchemy/models.py
@@ -97,7 +97,7 @@ class ModelBase(six.Iterator):
         return six.iteritems(local)
 
 
-class ModelIterator(ModelBase):
+class ModelIterator(ModelBase, six.Iterator):
 
     def __init__(self, model, columns):
         self.model = model
@@ -111,9 +111,6 @@ class ModelIterator(ModelBase):
         n = six.advance_iterator(self.i)
         return n, getattr(self.model, n)
 
-    def next(self):
-        return self.__next__()
-
 
 class TimestampMixin(object):
     created_at = Column(DateTime, default=lambda: timeutils.utcnow())