From bb2efdb74ba0fa519f05c031b3747bc05fb93d4e Mon Sep 17 00:00:00 2001 From: Levi Payne Date: Tue, 3 Oct 2017 21:43:02 -0400 Subject: [PATCH] Extract modern code from is_anonymous() in compat.py and remove --- rest_framework/compat.py | 7 ------- tests/test_request.py | 5 ++--- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index b3db7e9b8..42a22f749 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -115,13 +115,6 @@ def _resolve_model(obj): raise ValueError("{0} is not a Django model".format(obj)) -# TODO: Remove -def is_anonymous(user): - if django.VERSION < (1, 10): - return user.is_anonymous() - return user.is_anonymous - - # TODO: Remove def get_related_model(field): if django.VERSION < (1, 9): diff --git a/tests/test_request.py b/tests/test_request.py index 208d2737e..a87060df1 100644 --- a/tests/test_request.py +++ b/tests/test_request.py @@ -16,7 +16,6 @@ from django.utils import six from rest_framework import status from rest_framework.authentication import SessionAuthentication -from rest_framework.compat import is_anonymous from rest_framework.parsers import BaseParser, FormParser, MultiPartParser from rest_framework.request import Request from rest_framework.response import Response @@ -201,9 +200,9 @@ class TestUserSetter(TestCase): def test_user_can_logout(self): self.request.user = self.user - self.assertFalse(is_anonymous(self.request.user)) + self.assertFalse(self.request.user.is_anonymous) logout(self.request) - self.assertTrue(is_anonymous(self.request.user)) + self.assertTrue(self.request.user.is_anonymous) def test_logged_in_user_is_set_on_wrapped_request(self): login(self.request, self.user)