From be1f7103cb94ad4000cb495b501066b7a568b24e Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 7 Feb 2010 23:40:40 +0100 Subject: Allow auto-detecting "docs" as sphinx source dir. --- sphinx/setup_command.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'sphinx/setup_command.py') diff --git a/sphinx/setup_command.py b/sphinx/setup_command.py index 1b434fa2..d569b031 100644 --- a/sphinx/setup_command.py +++ b/sphinx/setup_command.py @@ -41,14 +41,18 @@ class BuildDoc(Command): self.conf_file_name = 'conf.py' self.builder = 'html' + def _guess_source_dir(self): + for guess in ('doc', 'docs'): + if not os.path.isdir(guess): + continue + for root, dirnames, filenames in os.walk(guess): + if 'conf.py' in filenames: + return root + def finalize_options(self): if self.source_dir is None: - if os.path.isdir('doc'): - for root, dirnames, filenames in os.walk('doc'): - if 'conf.py' in filenames: - self.source_dir = root - self.announce('Using source directory %s' % root) - break + self.source_dir = self._guess_source_dir() + self.announce('Using source directory %s' % self.source_dir) self.ensure_dirname('source_dir') self.source_dir = os.path.abspath(self.source_dir) -- cgit v1.2.1