Merge tag '4.0.3' into rel

Author: humitos

readthedocs/api/v2/templates/restapi/footer.html

@@ -126,7 +126,8 @@
       </dl>
       {% endblock %}
 
-
+      {% block auth %}
+      {% endblock %}
 
       <hr/>
       {% block footer %}

readthedocs/config/tests/test_config.py

@@ -4,7 +4,7 @@
 from collections import OrderedDict
 
 import pytest
-from mock import DEFAULT, patch
+from unittest.mock import DEFAULT, patch
 from pytest import raises
 
 from readthedocs.config import (

readthedocs/config/tests/test_validation.py

@@ -1,6 +1,6 @@
 import os
 
-from mock import patch
+from unittest.mock import patch
 from pytest import raises
 
 from readthedocs.config.validation import (

readthedocs/core/context_processors.py

@@ -17,5 +17,6 @@ def readthedocs_processor(request):
         'TEMPLATE_ROOT': settings.TEMPLATE_ROOT + '/',
         'DO_NOT_TRACK_ENABLED': settings.DO_NOT_TRACK_ENABLED,
         'USE_PROMOS': settings.USE_PROMOS,
+        'SUPPORT_EMAIL': settings.SUPPORT_EMAIL,
     }
     return exports

readthedocs/core/views/__init__.py

@@ -45,21 +45,6 @@ def get_context_data(self, **kwargs):
         return context
 
 
-class SupportView(TemplateView):
-    template_name = 'support.html'
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        support_email = settings.SUPPORT_EMAIL
-        if not support_email:
-            support_email = 'support@{domain}'.format(
-                domain=settings.PRODUCTION_DOMAIN
-            )
-
-        context['support_email'] = support_email
-        return context
-
-
 def wipe_version(request, project_slug, version_slug):
     version = get_object_or_404(
         Version.internal.all(),

readthedocs/gold/tests/test_forms.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import django_dynamic_fixture as fixture
-import mock
+from unittest import mock
 from django.contrib.auth.models import User
 from django.test import TestCase
 

readthedocs/gold/tests/test_signals.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import django_dynamic_fixture as fixture
-import mock
+from unittest import mock
 from django.contrib.auth.models import User
 from django.test import TestCase
 

readthedocs/proxito/tests/test_full.py

@@ -3,7 +3,7 @@
 import os
 
 import django_dynamic_fixture as fixture
-import mock
+from unittest import mock
 from django.conf import settings
 from django.http import HttpResponse
 from django.test.utils import override_settings

readthedocs/rtd_tests/base.py

@@ -11,7 +11,7 @@
 from django.contrib.messages.storage.fallback import FallbackStorage
 from django.contrib.sessions.middleware import SessionMiddleware
 from django.test import RequestFactory, TestCase
-from mock import patch
+from unittest.mock import patch
 
 
 log = logging.getLogger(__name__)

readthedocs/rtd_tests/mocks/environment.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # pylint: disable=missing-docstring
-import mock
+from unittest import mock
 
 
 class EnvironmentMockGroup:

readthedocs/rtd_tests/mocks/mock_api.py

@@ -2,7 +2,7 @@
 import json
 from contextlib import contextmanager
 
-import mock
+from unittest import mock
 
 
 # Mock tastypi API.

readthedocs/rtd_tests/mocks/paths.py

@@ -3,7 +3,7 @@
 import os
 import re
 
-import mock
+from unittest import mock
 
 
 def fake_paths(check):

readthedocs/rtd_tests/tests/projects/test_admin_actions.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import django_dynamic_fixture as fixture
-import mock
+from unittest import mock
 from django import urls
 from django.contrib.admin.helpers import ACTION_CHECKBOX_NAME
 from django.contrib.auth.models import User

readthedocs/rtd_tests/tests/test_api.py

@@ -2,7 +2,7 @@
 import datetime
 import json
 
-import mock
+from unittest import mock
 from allauth.socialaccount.models import SocialAccount
 from django.contrib.auth.models import User
 from django.http import QueryDict

readthedocs/rtd_tests/tests/test_api_permissions.py

@@ -1,7 +1,7 @@
 from functools import partial
 from unittest import TestCase
 
-from mock import Mock
+from unittest.mock import Mock
 
 from readthedocs.api.v2.permissions import APIRestrictedPermission
 

readthedocs/rtd_tests/tests/test_automation_rules.py

@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 import pytest
 from django_dynamic_fixture import get
 

readthedocs/rtd_tests/tests/test_backend.py

@@ -7,7 +7,7 @@
 
 import django_dynamic_fixture as fixture
 from django.contrib.auth.models import User
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from readthedocs.builds.constants import EXTERNAL
 from readthedocs.builds.models import Version

readthedocs/rtd_tests/tests/test_build_forms.py

@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 from django.contrib.auth.models import User
 from django.test import TestCase
 from django.urls import reverse

readthedocs/rtd_tests/tests/test_build_notifications.py

@@ -6,7 +6,7 @@
 import django_dynamic_fixture as fixture
 from django.core import mail
 from django.test import TestCase
-from mock import patch
+from unittest.mock import patch
 
 from readthedocs.builds.models import Build, Version
 from readthedocs.projects.forms import WebHookForm

readthedocs/rtd_tests/tests/test_builds.py

@@ -2,7 +2,7 @@
 import datetime
 import os
 
-import mock
+from unittest import mock
 from django.contrib.auth.models import User
 from django.test import TestCase
 from django_dynamic_fixture import fixture, get

readthedocs/rtd_tests/tests/test_celery.py

@@ -7,7 +7,7 @@
 from django.contrib.auth.models import User
 from django_dynamic_fixture import get
 from messages_extends.models import Message
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 
 from readthedocs.builds.constants import (
     BUILD_STATE_TRIGGERED,

readthedocs/rtd_tests/tests/test_config_integration.py

@@ -1,12 +1,12 @@
 import tempfile
 from os import path
 
-import mock
+from unittest import mock
 import pytest
 import yaml
 from django.test import TestCase
 from django_dynamic_fixture import get
-from mock import MagicMock, PropertyMock, patch
+from unittest.mock import MagicMock, PropertyMock, patch
 
 from readthedocs.builds.constants import BUILD_STATE_TRIGGERED, EXTERNAL
 from readthedocs.builds.models import Version

readthedocs/rtd_tests/tests/test_core_tags.py

@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 import pytest
 from django.conf import settings
 from django.test import TestCase

readthedocs/rtd_tests/tests/test_core_utils.py

@@ -2,11 +2,11 @@
 
 import os
 
-import mock
+from unittest import mock
 from django.http import Http404
 from django.test import TestCase
 from django_dynamic_fixture import get
-from mock import call
+from unittest.mock import call
 
 from readthedocs.builds.constants import LATEST
 from readthedocs.builds.models import Version

readthedocs/rtd_tests/tests/test_doc_builder.py

@@ -2,14 +2,14 @@
 import tempfile
 from collections import namedtuple
 
-import mock
+from unittest import mock
 import py
 import pytest
 import yaml
 from django.test import TestCase
 from django.test.utils import override_settings
 from django_dynamic_fixture import get
-from mock import patch
+from unittest.mock import patch
 
 from readthedocs.builds.models import Version
 from readthedocs.doc_builder.backends.mkdocs import MkdocsHTML

readthedocs/rtd_tests/tests/test_doc_building.py

@@ -12,13 +12,13 @@
 import tempfile
 import uuid
 
-import mock
+from unittest import mock
 import pytest
 from django.test import TestCase
 from django_dynamic_fixture import get
 from docker.errors import APIError as DockerAPIError
 from docker.errors import DockerException
-from mock import Mock, PropertyMock, mock_open, patch
+from unittest.mock import Mock, PropertyMock, mock_open, patch
 
 from readthedocs.builds.constants import BUILD_STATE_CLONING
 from readthedocs.builds.models import Version

readthedocs/rtd_tests/tests/test_doc_serving.py

@@ -1,14 +1,14 @@
 import os
 
 import django_dynamic_fixture as fixture
-import mock
+from unittest import mock
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.http import Http404, HttpResponse
 from django.test import RequestFactory, TestCase
 from django.test.utils import override_settings
 from django.urls import reverse
-from mock import mock_open, patch
+from unittest.mock import mock_open, patch
 
 from readthedocs.builds.constants import LATEST, EXTERNAL, INTERNAL
 from readthedocs.builds.models import Version

readthedocs/rtd_tests/tests/test_footer.py

@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 from django.contrib.sessions.backends.base import SessionBase
 from django.test import TestCase
 from django.test.utils import override_settings

readthedocs/rtd_tests/tests/test_imported_file.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
-import mock
+from unittest import mock
 
 from django.conf import settings
 from django.core.files.storage import get_storage_class

readthedocs/rtd_tests/tests/test_notifications.py

@@ -3,7 +3,7 @@
 
 
 import django_dynamic_fixture as fixture
-import mock
+from unittest import mock
 from django.contrib.auth.models import AnonymousUser, User
 from django.http import HttpRequest
 from django.test import TestCase

readthedocs/rtd_tests/tests/test_oauth.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-import mock
+from unittest import mock
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.test import TestCase

readthedocs/rtd_tests/tests/test_oauth_tasks.py

@@ -7,7 +7,7 @@
 from django.contrib.auth.models import User
 from django.test import TestCase
 from django_dynamic_fixture import get
-from mock import patch
+from unittest.mock import patch
 
 from readthedocs.builds.models import Version
 from readthedocs.oauth.services.base import SyncServiceError

readthedocs/rtd_tests/tests/test_privacy.py

@@ -1,6 +1,6 @@
 import logging
 
-import mock
+from unittest import mock
 from django.contrib.auth.models import User
 from django.test import TestCase
 from django.test.utils import override_settings

readthedocs/rtd_tests/tests/test_privacy_urls.py

@@ -1,6 +1,6 @@
 import re
 
-import mock
+from unittest import mock
 from allauth.socialaccount.models import SocialAccount
 from django.contrib.admindocs.views import extract_views_from_urlpatterns
 from django.test import TestCase

readthedocs/rtd_tests/tests/test_project.py

@@ -6,7 +6,7 @@
 from django.test import TestCase
 from django.utils import timezone
 from django_dynamic_fixture import get
-from mock import patch
+from unittest.mock import patch
 from rest_framework.reverse import reverse
 
 from readthedocs.builds.constants import (

readthedocs/rtd_tests/tests/test_project_forms.py

@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 from django.contrib.auth.models import User
 from django.test import TestCase
 from django.test.utils import override_settings

readthedocs/rtd_tests/tests/test_project_symlinks.py

@@ -4,7 +4,7 @@
 import shutil
 import tempfile
 
-import mock
+from unittest import mock
 from django.conf import settings
 from django.test import TestCase, override_settings
 from django.urls import reverse

readthedocs/rtd_tests/tests/test_project_views.py

@@ -9,7 +9,7 @@
 from django.utils import timezone
 from django.views.generic.base import ContextMixin
 from django_dynamic_fixture import get, new
-from mock import patch
+from unittest.mock import patch
 
 from readthedocs.builds.constants import EXTERNAL, LATEST
 from readthedocs.builds.models import Build, Version

readthedocs/rtd_tests/tests/test_projects_tasks.py

@@ -2,7 +2,7 @@
 
 from django.test import TestCase
 from django_dynamic_fixture import get
-from mock import patch
+from unittest.mock import patch
 
 from readthedocs.builds.constants import EXTERNAL, BUILD_STATUS_SUCCESS
 from readthedocs.builds.models import Version, Build

readthedocs/rtd_tests/tests/test_resolver.py

@@ -1,5 +1,5 @@
 import django_dynamic_fixture as fixture
-import mock
+from unittest import mock
 from django.test import TestCase, override_settings
 
 from readthedocs.core.resolver import (

readthedocs/rtd_tests/tests/test_subprojects.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import django_dynamic_fixture as fixture
-import mock
+from unittest import mock
 from django.contrib.auth.models import User
 from django.test import TestCase
 from django.test.utils import override_settings

readthedocs/rtd_tests/tests/test_sync_versions.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import json
-import mock
+from unittest import mock
 
 from django.test import TestCase
 from django.urls import reverse