summaryrefslogtreecommitdiff
path: root/openstackclient/common
diff options
context:
space:
mode:
authorFelix Yan <felixonmars@archlinux.org>2020-07-14 01:02:00 +0800
committerMonty Taylor <mordred@inaugust.com>2020-07-14 08:06:55 -0500
commit82ebddca006d1dc61855fdd34b0616222039ea58 (patch)
tree48ed6e645ef0dbc0c3a119bd69e099cab86dafdd /openstackclient/common
parent8aed5feab8a5ae65658ea03fe1f2c238f6ffd908 (diff)
downloadpython-openstackclient-82ebddca006d1dc61855fdd34b0616222039ea58.tar.gz
Fix compatibility issue in 5.35.3.1
The offending entry point object looks like: EntryPoint(name='compute', value='openstackclient.compute.client', group='openstack.cli.base') Story: 2007917 Task: 40323 Change-Id: I0f3cc62e23efdc14203ce6645581d5ba5dbf7fa0
Diffstat (limited to 'openstackclient/common')
-rw-r--r--openstackclient/common/clientmanager.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py
index 66dc880e..36c3ce26 100644
--- a/openstackclient/common/clientmanager.py
+++ b/openstackclient/common/clientmanager.py
@@ -154,7 +154,10 @@ def get_plugin_modules(group):
try:
module_name = ep.entry_point.module_name
except AttributeError:
- module_name = ep.entry_point.module
+ try:
+ module_name = ep.entry_point.module
+ except AttributeError:
+ module_name = ep.entry_point.value
try:
module = importlib.import_module(module_name)