mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-05 03:29:12 +00:00
Code Issues 32 Releases Wiki Activity

magic-removal: removed reques.user logic from the handlers. It's now done via middleware.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2425 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Joseph Kocherhans 2006-02-27 23:26:49 +00:00
parent f0117e5c7e
commit 735e8a56bd
2 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
django/core/handlers/modpython.py
View File

@ -98,22 +98,6 @@ class ModPythonRequest(http.HttpRequest):
self._raw_post_data = self._req.read() self._raw_post_data = self._req.read()
return self._raw_post_data 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) GET = property(_get_get, _set_get)
POST = property(_get_post, _set_post) POST = property(_get_post, _set_post)
COOKIES = property(_get_cookies, _set_cookies) COOKIES = property(_get_cookies, _set_cookies)
@ -121,7 +105,6 @@ class ModPythonRequest(http.HttpRequest):
META = property(_get_meta) META = property(_get_meta)
REQUEST = property(_get_request) REQUEST = property(_get_request)
raw_post_data = property(_get_raw_post_data) raw_post_data = property(_get_raw_post_data)
user = property(_get_user, _set_user)
class ModPythonHandler(BaseHandler): class ModPythonHandler(BaseHandler):
def __call__(self, req): def __call__(self, req):

17
django/core/handlers/wsgi.py
View File

@ -119,29 +119,12 @@ class WSGIRequest(http.HttpRequest):
self._raw_post_data = self.environ['wsgi.input'].read(int(self.environ["CONTENT_LENGTH"])) self._raw_post_data = self.environ['wsgi.input'].read(int(self.environ["CONTENT_LENGTH"]))
return self._raw_post_data 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) GET = property(_get_get, _set_get)
POST = property(_get_post, _set_post) POST = property(_get_post, _set_post)
COOKIES = property(_get_cookies, _set_cookies) COOKIES = property(_get_cookies, _set_cookies)
FILES = property(_get_files) FILES = property(_get_files)
REQUEST = property(_get_request) REQUEST = property(_get_request)
raw_post_data = property(_get_raw_post_data) raw_post_data = property(_get_raw_post_data)
user = property(_get_user, _set_user)
class WSGIHandler(BaseHandler): class WSGIHandler(BaseHandler):
def __call__(self, environ, start_response): def __call__(self, environ, start_response):