From e9e03405e08904b3d6bb0d91844e7e59cfe52ae0 Mon Sep 17 00:00:00 2001 From: John Vandenberg Date: Thu, 13 Oct 2016 10:26:18 +0700 Subject: [PATCH] Allow --varformat='' to disable all formats Also permit empty formats, such as --varformat=',', to be discarded instead of raising an Exception. Fixes #83 --- dennis/cmdline.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dennis/cmdline.py b/dennis/cmdline.py index 4b26b9e..8510928 100644 --- a/dennis/cmdline.py +++ b/dennis/cmdline.py @@ -75,7 +75,7 @@ def err(*s): def format_formats(): formats = sorted(get_available_formats().items()) lines = [ - 'Available Variable Formats:', + 'Available Variable Formats (All enabled by default):', '', '\b', ] @@ -221,9 +221,11 @@ def lint(ctx, quiet, color, varformat, rules, excluderules, reporter, errorsonly # Remove excluded rules rules = [rule for rule in rules if rule not in excludes] + varformats = [item for item in varformat.split(',') if item] + # Build linters and lint - linter = Linter(varformat.split(','), rules) - templatelinter = TemplateLinter(varformat.split(','), rules) + linter = Linter(varformats, rules) + templatelinter = TemplateLinter(varformats, rules) po_files = [] for item in path: @@ -508,8 +510,10 @@ def translate(ctx, varformat, pipeline, strings, path): if not path: raise click.UsageError('nothing to work on. Use --help for help.') + varformats = [item for item in varformat.split(',') if item] + try: - translator = Translator(varformat.split(','), pipeline.split(',')) + translator = Translator(varformats, pipeline.split(',')) except InvalidPipeline as ipe: raise click.UsageError(ipe.args[0])