From 8772fcc349226b152e8a04a8ed3e883231412043 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Mon, 19 Jul 2021 10:37:39 +0100 Subject: Don't use the 'Row.keys()' method Resolve the following RemovedIn20Warning warning: The Row.keys() method is considered legacy as of the 1.x series of SQLAlchemy and will be removed in 2.0. Use the namedtuple standard accessor Row._fields, or for full mapping behavior use row._mapping.keys() Change-Id: I647a57909df56fec7b570ae29efbc731126df14d Signed-off-by: Stephen Finucane --- oslo_db/tests/fixtures.py | 5 ----- oslo_db/tests/sqlalchemy/test_update_match.py | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/oslo_db/tests/fixtures.py b/oslo_db/tests/fixtures.py index 7db7b78..20b8a38 100644 --- a/oslo_db/tests/fixtures.py +++ b/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 .*', diff --git a/oslo_db/tests/sqlalchemy/test_update_match.py b/oslo_db/tests/sqlalchemy/test_update_match.py index fdd1887..b4c025b 100644 --- a/oslo_db/tests/sqlalchemy/test_update_match.py +++ b/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' -- cgit v1.2.1