QuerySets: remove unused overrides (#8299)

We don't user these in .com

Author: stsewd

readthedocs/builds/managers.py

@@ -6,12 +6,7 @@
 from django.db import models
 from polymorphic.managers import PolymorphicManager
 
-from readthedocs.core.utils.extend import (
-    SettingsOverrideObject,
-    get_override_class,
-)
-
-from .constants import (
+from readthedocs.builds.constants import (
     BRANCH,
     EXTERNAL,
     LATEST,
@@ -20,16 +15,16 @@
     STABLE_VERBOSE_NAME,
     TAG,
 )
-from .querysets import BuildQuerySet, VersionQuerySet
-
+from readthedocs.builds.querysets import VersionQuerySet
+from readthedocs.core.utils.extend import get_override_class
 
 log = logging.getLogger(__name__)
 
 
 __all__ = ['VersionManager']
 
 
-class VersionManagerBase(models.Manager):
+class VersionManager(models.Manager):
 
     """
     Version manager for manager only queries.
@@ -86,7 +81,7 @@ def get_object_or_log(self, **kwargs):
             log.warning('Version not found for given kwargs. %s', kwargs)
 
 
-class InternalVersionManagerBase(VersionManagerBase):
+class InternalVersionManager(VersionManager):
 
     """
     Version manager that only includes internal version.
@@ -99,7 +94,7 @@ def get_queryset(self):
         return super().get_queryset().exclude(type=EXTERNAL)
 
 
-class ExternalVersionManagerBase(VersionManagerBase):
+class ExternalVersionManager(VersionManager):
 
     """
     Version manager that only includes external version.
@@ -111,40 +106,7 @@ def get_queryset(self):
         return super().get_queryset().filter(type=EXTERNAL)
 
 
-class VersionManager(SettingsOverrideObject):
-    _default_class = VersionManagerBase
-    _override_setting = 'VERSION_MANAGER'
-
-
-class InternalVersionManager(SettingsOverrideObject):
-    _default_class = InternalVersionManagerBase
-
-
-class ExternalVersionManager(SettingsOverrideObject):
-    _default_class = ExternalVersionManagerBase
-
-
-class BuildManagerBase(models.Manager):
-
-    """
-    Build manager for manager only queries.
-
-    For creating different Managers.
-    """
-
-    @classmethod
-    def from_queryset(cls, queryset_class, class_name=None):
-        # This is overridden because :py:meth:`models.Manager.from_queryset`
-        # uses `inspect` to retrieve the class methods, and the proxy class has
-        # no direct members.
-        queryset_class = get_override_class(
-            BuildQuerySet,
-            BuildQuerySet._default_class,  # pylint: disable=protected-access
-        )
-        return super().from_queryset(queryset_class, class_name)
-
-
-class InternalBuildManagerBase(BuildManagerBase):
+class InternalBuildManager(models.Manager):
 
     """
     Build manager that only includes internal version builds.
@@ -157,7 +119,7 @@ def get_queryset(self):
         return super().get_queryset().exclude(version__type=EXTERNAL)
 
 
-class ExternalBuildManagerBase(BuildManagerBase):
+class ExternalBuildManager(models.Manager):
 
     """
     Build manager that only includes external version builds.
@@ -169,18 +131,6 @@ def get_queryset(self):
         return super().get_queryset().filter(version__type=EXTERNAL)
 
 
-class BuildManager(SettingsOverrideObject):
-    _default_class = BuildManagerBase
-
-
-class InternalBuildManager(SettingsOverrideObject):
-    _default_class = InternalBuildManagerBase
-
-
-class ExternalBuildManager(SettingsOverrideObject):
-    _default_class = ExternalBuildManagerBase
-
-
 class VersionAutomationRuleManager(PolymorphicManager):
 
     """

readthedocs/builds/models.py

@@ -46,7 +46,6 @@
 )
 from readthedocs.builds.managers import (
     AutomationRuleMatchManager,
-    BuildManager,
     ExternalBuildManager,
     ExternalVersionManager,
     InternalBuildManager,
@@ -680,7 +679,7 @@ class Build(models.Model):
     )
 
     # Managers
-    objects = BuildManager.from_queryset(BuildQuerySet)()
+    objects = BuildQuerySet.as_manager()
     # Only include BRANCH, TAG, UNKNOWN type Version builds.
     internal = InternalBuildManager.from_queryset(BuildQuerySet)()
     # Only include EXTERNAL type Version builds.

readthedocs/builds/querysets.py

@@ -121,7 +121,7 @@ class VersionQuerySet(SettingsOverrideObject):
     _default_class = VersionQuerySetBase
 
 
-class BuildQuerySetBase(models.QuerySet):
+class BuildQuerySet(models.QuerySet):
 
     """
     Build objects that are privacy aware.
@@ -241,10 +241,6 @@ def concurrent(self, project):
         return (limit_reached, concurrent, max_concurrent)
 
 
-class BuildQuerySet(SettingsOverrideObject):
-    _default_class = BuildQuerySetBase
-
-
 class RelatedBuildQuerySet(models.QuerySet):
 
     """

readthedocs/oauth/querysets.py

@@ -1,13 +1,9 @@
-# -*- coding: utf-8 -*-
-
 """Managers for OAuth models."""
 
 from django.db import models
 
-from readthedocs.core.utils.extend import SettingsOverrideObject
-
 
-class RelatedUserQuerySetBase(models.QuerySet):
+class RelatedUserQuerySet(models.QuerySet):
 
     """For models with relations through :py:class:`User`."""
 
@@ -18,11 +14,6 @@ def api(self, user=None):
         return self.filter(users=user)
 
 
-class RelatedUserQuerySet(SettingsOverrideObject):
-    _default_class = RelatedUserQuerySetBase
-    _override_setting = 'RELATED_USER_MANAGER'
-
-
 class RemoteRepositoryQuerySet(RelatedUserQuerySet):
     pass
 

readthedocs/projects/models.py

@@ -34,7 +34,6 @@
 from readthedocs.projects.querysets import (
     ChildRelatedProjectQuerySet,
     FeatureQuerySet,
-    HTMLFileQuerySet,
     ProjectQuerySet,
     RelatedProjectQuerySet,
 )
@@ -1433,7 +1432,7 @@ class HTMLFile(ImportedFile):
     class Meta:
         proxy = True
 
-    objects = HTMLFileManager.from_queryset(HTMLFileQuerySet)()
+    objects = HTMLFileManager()
 
     def get_processed_json(self):
         parser_class = (

readthedocs/projects/querysets.py

@@ -4,7 +4,6 @@
 from django.db import models
 from django.db.models import OuterRef, Prefetch, Q, Subquery
 
-from readthedocs.builds.constants import EXTERNAL
 from readthedocs.core.permissions import AdminPermission
 from readthedocs.core.utils.extend import SettingsOverrideObject
 from readthedocs.projects import constants
@@ -217,23 +216,3 @@ def for_project(self, project):
             Q(default_true=True, add_date__gt=project.pub_date) |
             Q(future_default_true=True, add_date__lte=project.pub_date)
         ).distinct()
-
-
-class HTMLFileQuerySet(models.QuerySet):
-
-    def internal(self):
-        """
-        HTMLFileQuerySet method that only includes internal version html files.
-
-        It will exclude pull request/merge request Version html files from the queries
-        and only include BRANCH, TAG, UNKNOWN type Version html files.
-        """
-        return self.exclude(version__type=EXTERNAL)
-
-    def external(self):
-        """
-        HTMLFileQuerySet method that only includes external version html files.
-
-        It will only include pull request/merge request Version html files in the queries.
-        """
-        return self.filter(version__type=EXTERNAL)

readthedocs/rtd_tests/tests/test_managers.py

@@ -5,8 +5,7 @@
 from readthedocs.builds.constants import EXTERNAL
 from readthedocs.builds.models import Build, Version
 from readthedocs.projects.constants import PRIVATE, PUBLIC
-from readthedocs.projects.models import HTMLFile, Project
-
+from readthedocs.projects.models import Project
 
 User = get_user_model()
 
@@ -331,56 +330,3 @@ def test_api(self):
         }
         self.assertEqual(query.count(), len(builds))
         self.assertEqual(set(query), builds)
-
-
-class TestHTMLFileManager(TestCase):
-
-    fixtures = ['test_data', 'eric']
-
-    def setUp(self):
-        self.user = User.objects.create(username='test_user', password='test')
-        self.client.login(username='test_user', password='test')
-        self.pip = Project.objects.get(slug='pip')
-        # Create a External Version. ie: pull/merge request Version.
-        self.external_version = get(
-            Version,
-            project=self.pip,
-            active=True,
-            type=EXTERNAL,
-            privacy_level=PUBLIC
-        )
-        self.internal_version = get(
-            Version,
-            project=self.pip,
-            active=True,
-            privacy_level=PUBLIC
-        )
-        self.external_html_file = HTMLFile.objects.create(
-            project=self.pip,
-            version=self.external_version,
-            name='file.html',
-            path='file.html',
-            commit='1234567890abcdef',
-        )
-        self.internal_html_file = HTMLFile.objects.create(
-            project=self.pip,
-            version=self.internal_version,
-            name='file.html',
-            path='file.html',
-            commit='1234567890abcdef',
-        )
-
-    def test_internal_html_file_queryset(self):
-        """
-        It will exclude pull/merge request Version html files from the queries
-        and only include BRANCH, TAG, UNKNOWN type Version files.
-        """
-        self.assertNotIn(self.external_html_file, HTMLFile.objects.internal())
-        self.assertIn(self.internal_html_file, HTMLFile.objects.internal())
-
-    def test_external_html_file_queryset(self):
-        """
-        It will only include pull/merge request Version html files in the queries.
-        """
-        self.assertNotIn(self.internal_html_file, HTMLFile.objects.external())
-        self.assertIn(self.external_html_file, HTMLFile.objects.external())

readthedocs/search/documents.py

@@ -170,16 +170,10 @@ def prepare_domains(self, html_file):
         return all_domains
 
     def get_queryset(self):
-        """
-        Ignore certain files from indexing.
-
-        - Files from external versions
-        - Ignored files
-        """
+        """Don't include ignored files."""
         queryset = super().get_queryset()
         queryset = (
             queryset
-            .internal()
             .exclude(ignore=True)
             .select_related('version', 'project')
         )