File 0011-Fix-module-import-being-Py3-and-P2.6-compa... of Package salt

Overview Repositories Revisions Requests Users Attributes Meta

File 0011-Fix-module-import-being-Py3-and-P2.6-compatible.patch of Package salt (Revision 9988236fb5b8cf6933790d6a8dfae4b4)

Currently displaying revision 9988236fb5b8cf6933790d6a8dfae4b4 , Show latest

From 3d586f38f579d344c000d504d5dae24d7829e5f6 Mon Sep 17 00:00:00 2001
From: Bo Maryniuk <bo@suse.de>
Date: Thu, 16 Jul 2015 14:21:17 +0200
Subject: [PATCH 11/38] Fix module import being Py3 and P2.6+ compatible.

---
 salt/modules/node.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/salt/modules/node.py b/salt/modules/node.py
index 767de67..aef6f67 100644
--- a/salt/modules/node.py
+++ b/salt/modules/node.py
@@ -46,11 +46,14 @@ def _(module):
     :return:
     '''
 
-    # importlib is unavailable on python 2.6
-    if module == 'collector':
-        mod = salt.modules.inspectlib.collector
-    elif module == 'query':
-        mod = salt.modules.inspectlib.query
+
+    mod = None
+    try:
+        import importlib
+        mod = importlib.import_module("salt.modules.inspectlib.{0}".format(module))
+    except ImportError as err:
+        # No importlib around (2.6)
+        mod = getattr(__import__("salt.modules.inspectlib", globals(), locals(), fromlist=[str(module)]), module)
 
     mod.__grains__ = __grains__
     mod.__pillar__ = __pillar__
-- 
2.10.2

Places

File 0011-Fix-module-import-being-Py3-and-P2.6-compatible.patch of Package salt (Revision 9988236fb5b8cf6933790d6a8dfae4b4)

Places