From 735e8a56bdb16a04fec2d55399368d1e862e244a Mon Sep 17 00:00:00 2001 From: Joseph Kocherhans Date: Mon, 27 Feb 2006 23:26:49 +0000 Subject: [PATCH] magic-removal: removed reques.user logic from the handlers. It's now done via middleware. git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2425 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/core/handlers/modpython.py | 17 ----------------- django/core/handlers/wsgi.py | 17 ----------------- 2 files changed, 34 deletions(-) diff --git a/django/core/handlers/modpython.py b/django/core/handlers/modpython.py index 7407310514..c605114211 100644 --- a/django/core/handlers/modpython.py +++ b/django/core/handlers/modpython.py @@ -98,22 +98,6 @@ class ModPythonRequest(http.HttpRequest): self._raw_post_data = self._req.read() return self._raw_post_data - def _get_user(self): - if not hasattr(self, '_user'): - from django.contrib.auth.models import User, SESSION_KEY - try: - user_id = self.session[SESSION_KEY] - if not user_id: - raise ValueError - self._user = User.objects.get(pk=user_id) - except (AttributeError, KeyError, ValueError, User.DoesNotExist): - from django.parts.auth import anonymoususers - self._user = anonymoususers.AnonymousUser() - return self._user - - def _set_user(self, user): - self._user = user - GET = property(_get_get, _set_get) POST = property(_get_post, _set_post) COOKIES = property(_get_cookies, _set_cookies) @@ -121,7 +105,6 @@ class ModPythonRequest(http.HttpRequest): META = property(_get_meta) REQUEST = property(_get_request) raw_post_data = property(_get_raw_post_data) - user = property(_get_user, _set_user) class ModPythonHandler(BaseHandler): def __call__(self, req): diff --git a/django/core/handlers/wsgi.py b/django/core/handlers/wsgi.py index 14a65ce110..87fd1ef1e1 100644 --- a/django/core/handlers/wsgi.py +++ b/django/core/handlers/wsgi.py @@ -119,29 +119,12 @@ class WSGIRequest(http.HttpRequest): self._raw_post_data = self.environ['wsgi.input'].read(int(self.environ["CONTENT_LENGTH"])) return self._raw_post_data - def _get_user(self): - if not hasattr(self, '_user'): - from django.contrib.auth.models import User, SESSION_KEY - try: - user_id = self.session[SESSION_KEY] - if not user_id: - raise ValueError - self._user = User.objects.get(pk=user_id) - except (AttributeError, KeyError, ValueError, User.DoesNotExist): - from django.parts.auth import anonymoususers - self._user = anonymoususers.AnonymousUser() - return self._user - - def _set_user(self, user): - self._user = user - GET = property(_get_get, _set_get) POST = property(_get_post, _set_post) COOKIES = property(_get_cookies, _set_cookies) FILES = property(_get_files) REQUEST = property(_get_request) raw_post_data = property(_get_raw_post_data) - user = property(_get_user, _set_user) class WSGIHandler(BaseHandler): def __call__(self, environ, start_response):