Remove unnecessary quoting of script arguments

This commit is contained in:
JonnyWong16 2016-01-29 18:47:12 -08:00
parent 0eaea4d011
commit 1cb75bd053

View file

@ -586,10 +586,6 @@ def build_notify_text(session=None, timeline=None, state=None):
# Default scripts args # Default scripts args
script_args = [] script_args = []
# Regex to match {param} but not "{param}"
params_to_quote = re.compile(r'(?<!\")([\{][^}]+[\}])(?!\"\})')
script_args_text = re.sub(params_to_quote, r'"\g<0>"', script_args_text)
if script_args_text: if script_args_text:
try: try:
script_args = [unicode(arg).format(**available_params) for arg in script_args_text.split()] script_args = [unicode(arg).format(**available_params) for arg in script_args_text.split()]
@ -805,10 +801,6 @@ def build_server_notify_text(state=None):
# Default scripts args # Default scripts args
script_args = [] script_args = []
# Regex to match {param} but not "{param}"
params_to_quote = re.compile(r'(?<!\")([\{][^}]+[\}])(?!\"\})')
script_args_text = re.sub(params_to_quote, r'"\g<0>"', script_args_text)
if script_args_text: if script_args_text:
try: try:
script_args = [unicode(arg).format(**available_params) for arg in script_args_text.split()] script_args = [unicode(arg).format(**available_params) for arg in script_args_text.split()]