Merge pull request #7093 from readthedocs/fix-unresolver-index

Author: humitos

readthedocs/core/unresolver.py

@@ -55,6 +55,12 @@ def unresolve(self, url):
             filename=kwargs.get('filename', ''),
         )
 
+        # Handle our backend storage not supporting directory indexes,
+        # so we need to append index.html when appropriate.
+        if not filename or filename.endswith('/'):
+            # We need to add the index.html to find this actual file
+            filename += 'index.html'
+
         log.info(
             'Unresolver parsed: '
             'url=%s project=%s lang_slug=%s version_slug=%s filename=%s',

readthedocs/rtd_tests/tests/test_unresolver.py

@@ -47,15 +47,15 @@ def test_unresolver_domain(self):
         self.assertEqual(parts.project.slug, 'pip')
         self.assertEqual(parts.language_slug, 'en')
         self.assertEqual(parts.version_slug, 'latest')
-        self.assertEqual(parts.filename, '')
+        self.assertEqual(parts.filename, 'index.html')
 
     def test_unresolver_single_version(self):
         self.pip.single_version = True
         parts = unresolve('http://pip.readthedocs.io/')
         self.assertEqual(parts.project.slug, 'pip')
         self.assertEqual(parts.language_slug, None)
         self.assertEqual(parts.version_slug, None)
-        self.assertEqual(parts.filename, '')
+        self.assertEqual(parts.filename, 'index.html')
 
     def test_unresolver_subproject_alias(self):
         relation = self.pip.subprojects.first()
@@ -65,7 +65,7 @@ def test_unresolver_subproject_alias(self):
         self.assertEqual(parts.project.slug, 'sub')
         self.assertEqual(parts.language_slug, 'ja')
         self.assertEqual(parts.version_slug, 'latest')
-        self.assertEqual(parts.filename, '')
+        self.assertEqual(parts.filename, 'index.html')
 
     def test_unresolver_external_version(self):
         ver = self.pip.versions.first()
@@ -75,7 +75,7 @@ def test_unresolver_external_version(self):
         self.assertEqual(parts.project.slug, 'pip')
         self.assertEqual(parts.language_slug, 'en')
         self.assertEqual(parts.version_slug, '10')
-        self.assertEqual(parts.filename, '')
+        self.assertEqual(parts.filename, 'index.html')
 
     def test_unresolver_unknown_host(self):
         parts = unresolve('http://random.stuff.com/en/latest/')