Merge branch 'master' into humitos/pulling-cache-status

Author: humitos

readthedocs/projects/tasks.py

@@ -123,17 +123,9 @@ def pull_cached_environment(self, environment):
                     'msg': msg,
                 }
             )
-            _, tmp_filename = tempfile.mkstemp(suffix='.tar')
             remote_fd = storage.open(filename, mode='rb')
-            with open(tmp_filename, mode='wb') as local_fd:
-                local_fd.write(remote_fd.read())
-
-            with tarfile.open(tmp_filename) as tar:
-                tar.extractall(self.version.project.doc_path)
-
-            # Cleanup the temporary file
-            if os.path.exists(tmp_filename):
-                os.remove(tmp_filename)
+            with tarfile.open(fileobj=remote_fd) as tar:
+                tar.extractall(self.project.doc_path)
 
     def push_cached_environment(self, environment):
         if not self.project.has_feature(feature_id=Feature.CACHED_ENVIRONMENT):

readthedocs/proxito/views/serve.py

@@ -261,7 +261,11 @@ def get(self, request, proxito_path, template_name='404.html'):
         # If that doesn't work, attempt to serve the 404 of the current version (version_slug)
         # Secondly, try to serve the 404 page for the default version
         # (project.get_default_version())
-        for version_slug_404 in set([version_slug, final_project.get_default_version()]):
+        versions = [version_slug]
+        default_version_slug = final_project.get_default_version()
+        if default_version_slug != version_slug:
+            versions.append(default_version_slug)
+        for version_slug_404 in versions:
             for tryfile in ('404.html', '404/index.html'):
                 storage_root_path = final_project.get_storage_path(
                     type_='html',