openstack/python-cinderclient
Code Issues Proposed changes

Merge "Use importlib to take place of imp module"

Browse Source
This commit is contained in:
Zuul
2020-09-09 18:07:18 +00:00
committed by Gerrit Code Review
parent 76f2b91d9a aebb6011e6
commit d0f10e3350
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cinderclient/client.py
View File

@@ -18,7 +18,7 @@
import glob import glob
import hashlib import hashlib
import imp import importlib.util
import itertools import itertools
import logging import logging
import os import os
@@ -793,6 +793,15 @@ def _discover_via_python_path():
yield name, module yield name, module
def load_module(name, path):
module_spec = importlib.util.spec_from_file_location(
name, path
)
module = importlib.util.module_from_spec(module_spec)
module_spec.loader.exec_module(module)
return module
def _discover_via_contrib_path(version): def _discover_via_contrib_path(version):
module_path = os.path.dirname(os.path.abspath(__file__)) module_path = os.path.dirname(os.path.abspath(__file__))
version_str = "v%s" % version.replace('.', '_') version_str = "v%s" % version.replace('.', '_')
@@ -805,7 +814,7 @@ def _discover_via_contrib_path(version):
if name == "__init__": if name == "__init__":
continue continue
module = imp.load_source(name, ext_path) module = load_module(name, ext_path)
yield name, module yield name, module