Make the upload_docs command fallback on docs/ if doc/ is not found

2 files changed, 15 insertions, 0 deletions

diff --git a/distutils2/command/upload_docs.py b/distutils2/command/upload_docs.py
index d53dd03..79f204f 100644
--- a/distutils2/command/upload_docs.py
+++ b/distutils2/command/upload_docs.py
@@ -84,6 +84,8 @@ class upload_docs(Command):
         if self.upload_dir is None:
             build = self.get_finalized_command('build')
             self.upload_dir = os.path.join(build.build_base, "docs")
+            if not os.path.isdir(self.upload_dir):
+                self.upload_dir = os.path.join(build.build_base, "doc")
         self.announce('Using upload directory %s' % self.upload_dir)
         self.verify_upload_dir(self.upload_dir)
         config = read_pypirc(self.repository, self.realm)
diff --git a/distutils2/tests/test_upload_docs.py b/distutils2/tests/test_upload_docs.py
index f7e323d..2f5055e 100644
--- a/distutils2/tests/test_upload_docs.py
+++ b/distutils2/tests/test_upload_docs.py
@@ -76,6 +76,19 @@ class UploadDocsTestCase(support.TempdirManager, support.EnvironGuard,
         finally:
             os.chdir(previous)
 
+    def test_default_uploaddir_looks_for_doc_also(self):
+        sandbox = self.mkdtemp()
+        previous = os.getcwd()
+        os.chdir(sandbox)
+        try:
+            os.mkdir("build")
+            self.prepare_sample_dir("build")
+            os.rename(os.path.join("build", "docs"), os.path.join("build", "doc"))
+            self.cmd.ensure_finalized()
+            self.assertEqual(self.cmd.upload_dir, os.path.join("build", "doc"))
+        finally:
+            os.chdir(previous)
+
     def prepare_sample_dir(self, sample_dir=None):
         if sample_dir is None:
             sample_dir = self.mkdtemp()