diff --git a/readthedocs/api/utils.py b/readthedocs/api/utils.py index 7d0ca23ff..1daa2deb9 100644 --- a/readthedocs/api/utils.py +++ b/readthedocs/api/utils.py @@ -52,7 +52,7 @@ class EnhancedModelResource(ModelResource): class OwnerAuthorization(Authorization): def apply_limits(self, request, object_list): if request and hasattr(request, 'user') and request.method != 'GET': - if request.user.is_authenticated(): + if request.user.is_authenticated: object_list = object_list.filter(users__in=[request.user]) else: object_list = object_list.none() diff --git a/readthedocs/builds/querysets.py b/readthedocs/builds/querysets.py index 9a3482694..34408b9d9 100644 --- a/readthedocs/builds/querysets.py +++ b/readthedocs/builds/querysets.py @@ -21,7 +21,7 @@ class VersionQuerySetBase(models.QuerySet): def _add_user_repos(self, queryset, user): if user.has_perm('builds.view_version'): return self.all().distinct() - if user.is_authenticated(): + if user.is_authenticated: user_queryset = get_objects_for_user(user, 'builds.view_version') queryset = user_queryset | queryset return queryset.distinct() @@ -84,7 +84,7 @@ class BuildQuerySetBase(models.QuerySet): def _add_user_repos(self, queryset, user=None): if user.has_perm('builds.view_version'): return self.all().distinct() - if user.is_authenticated(): + if user.is_authenticated: user_queryset = get_objects_for_user(user, 'builds.view_version') pks = user_queryset.values_list('pk', flat=True) queryset = self.filter(version__pk__in=pks) | queryset @@ -116,7 +116,7 @@ class RelatedBuildQuerySetBase(models.QuerySet): def _add_user_repos(self, queryset, user=None): if user.has_perm('builds.view_version'): return self.all().distinct() - if user.is_authenticated(): + if user.is_authenticated: user_queryset = get_objects_for_user(user, 'builds.view_version') pks = user_queryset.values_list('pk', flat=True) queryset = self.filter( diff --git a/readthedocs/core/utils/tasks/permission_checks.py b/readthedocs/core/utils/tasks/permission_checks.py index ce2a2dffd..1643e8660 100644 --- a/readthedocs/core/utils/tasks/permission_checks.py +++ b/readthedocs/core/utils/tasks/permission_checks.py @@ -5,7 +5,7 @@ __all__ = ('user_id_matches',) def user_id_matches(request, state, context): # pylint: disable=unused-argument user_id = context.get('user_id', None) - if user_id is not None and request.user.is_authenticated(): + if user_id is not None and request.user.is_authenticated: if request.user.id == user_id: return True return False diff --git a/readthedocs/notifications/storages.py b/readthedocs/notifications/storages.py index 812b1175c..1755db952 100644 --- a/readthedocs/notifications/storages.py +++ b/readthedocs/notifications/storages.py @@ -68,7 +68,7 @@ class FallbackUniqueStorage(FallbackStorage): def add(self, level, message, extra_tags='', *args, **kwargs): # noqa user = kwargs.get('user') or self.request.user - if not user.is_anonymous(): + if not user.is_anonymous: persist_messages = (PersistentMessage.objects .filter(message=message, user=user, @@ -136,7 +136,7 @@ class NonPersistentStorage(PersistentStorage): user = kwargs.get("user") or self.get_user() try: - anonymous = user.is_anonymous() + anonymous = user.is_anonymous except TypeError: anonymous = user.is_anonymous if anonymous: diff --git a/readthedocs/oauth/querysets.py b/readthedocs/oauth/querysets.py index f916889d4..d01703eb1 100644 --- a/readthedocs/oauth/querysets.py +++ b/readthedocs/oauth/querysets.py @@ -13,7 +13,7 @@ class RelatedUserQuerySetBase(models.QuerySet): def api(self, user=None): """Return objects for user""" - if not user.is_authenticated(): + if not user.is_authenticated: return self.none() return self.filter(users=user) diff --git a/readthedocs/projects/querysets.py b/readthedocs/projects/querysets.py index 3eabcf5b2..ababa7641 100644 --- a/readthedocs/projects/querysets.py +++ b/readthedocs/projects/querysets.py @@ -19,7 +19,7 @@ class ProjectQuerySetBase(models.QuerySet): def _add_user_repos(self, queryset, user): if user.has_perm('projects.view_project'): return self.all().distinct() - if user.is_authenticated(): + if user.is_authenticated: user_queryset = get_objects_for_user(user, 'projects.view_project') queryset = user_queryset | queryset return queryset.distinct() @@ -32,7 +32,7 @@ class ProjectQuerySetBase(models.QuerySet): return queryset def for_admin_user(self, user): - if user.is_authenticated(): + if user.is_authenticated: return self.filter(users__in=[user]) return self.none() @@ -83,7 +83,7 @@ class RelatedProjectQuerySetBase(models.QuerySet): # Hack around get_objects_for_user not supporting global perms if user.has_perm('projects.view_project'): return self.all().distinct() - if user.is_authenticated(): + if user.is_authenticated: # Add in possible user-specific views project_qs = get_objects_for_user(user, 'projects.view_project') pks = project_qs.values_list('pk', flat=True) diff --git a/readthedocs/projects/views/public.py b/readthedocs/projects/views/public.py index e5a3e2bf5..62f3ca3d4 100644 --- a/readthedocs/projects/views/public.py +++ b/readthedocs/projects/views/public.py @@ -221,7 +221,7 @@ def elastic_project_search(request, project_slug): query = request.GET.get('q', None) if query: user = '' - if request.user.is_authenticated(): + if request.user.is_authenticated: user = request.user log.info( LOG_TEMPLATE.format( diff --git a/readthedocs/restapi/serializers.py b/readthedocs/restapi/serializers.py index 1f7607c04..cc16a0ac9 100644 --- a/readthedocs/restapi/serializers.py +++ b/readthedocs/restapi/serializers.py @@ -169,7 +169,7 @@ class RemoteRepositorySerializer(serializers.ModelSerializer): def get_matches(self, obj): request = self.context['request'] - if request.user is not None and request.user.is_authenticated(): + if request.user is not None and request.user.is_authenticated: return obj.matches(request.user) diff --git a/readthedocs/restapi/views/integrations.py b/readthedocs/restapi/views/integrations.py index 60bb4e9a9..3e44530d3 100644 --- a/readthedocs/restapi/views/integrations.py +++ b/readthedocs/restapi/views/integrations.py @@ -374,7 +374,7 @@ class APIWebhookView(WebhookMixin, APIView): the integration token to be specified as a POST argument. """ # If the user is not an admin of the project, fall back to token auth - if self.request.user.is_authenticated(): + if self.request.user.is_authenticated: try: return (Project.objects .for_admin_user(self.request.user) diff --git a/readthedocs/search/views.py b/readthedocs/search/views.py index 7d3a51d5f..bac1969e8 100644 --- a/readthedocs/search/views.py +++ b/readthedocs/search/views.py @@ -72,7 +72,7 @@ def elastic_search(request): if user_input.query: user = '' - if request.user.is_authenticated(): + if request.user.is_authenticated: user = request.user log.info( LOG_TEMPLATE.format(