Removed safe property decorator

Signed-off-by: James Riley McHugh <mchugh_james@bah.com>

Author: James Riley McHugh

rest_framework/request.py

@@ -78,19 +78,6 @@ def wrap_attributeerrors():
         raise exc.with_traceback(info[2])
 
 
-def safe_property(func):
-    """
-    Property decorator to ensure AttributeErrors raised in properties aren't lost
-    """
-
-    @property
-    def new_func(self):
-        with wrap_attributeerrors():
-            return func(self)
-
-    return new_func
-
-
 class Empty:
     """
     Placeholder for unset attributes.
@@ -206,12 +193,12 @@ def __class_getitem__(cls, *args, **kwargs):
     def _default_negotiator(self):
         return api_settings.DEFAULT_CONTENT_NEGOTIATION_CLASS()
 
-    @safe_property
+    @property
     def content_type(self):
         meta = self._request.META
         return meta.get('CONTENT_TYPE', meta.get('HTTP_CONTENT_TYPE', ''))
 
-    @safe_property
+    @property
     def stream(self):
         """
         Returns an object that may be used to stream the request content.
@@ -220,27 +207,29 @@ def stream(self):
             self._load_stream()
         return self._stream
 
-    @safe_property
+    @property
     def query_params(self):
         """
         More semantically correct name for request.GET.
         """
         return self._request.GET
 
-    @safe_property
+    @property
     def data(self):
         if not _hasattr(self, '_full_data'):
-            self._load_data_and_files()
+            with wrap_attributeerrors():
+                self._load_data_and_files()
         return self._full_data
 
-    @safe_property
+    @property
     def user(self):
         """
         Returns the user associated with the current request, as authenticated
         by the authentication classes provided to the request.
         """
         if not hasattr(self, '_user'):
-            self._authenticate()
+            with wrap_attributeerrors():
+                self._authenticate()
         return self._user
 
     @user.setter
@@ -256,14 +245,15 @@ def user(self, value):
         self._user = value
         self._request.user = value
 
-    @safe_property
+    @property
     def auth(self):
         """
         Returns any non-user authentication information associated with the
         request, such as an authentication token.
         """
         if not hasattr(self, '_auth'):
-            self._authenticate()
+            with wrap_attributeerrors():
+                self._authenticate()
         return self._auth
 
     @auth.setter
@@ -275,14 +265,15 @@ def auth(self, value):
         self._auth = value
         self._request.auth = value
 
-    @safe_property
+    @property
     def successful_authenticator(self):
         """
         Return the instance of the authentication instance class that was used
         to authenticate the request, or `None`.
         """
         if not hasattr(self, '_authenticator'):
-            self._authenticate()
+            with wrap_attributeerrors():
+                self._authenticate()
         return self._authenticator
 
     def _load_data_and_files(self):
@@ -432,22 +423,24 @@ def __getattr__(self, attr):
         except AttributeError:
             raise AttributeError(f"'{self.__class__.__name__}' object has no attribute '{attr}'")
 
-    @safe_property
+    @property
     def POST(self):
         # Ensure that request.POST uses our request parsing.
         if not _hasattr(self, '_data'):
-            self._load_data_and_files()
+            with wrap_attributeerrors():
+                self._load_data_and_files()
         if is_form_media_type(self.content_type):
             return self._data
         return QueryDict('', encoding=self._request._encoding)
 
-    @safe_property
+    @property
     def FILES(self):
         # Leave this one alone for backwards compat with Django's request.FILES
         # Different from the other two cases, which are not valid property
         # names on the WSGIRequest class.
         if not _hasattr(self, '_files'):
-            self._load_data_and_files()
+            with wrap_attributeerrors():
+                self._load_data_and_files()
         return self._files
 
     def force_plaintext_errors(self, value):

tests/test_request.py

@@ -126,6 +126,25 @@ def test_standard_behaviour_determines_non_form_content_PUT(self):
         request.parsers = (PlainTextParser(), )
         assert request.data == content
 
+    def test_calling_data_fails_when_attribute_error_is_raised(self):
+        """
+        Ensure attribute errors raised when parsing are properly re-raised.
+        """
+        expected_message = "Internal error"
+
+        class BrokenParser:
+            media_type = "application/json"
+
+            def parse(self, *args, **kwargs):
+                raise AttributeError(expected_message)
+
+        http_request = factory.post('/', data={}, format="json")
+        request = Request(http_request)
+        request.parsers = (BrokenParser,)
+
+        with self.assertRaisesMessage(WrappedAttributeError, expected_message):
+            request.data
+
 
 class MockView(APIView):
     authentication_classes = (SessionAuthentication,)
@@ -347,22 +366,6 @@ def test_duplicate_request_form_data_access(self):
         assert request.content_type.startswith('multipart/form-data')
         assert response.data == {'a': ['b']}
 
-    def test_parser_attribute_error(self):
-        """Ensure attribute errors raised when parsing are properly re-raised"""
-        expected_message = "Internal error"
-
-        class BrokenParser:
-            media_type = "application/json"
-
-            def parse(self, *args, **kwargs):
-                raise AttributeError(expected_message)
-
-        http_request = factory.post('/', data={}, format="json")
-        request = Request(http_request, parsers=[BrokenParser()])
-
-        with self.assertRaisesMessage(WrappedAttributeError, expected_message):
-            request.data
-
 
 class TestDeepcopy(TestCase):