From 253692630f156e81a7ea33d1fa9fc3708939a9c0 Mon Sep 17 00:00:00 2001 From: Nguyen Hung Phuong Date: Mon, 12 Sep 2016 15:15:21 +0700 Subject: Clean imports in code In some part in the code we import objects. In the Openstack style guidelines they recommend to import only modules. http://docs.openstack.org/developer/hacking/#imports Change-Id: I4b55cae8c2672f82025a95112b14d441d66f9d6d --- ansible/action_plugins/merge_configs.py | 8 ++++---- ansible/action_plugins/merge_yaml.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'ansible/action_plugins') 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 -- cgit v1.2.3