From caf08867e1b23047455277abc3f7e697cb0b966a Mon Sep 17 00:00:00 2001 From: Yotam Ofek Date: Thu, 9 Nov 2017 01:16:03 +0200 Subject: [PATCH] Implement HttpRequest proxying with __getattr__ for optimized access. --- rest_framework/request.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/rest_framework/request.py b/rest_framework/request.py index 4f413e03f..5de6843bb 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -372,19 +372,23 @@ 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() + outer_info = sys.exc_info() + + # raise the 'original' AttributeError for the proxying Request object instead of the underlying + # HttpRequest object. try: - return getattr(self._request, attr) + self.__getattribute__(attr) except AttributeError: - six.reraise(info[0], info[1], info[2].tb_next) + inner_info = sys.exc_info() + six.reraise(inner_info[0], inner_info[1], outer_info[2].tb_next) @property def DATA(self):