diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2018-01-13 15:26:21 +0900 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2018-01-13 15:26:21 +0900 |
| commit | 6d29b3814037a506750c404413ebcc5d78e1857c (patch) | |
| tree | d5c57d29824df3a9b1bd095c9a3018069aaf078b /sphinx/setup_command.py | |
| parent | 19efb4a39810f1035d9d891f26154c74c6b54a89 (diff) | |
| parent | 822a04de9c407c5263e7e94eb9ab5a6602cb2861 (diff) | |
| download | sphinx-git-6d29b3814037a506750c404413ebcc5d78e1857c.tar.gz | |
Merge branch 'master' into sphinx-build-set-proc-count-to-cpu-count
Diffstat (limited to 'sphinx/setup_command.py')
| -rw-r--r-- | sphinx/setup_command.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sphinx/setup_command.py b/sphinx/setup_command.py index d219a14d9..cd89fe7f7 100644 --- a/sphinx/setup_command.py +++ b/sphinx/setup_command.py @@ -8,7 +8,7 @@ :author: Sebastian Wiesner :contact: basti.wiesner@gmx.net - :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS. + :copyright: Copyright 2007-2018 by the Sphinx team, see AUTHORS. :license: BSD, see LICENSE for details. """ from __future__ import print_function @@ -136,8 +136,8 @@ class BuildDoc(Command): # type: () -> None if self.source_dir is None: self.source_dir = self._guess_source_dir() - self.announce('Using source directory %s' % self.source_dir) # type: ignore - self.ensure_dirname('source_dir') # type: ignore + self.announce('Using source directory %s' % self.source_dir) + self.ensure_dirname('source_dir') if self.source_dir is None: self.source_dir = os.curdir self.source_dir = abspath(self.source_dir) @@ -145,10 +145,10 @@ class BuildDoc(Command): self.config_dir = self.source_dir self.config_dir = abspath(self.config_dir) - self.ensure_string_list('builder') # type: ignore + self.ensure_string_list('builder') if self.build_dir is None: - build = self.get_finalized_command('build') # type: ignore - self.build_dir = os.path.join(abspath(build.build_base), 'sphinx') + build = self.get_finalized_command('build') + self.build_dir = os.path.join(abspath(build.build_base), 'sphinx') # type: ignore self.mkpath(self.build_dir) # type: ignore self.build_dir = abspath(self.build_dir) self.doctree_dir = os.path.join(self.build_dir, 'doctrees') |