diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-08-21 08:02:19 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-08-21 08:02:19 +0000 |
commit | e9a9701d54ea1b708e7fc3ef68e75eb288059632 (patch) | |
tree | f9d80587f48bc5dd6d4bf4c3c239e1cfb4128713 | |
parent | ed6b4c30e70207c0928be1f986281c34eb95920c (diff) | |
parent | 3ef34da36ccfe34ed0d2d572d2aa6b6a515b18a2 (diff) | |
download | oslo-db-e9a9701d54ea1b708e7fc3ef68e75eb288059632.tar.gz |
Merge "Replace six.iteritems() with .items()"4.26.0
-rw-r--r-- | oslo_db/sqlalchemy/models.py | 6 | ||||
-rw-r--r-- | oslo_db/tests/sqlalchemy/test_utils.py | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/oslo_db/sqlalchemy/models.py b/oslo_db/sqlalchemy/models.py index 0467971..6fa0f6f 100644 --- a/oslo_db/sqlalchemy/models.py +++ b/oslo_db/sqlalchemy/models.py @@ -92,7 +92,7 @@ class ModelBase(six.Iterator): def update(self, values): """Make the model object behave like a dict.""" - for k, v in six.iteritems(values): + for k, v in values.items(): setattr(self, k, v) def _as_dict(self): @@ -101,14 +101,14 @@ class ModelBase(six.Iterator): Includes attributes from joins. """ local = dict((key, value) for key, value in self) - joined = dict([(k, v) for k, v in six.iteritems(self.__dict__) + joined = dict([(k, v) for k, v in self.__dict__.items() if not k[0] == '_']) local.update(joined) return local def iteritems(self): """Make the model object behave like a dict.""" - return six.iteritems(self._as_dict()) + return self._as_dict().items() def items(self): """Make the model object behave like a dict.""" diff --git a/oslo_db/tests/sqlalchemy/test_utils.py b/oslo_db/tests/sqlalchemy/test_utils.py index 40a7ea2..932c1ea 100644 --- a/oslo_db/tests/sqlalchemy/test_utils.py +++ b/oslo_db/tests/sqlalchemy/test_utils.py @@ -18,7 +18,6 @@ import mock from oslo_utils import uuidutils from oslotest import base as test_base from oslotest import moxstubout -import six from six.moves.urllib import parse import sqlalchemy from sqlalchemy.dialects import mysql @@ -614,7 +613,7 @@ class TestMigrationUtils(db_test_base.DbTestCase): } index_instances = [Index(name, *columns) - for name, columns in six.iteritems(indexes)] + for name, columns in indexes.items()] table = Table(table_name, self.meta, Column('id', Integer, primary_key=True), |