summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToshio Kuratomi <toshio@fedoraproject.org>2015-01-14 09:15:30 -0800
committerToshio Kuratomi <toshio@fedoraproject.org>2015-01-14 09:16:09 -0800
commit4add30c96ee3a52247de3f7919cda2aa93fe08a6 (patch)
tree2b35559a76cf3e3460281c1b5f5744133be8bc6c
parent4010f794418b1144cc4c1fdf48a381bacc97a2da (diff)
downloadansible-4add30c96ee3a52247de3f7919cda2aa93fe08a6.tar.gz
Optimize away a string replacement :-)
-rw-r--r--v2/ansible/executor/module_common.py1
-rw-r--r--v2/ansible/module_utils/basic.py2
2 files changed, 1 insertions, 2 deletions
diff --git a/v2/ansible/executor/module_common.py b/v2/ansible/executor/module_common.py
index e438099295..ade1a3b064 100644
--- a/v2/ansible/executor/module_common.py
+++ b/v2/ansible/executor/module_common.py
@@ -156,7 +156,6 @@ class ModuleReplacer(object):
# these strings should be part of the 'basic' snippet which is required to be included
module_data = module_data.replace(REPLACER_VERSION, repr(__version__))
- module_data = module_data.replace(REPLACER_ARGS, "''")
module_data = module_data.replace(REPLACER_COMPLEX, encoded_args)
# FIXME: we're not passing around an inject dictionary anymore, so
diff --git a/v2/ansible/module_utils/basic.py b/v2/ansible/module_utils/basic.py
index 512e78ddfc..acaa370437 100644
--- a/v2/ansible/module_utils/basic.py
+++ b/v2/ansible/module_utils/basic.py
@@ -31,7 +31,7 @@
ANSIBLE_VERSION = "<<ANSIBLE_VERSION>>"
-MODULE_ARGS = "<<INCLUDE_ANSIBLE_MODULE_ARGS>>"
+MODULE_ARGS = ""
MODULE_COMPLEX_ARGS = "<<INCLUDE_ANSIBLE_MODULE_COMPLEX_ARGS>>"
BOOLEANS_TRUE = ['yes', 'on', '1', 'true', 1]