Fix reload(portage) issue

python3-reload-fix.patch (text/plain), 1.72 KB, created by (retired) on 2018-11-12 09:27:12 UTC

--- a/salt/modules/ebuild.py	2018-11-12 08:59:48.380691523 +0000
+++ b/salt/modules/ebuild.py	2018-11-12 09:04:20.468704497 +0000
@@ -31,6 +31,10 @@
 from salt.exceptions import CommandExecutionError, MinionError
 from salt.ext import six
 
+# Workaround for 'reload' builtin of py2.7
+if six.PY3:
+    from importlib import reload  # pylint: disable=no-name-in-module
+
 # Import third party libs
 HAS_PORTAGE = False
 try:
--- a/salt/modules/portage_config.py	2018-11-12 08:59:39.445691097 +0000
+++ b//salt/modules/portage_config.py	2018-11-12 09:04:34.576705170 +0000
@@ -17,6 +17,10 @@
 
 # Import third party libs
 from salt.ext import six
+# Workaround for 'reload' builtin of py2.7
+if six.PY3:
+    from importlib import reload  # pylint: disable=no-name-in-module
+
 # pylint: disable=import-error
 try:
     import portage
--- a/salt/utils/virtualbox.py	2018-11-12 09:01:05.185695185 +0000
+++ b/salt/utils/virtualbox.py	2018-11-12 09:02:56.847700510 +0000
@@ -16,6 +16,10 @@
 # Import salt libs
 import salt.utils.data
 from salt.utils.timeout import wait_for
+import salt.ext.six as six
+# Workaround for 'reload' builtin of py2.7
+if six.PY3:
+    from importlib import reload  # pylint: disable=no-name-in-module
 
 log = logging.getLogger(__name__)
 
@@ -135,13 +139,6 @@
     '''
     global _virtualboxManager
     if _virtualboxManager is None and HAS_LIBS:
-        try:
-            from importlib import reload
-        except ImportError:
-            # If we get here, we are in py2 and reload is a built-in.
-            pass
-
-        # Reloading the API extends sys.paths for subprocesses of multiprocessing, since they seem to share contexts
         reload(vboxapi)
         _virtualboxManager = vboxapi.VirtualBoxManager(None, None)