From fe83c63b865a86005b9768ffd1acc804813778e3 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Fri, 5 Aug 2022 12:18:27 +0100 Subject: [PATCH] Remove workaround for SQLAlchemy < 1.4 This is no longer needed as our minimum is 1.4.13. Change-Id: I946a790f3461f1cf76a49c18596cc0a6f8058f6c Signed-off-by: Stephen Finucane --- nova/cmd/manage.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/nova/cmd/manage.py b/nova/cmd/manage.py index 5ee30ccff53c..32b0dd57f808 100644 --- a/nova/cmd/manage.py +++ b/nova/cmd/manage.py @@ -752,15 +752,7 @@ class CellV2Commands(object): # worry about parsing and splitting a URL which could have special # characters in the password, which makes parsing a nightmare. url = sqla_url.make_url(connection) - - # TODO(gibi): remove hasattr() conditional in favor of "url.set()" - # when SQLAlchemy 1.4 is the minimum version in requirements - if hasattr(url, "set"): - url = url.set(database=url.database + '_cell0') - else: - # TODO(zzzeek): remove when SQLAlchemy 1.4 - # is the minimum version in requirements - url.database = url.database + '_cell0' + url = url.set(database=url.database + '_cell0') return urlparse.unquote(str(url))