saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Workaround for py2 builtin, =<3.3 imp and >=3.4 libimport quirks, solves #50127

Browse source
This commit is contained in:
Mark Gomersbach 2018-10-19 12:11:37 +02:00
parent e0965603bf
commit 253ab11bd9
No known key found for this signature in database
GPG key ID: B5171AF93EC64F16
2 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
salt/modules/ebuild.py
View file

@ -61,13 +61,29 @@ def __virtual__():
def _vartree():
import portage # pylint: disable=3rd-party-module-not-gated
portage = reload(portage)
try:
reload(portage)
except NameError:
try:
from importlib import reload
reload(portage)
except ImportError:
from imp import reload
reload(portage)
return portage.db[portage.root]['vartree']
def _porttree():
import portage # pylint: disable=3rd-party-module-not-gated
portage = reload(portage)
try:
reload(portage)
except NameError:
try:
from importlib import reload
reload(portage)
except ImportError:
from imp import reload
reload(portage)
return portage.db[portage.root]['porttree']

10
salt/utils/virtualbox.py
View file

@ -139,7 +139,15 @@ def vb_get_manager():
pass
# Reloading the API extends sys.paths for subprocesses of multiprocessing, since they seem to share contexts
reload(vboxapi)
try:
reload(vboxapi)
except NameError:
try:
from importlib import reload
reload(vboxapi)
except ImportError:
from imp import reload
reload(vboxapi)
_virtualboxManager = vboxapi.VirtualBoxManager(None, None)
return _virtualboxManager