diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2018-11-01 23:20:04 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-01 23:20:04 +0900 |
| commit | 66867111c8444d95cbd25e888077a5178cc1caa0 (patch) | |
| tree | 1d00d23c0069f6f8bb5631a5e6b2435212644dbd /sphinx/cmd/quickstart.py | |
| parent | 7a1516a8b0426d62a4c8ad2dcbe05f960af22bae (diff) | |
| parent | 01130900b5193b98fc9d088b9b7443228038ae12 (diff) | |
| download | sphinx-git-66867111c8444d95cbd25e888077a5178cc1caa0.tar.gz | |
Merge pull request #5581 from tk0miya/5557_quickstart_no_batchfile
Fix #5557: quickstart: --no-batchfile isn't honored
Diffstat (limited to 'sphinx/cmd/quickstart.py')
| -rw-r--r-- | sphinx/cmd/quickstart.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sphinx/cmd/quickstart.py b/sphinx/cmd/quickstart.py index e7a669557..61ca3b10f 100644 --- a/sphinx/cmd/quickstart.py +++ b/sphinx/cmd/quickstart.py @@ -543,7 +543,7 @@ Makefile to be used with sphinx-build. """)) parser.add_argument('-q', '--quiet', action='store_true', dest='quiet', - default=False, + default=None, help=__('quiet mode')) parser.add_argument('--version', action='version', dest='show_version', version='%%(prog)s %s' % __display_version__) @@ -552,7 +552,7 @@ Makefile to be used with sphinx-build. help=__('output path')) group = parser.add_argument_group(__('Structure options')) - group.add_argument('--sep', action='store_true', + group.add_argument('--sep', action='store_true', default=None, help=__('if specified, separate source and build dirs')) group.add_argument('--dot', metavar='DOT', help=__('replacement for dot in _templates etc.')) @@ -584,11 +584,11 @@ Makefile to be used with sphinx-build. action='append', help=__('enable arbitrary extensions')) group = parser.add_argument_group(__('Makefile and Batchfile creation')) - group.add_argument('--makefile', action='store_true', dest='makefile', + group.add_argument('--makefile', action='store_true', dest='makefile', default=None, help=__('create makefile')) group.add_argument('--no-makefile', action='store_false', dest='makefile', help=__('do not create makefile')) - group.add_argument('--batchfile', action='store_true', dest='batchfile', + group.add_argument('--batchfile', action='store_true', dest='batchfile', default=None, help=__('create batchfile')) group.add_argument('--no-batchfile', action='store_false', dest='batchfile', @@ -628,7 +628,7 @@ def main(argv=sys.argv[1:]): d = vars(args) # delete None or False value - d = dict((k, v) for k, v in d.items() if not (v is None or v is False)) + d = dict((k, v) for k, v in d.items() if v is not None) try: if 'quiet' in d: |