aboutsummaryrefslogtreecommitdiff
path: root/ansible/action_plugins
diff options
context:
space:
mode:
Diffstat (limited to 'ansible/action_plugins')
-rw-r--r--ansible/action_plugins/merge_configs.py8
-rwxr-xr-xansible/action_plugins/merge_yaml.py4
2 files changed, 6 insertions, 6 deletions
diff --git a/ansible/action_plugins/merge_configs.py b/ansible/action_plugins/merge_configs.py
index 266bc353e..821b4877d 100644
--- a/ansible/action_plugins/merge_configs.py
+++ b/ansible/action_plugins/merge_configs.py
@@ -14,15 +14,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from ConfigParser import ConfigParser
+import ConfigParser
import inspect
import os
from six import StringIO
-from ansible.plugins.action import ActionBase
+from ansible.plugins import action
-class ActionModule(ActionBase):
+class ActionModule(action.ActionBase):
TRANSFERS_FILES = True
@@ -62,7 +62,7 @@ class ActionModule(ActionBase):
temp_vars = task_vars.copy()
temp_vars.update(extra_vars)
- config = ConfigParser()
+ config = ConfigParser.ConfigParser()
old_vars = self._templar._available_variables
self._templar.set_available_variables(temp_vars)
diff --git a/ansible/action_plugins/merge_yaml.py b/ansible/action_plugins/merge_yaml.py
index 8eed1559e..76410833b 100755
--- a/ansible/action_plugins/merge_yaml.py
+++ b/ansible/action_plugins/merge_yaml.py
@@ -28,10 +28,10 @@ except ImportError:
from yaml import Loader # noqa: F401
-from ansible.plugins.action import ActionBase
+from ansible.plugins import action
-class ActionModule(ActionBase):
+class ActionModule(action.ActionBase):
TRANSFERS_FILES = True