Merge "Don't use the 'Row.keys()' method"

oslo_db/tests/fixtures.py

@@ -57,11 +57,6 @@ class WarningsFixture(fixtures.Fixture):
             message=r'The Executable.execute\(\) method is considered .*',
             category=sqla_exc.SADeprecationWarning)
 
-        warnings.filterwarnings(
-            'once',
-            message=r'The Row.keys\(\) method is considered legacy .*',
-            category=sqla_exc.SADeprecationWarning)
-
         warnings.filterwarnings(
             'once',
             message=r'Retrieving row members using strings or other .*',

oslo_db/tests/sqlalchemy/test_update_match.py

@@ -122,7 +122,7 @@ class UpdateMatchTest(db_test_base._DbTestCase):
             sql.select(MyModel.__table__).where(MyModel.__table__.c.id == pk)
         ).first()
         values['id'] = pk
-        self.assertEqual(values, dict(row))
+        self.assertEqual(values, dict(row._mapping))
 
     def test_update_specimen_successful(self):
         uuid = '136254d5-3869-408f-9da7-190e0072641a'