From 8c620a17d453e8c3d367cbabb4ca2931ef43ccdc Mon Sep 17 00:00:00 2001 From: Nathaniel Case Date: Sun, 22 Jul 2018 15:26:44 -0400 Subject: [PATCH] Let called functions use `method` keyword (#43086) Hopefully we can live without `method_` instead --- lib/ansible/module_utils/connection.py | 4 ++-- lib/ansible/plugins/action/asa.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/ansible/module_utils/connection.py b/lib/ansible/module_utils/connection.py index 18014f4e13..40e431ae2c 100644 --- a/lib/ansible/module_utils/connection.py +++ b/lib/ansible/module_utils/connection.py @@ -72,9 +72,9 @@ def exec_command(module, command): return 0, out, '' -def request_builder(method, *args, **kwargs): +def request_builder(method_, *args, **kwargs): reqid = str(uuid.uuid4()) - req = {'jsonrpc': '2.0', 'method': method, 'id': reqid} + req = {'jsonrpc': '2.0', 'method': method_, 'id': reqid} params = args or kwargs or None if params: diff --git a/lib/ansible/plugins/action/asa.py b/lib/ansible/plugins/action/asa.py index e05df8fc9d..eec4750a29 100644 --- a/lib/ansible/plugins/action/asa.py +++ b/lib/ansible/plugins/action/asa.py @@ -27,7 +27,6 @@ from ansible import constants as C from ansible.plugins.action.normal import ActionModule as _ActionModule from ansible.module_utils.network.asa.asa import asa_provider_spec from ansible.module_utils.network.common.utils import load_provider -from ansible.module_utils.connection import request_builder try: