Skip to content

Commit f810b41

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Remove workaround for SQLAlchemy < 1.4"
2 parents f77c58d + fe83c63 commit f810b41

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

nova/cmd/manage.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -752,15 +752,7 @@ def cell0_default_connection():
752752
# worry about parsing and splitting a URL which could have special
753753
# characters in the password, which makes parsing a nightmare.
754754
url = sqla_url.make_url(connection)
755-
756-
# TODO(gibi): remove hasattr() conditional in favor of "url.set()"
757-
# when SQLAlchemy 1.4 is the minimum version in requirements
758-
if hasattr(url, "set"):
759-
url = url.set(database=url.database + '_cell0')
760-
else:
761-
# TODO(zzzeek): remove when SQLAlchemy 1.4
762-
# is the minimum version in requirements
763-
url.database = url.database + '_cell0'
755+
url = url.set(database=url.database + '_cell0')
764756

765757
return urlparse.unquote(str(url))
766758

0 commit comments

Comments
 (0)