Merge "Use list of FILE_PATTERNS as default for --extension"

This commit is contained in:
Jenkins 2014-09-07 00:14:14 +00:00 committed by Gerrit Code Review
commit 83c934fe34
1 changed files with 1 additions and 3 deletions

View File

@ -184,7 +184,7 @@ def main():
metavar="extension", metavar="extension",
help="check file extensions of the given type" help="check file extensions of the given type"
" (default: %s)" % ", ".join(FILE_PATTERNS), " (default: %s)" % ", ".join(FILE_PATTERNS),
default=[]) default=list(FILE_PATTERNS))
parser.add_argument("-v", "--verbose", dest="verbose", action='store_true', parser.add_argument("-v", "--verbose", dest="verbose", action='store_true',
help="run in verbose mode", default=False) help="run in verbose mode", default=False)
parser.add_argument("--version", dest="version", action='store_true', parser.add_argument("--version", dest="version", action='store_true',
@ -201,8 +201,6 @@ def main():
args['extension'].extend(cfg.pop('extension', [])) args['extension'].extend(cfg.pop('extension', []))
args['ignore_path'].extend(cfg.pop('ignore_path', [])) args['ignore_path'].extend(cfg.pop('ignore_path', []))
args.update(cfg) args.update(cfg)
if not args.get('extension'):
args['extension'] = list(FILE_PATTERNS)
setup_logging(args.get('verbose')) setup_logging(args.get('verbose'))
print("Scanning...") print("Scanning...")