summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-09-07 00:14:14 +0000
committerGerrit Code Review <review@openstack.org>2014-09-07 00:14:14 +0000
commit83c934fe3432cb7ebe6417c50059102c87cedf94 (patch)
treea3aa3f1efe5f38c70ae60ede3892c07aba54555e
parentd95c74d421f751d5019beff15b148a73152bf8d2 (diff)
parent5ad372989570f87a5bb603be63821cd59cd12250 (diff)
Merge "Use list of FILE_PATTERNS as default for --extension"
-rw-r--r--doc8/main.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/doc8/main.py b/doc8/main.py
index dc2bd75..d964116 100644
--- a/doc8/main.py
+++ b/doc8/main.py
@@ -184,7 +184,7 @@ def main():
184 metavar="extension", 184 metavar="extension",
185 help="check file extensions of the given type" 185 help="check file extensions of the given type"
186 " (default: %s)" % ", ".join(FILE_PATTERNS), 186 " (default: %s)" % ", ".join(FILE_PATTERNS),
187 default=[]) 187 default=list(FILE_PATTERNS))
188 parser.add_argument("-v", "--verbose", dest="verbose", action='store_true', 188 parser.add_argument("-v", "--verbose", dest="verbose", action='store_true',
189 help="run in verbose mode", default=False) 189 help="run in verbose mode", default=False)
190 parser.add_argument("--version", dest="version", action='store_true', 190 parser.add_argument("--version", dest="version", action='store_true',
@@ -201,8 +201,6 @@ def main():
201 args['extension'].extend(cfg.pop('extension', [])) 201 args['extension'].extend(cfg.pop('extension', []))
202 args['ignore_path'].extend(cfg.pop('ignore_path', [])) 202 args['ignore_path'].extend(cfg.pop('ignore_path', []))
203 args.update(cfg) 203 args.update(cfg)
204 if not args.get('extension'):
205 args['extension'] = list(FILE_PATTERNS)
206 setup_logging(args.get('verbose')) 204 setup_logging(args.get('verbose'))
207 205
208 print("Scanning...") 206 print("Scanning...")