From 1a667f420d9f78f2a9189763981bf65b8e967fb3 Mon Sep 17 00:00:00 2001
From: Ryan P Kilby <rpkilby@ncsu.edu>
Date: Wed, 22 Nov 2017 05:42:59 -0500
Subject: [PATCH] Reimplement request attribute access w/ __getattr__ (#5617)

* Add tests for proxying WSGIRequest attributes in Request.

* Add request attribute exception test

* Reimplement request attribute access
---
 rest_framework/request.py | 12 +++---------
 tests/test_request.py     | 23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/rest_framework/request.py b/rest_framework/request.py
index f9503cd59..944691039 100644
--- a/rest_framework/request.py
+++ b/rest_framework/request.py
@@ -10,8 +10,6 @@ The wrapped request then offers a richer API, in particular :
 """
 from __future__ import unicode_literals
 
-import sys
-
 from django.conf import settings
 from django.http import QueryDict
 from django.http.multipartparser import parse_header
@@ -373,19 +371,15 @@ class Request(object):
         else:
             self.auth = None
 
-    def __getattribute__(self, attr):
+    def __getattr__(self, attr):
         """
         If an attribute does not exist on this instance, then we also attempt
         to proxy it to the underlying HttpRequest object.
         """
         try:
-            return super(Request, self).__getattribute__(attr)
+            return getattr(self._request, attr)
         except AttributeError:
-            info = sys.exc_info()
-            try:
-                return getattr(self._request, attr)
-            except AttributeError:
-                six.reraise(info[0], info[1], info[2].tb_next)
+            return self.__getattribute__(attr)
 
     @property
     def DATA(self):
diff --git a/tests/test_request.py b/tests/test_request.py
index a87060df1..cbadb1467 100644
--- a/tests/test_request.py
+++ b/tests/test_request.py
@@ -249,3 +249,26 @@ class TestSecure(TestCase):
     def test_default_secure_true(self):
         request = Request(factory.get('/', secure=True))
         assert request.scheme == 'https'
+
+
+class TestWSGIRequestProxy(TestCase):
+    def test_attribute_access(self):
+        wsgi_request = factory.get('/')
+        request = Request(wsgi_request)
+
+        inner_sentinel = object()
+        wsgi_request.inner_property = inner_sentinel
+        assert request.inner_property is inner_sentinel
+
+        outer_sentinel = object()
+        request.inner_property = outer_sentinel
+        assert request.inner_property is outer_sentinel
+
+    def test_exception(self):
+        # ensure the exception message is not for the underlying WSGIRequest
+        wsgi_request = factory.get('/')
+        request = Request(wsgi_request)
+
+        message = "'Request' object has no attribute 'inner_property'"
+        with self.assertRaisesMessage(AttributeError, message):
+            request.inner_property