From 67cd78e55cf77146d88f9f30e02add37743daa4c Mon Sep 17 00:00:00 2001 From: Barry Warsaw Date: Thu, 29 Apr 2010 18:53:15 -0400 Subject: [PATCH] Slightly different way to default to curdir. --- sphinx/setup_command.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx/setup_command.py b/sphinx/setup_command.py index 67f2b67d4..612c6060f 100644 --- a/sphinx/setup_command.py +++ b/sphinx/setup_command.py @@ -85,18 +85,21 @@ class BuildDoc(Command): self.config_dir = None def _guess_source_dir(self): - for guess in ('doc', 'docs', '.'): + 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 + return None def finalize_options(self): if self.source_dir is None: self.source_dir = self._guess_source_dir() 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 = os.path.abspath(self.source_dir) if self.config_dir is None: self.config_dir = self.source_dir