Use importlib instead of imp
... because the imp module is deprecated since Python 3.4 . Closes-Bug: #1937904 Change-Id: Ia3f83df336fd243c25f7471d56a44370c11bb5e1
This commit is contained in:
parent
273c41574a
commit
bff8d41370
@ -13,7 +13,7 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import imp
|
import importlib
|
||||||
import inspect
|
import inspect
|
||||||
from unittest import mock
|
from unittest import mock
|
||||||
|
|
||||||
@ -31,7 +31,8 @@ class DiscoverTest(utils.TestCase):
|
|||||||
def mock_mgr():
|
def mock_mgr():
|
||||||
fake_ep = mock.Mock()
|
fake_ep = mock.Mock()
|
||||||
fake_ep.name = 'foo'
|
fake_ep.name = 'foo'
|
||||||
fake_ep.module = imp.new_module('foo')
|
module_spec = importlib.machinery.ModuleSpec('foo', None)
|
||||||
|
fake_ep.module = importlib.util.module_from_spec(module_spec)
|
||||||
fake_ep.load.return_value = fake_ep.module
|
fake_ep.load.return_value = fake_ep.module
|
||||||
fake_ext = extension.Extension(
|
fake_ext = extension.Extension(
|
||||||
name='foo',
|
name='foo',
|
||||||
@ -52,10 +53,14 @@ class DiscoverTest(utils.TestCase):
|
|||||||
def test_discover_extensions(self):
|
def test_discover_extensions(self):
|
||||||
|
|
||||||
def mock_discover_via_python_path():
|
def mock_discover_via_python_path():
|
||||||
yield 'foo', imp.new_module('foo')
|
module_spec = importlib.machinery.ModuleSpec('foo', None)
|
||||||
|
module = importlib.util.module_from_spec(module_spec)
|
||||||
|
yield 'foo', module
|
||||||
|
|
||||||
def mock_discover_via_entry_points():
|
def mock_discover_via_entry_points():
|
||||||
yield 'baz', imp.new_module('baz')
|
module_spec = importlib.machinery.ModuleSpec('baz', None)
|
||||||
|
module = importlib.util.module_from_spec(module_spec)
|
||||||
|
yield 'baz', module
|
||||||
|
|
||||||
@mock.patch.object(client,
|
@mock.patch.object(client,
|
||||||
'_discover_via_python_path',
|
'_discover_via_python_path',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user