diff options
author | Jenkins <jenkins@review.openstack.org> | 2014-10-02 16:11:01 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2014-10-02 16:11:01 +0000 |
commit | 96f610bf728fb5429598f119ce15a382ab1283d4 (patch) | |
tree | 99113e238402230a32f74b2b1d7e45153828bd20 /oslo | |
parent | 8fecda230a0d7c13e50f27063a207b35509d3b1a (diff) | |
parent | 8bc1fb79ba78899a501f204e0062b0a44c750f49 (diff) | |
download | oslo-db-96f610bf728fb5429598f119ce15a382ab1283d4.tar.gz |
Merge "Use the six provided iterator mix-in"
Diffstat (limited to 'oslo')
-rw-r--r-- | oslo/db/sqlalchemy/models.py | 5 |
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()) |