sprint_varx fmt default to terse
fmt=terse seems to be the preferred option so it has been made the default.
Now if the user desires the opposite, they must specify fmt=verbose.
For backward compatibility, fmt=terse is still supported but is not necessary.
Change-Id: I81ac52a517c9b16b7bd790ea422972a403c622a8
Signed-off-by: Michael Walsh <micwalsh@us.ibm.com>
diff --git a/lib/gen_robot_print.py b/lib/gen_robot_print.py
index 71752bf..c03c9a3 100755
--- a/lib/gen_robot_print.py
+++ b/lib/gen_robot_print.py
@@ -33,10 +33,13 @@
if 'fmt' in kwargs:
# Find format option names in kwargs['fmt'] and wrap them with "gp."
- # and "()" to make them into function calls. For example, terse would
- # be converted to "gp.terse()". This allows the user to simply
- # specify "fmt=terse" (vs. fmt=gp.terse()).
- regex = "(" + "|".join(gp.valid_fmts()) + ")"
+ # and "()" to make them into function calls. For example, verbose
+ # would be converted to "gp.verbose()". This allows the user to
+ # simply specify "fmt=verbose" (vs. fmt=gp.verbose()).
+ # Note "terse" has been explicitly added for backward compatibility.
+ # Once the repo has been purged of its use, this code can return to
+ # its original form.
+ regex = "(" + "|".join(gp.valid_fmts()) + "|terse)"
kwargs['fmt'] = \
re.sub(regex, "gp.\\1()", kwargs['fmt'])
kwargs = fa.args_to_objects(kwargs)