Page MenuHomeDevCentral
Files F3793545

D1703.id4329.diff
No OneTemporary
Actions

D1703.id4329.diff
View Options

diff --git a/_tests/modules/test_forest.py b/_tests/modules/test_forest.py
--- a/_tests/modules/test_forest.py
+++ b/_tests/modules/test_forest.py
@@ -1,9 +1,9 @@
-import imp
+from importlib.machinery import SourceFileLoader
import unittest
-salt_test_case = imp.load_source('salt_test_case', "salt_test_case.py")
-forest = imp.load_source('forest', "../_modules/forest.py")
+salt_test_case = SourceFileLoader('salt_test_case', "salt_test_case.py").load_module()
+forest = SourceFileLoader('forest', "../_modules/forest.py").load_module()
class Testinstance(unittest.TestCase, salt_test_case.SaltTestCase):
diff --git a/_tests/modules/test_jails.py b/_tests/modules/test_jails.py
--- a/_tests/modules/test_jails.py
+++ b/_tests/modules/test_jails.py
@@ -1,9 +1,9 @@
-import imp
+from importlib.machinery import SourceFileLoader
import unittest
-salt_test_case = imp.load_source('salt_test_case', "salt_test_case.py")
-jails = imp.load_source('jails', "../_modules/jails.py")
+salt_test_case = SourceFileLoader('salt_test_case', "salt_test_case.py").load_module()
+jails = SourceFileLoader('jails', "../_modules/jails.py").load_module()
class Testinstance(unittest.TestCase, salt_test_case.SaltTestCase):
diff --git a/_tests/modules/test_node.py b/_tests/modules/test_node.py
--- a/_tests/modules/test_node.py
+++ b/_tests/modules/test_node.py
@@ -1,9 +1,9 @@
-import imp
+from importlib.machinery import SourceFileLoader
import unittest
-salt_test_case = imp.load_source('salt_test_case', "salt_test_case.py")
-node = imp.load_source('node', "../_modules/node.py")
+salt_test_case = SourceFileLoader('salt_test_case', "salt_test_case.py").load_module()
+node = SourceFileLoader('node', "../_modules/node.py").load_module()
class Testinstance(unittest.TestCase, salt_test_case.SaltTestCase):
diff --git a/_tests/salt_test_case.py b/_tests/salt_test_case.py
--- a/_tests/salt_test_case.py
+++ b/_tests/salt_test_case.py
@@ -1,4 +1,4 @@
-import imp
+from importlib.machinery import SourceFileLoader
import yaml
from mock import patch
@@ -6,7 +6,7 @@
class SaltTestCase:
def initialize_mocks(self):
- source = imp.load_source('dunder', "mocks/dunder.py")
+ source = SourceFileLoader("dunder", "mocks/dunder.py").load_module()
self.pillar = source.dunder()
self.grains = source.dunder()

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 28, 20:45 (21 h, 12 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2269897
Default Alt Text
D1703.id4329.diff (2 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator