Skip to content

Commit

Permalink
Folded django.core.handler.CoreHandler.get_request() into CoreHandler…
Browse files Browse the repository at this point in the history
….call()

git-svn-id: http://code.djangoproject.com/svn/django/trunk@164 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
adrianholovaty committed Jul 18, 2005
1 parent dd85d8d commit f3a43a2
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions django/core/handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@ def __call__(self, req):
# that use settings now can work
from django.conf import settings
from django.core import db
from django.core.extensions import DjangoRequest

# if we need to set up middleware, now that settings works we can do it now.
if self._request_middleware is None:
self.load_middleware()

try:
request = self.get_request(req)
request = DjangoRequest(req)
response = self.get_response(req.uri, request)
finally:
db.db.close()
Expand Down Expand Up @@ -72,11 +73,6 @@ def load_middleware(self):
if hasattr(mw_instance, 'process_response'):
self._response_middleware.insert(0, mw_instance.process_response)

def get_request(self, req):
"Returns an HttpRequest object for the given mod_python req object"
from django.core.extensions import DjangoRequest
return DjangoRequest(req)

def get_response(self, path, request):
"Returns an HttpResponse object for the given HttpRequest"
from django.core import db, exceptions, urlresolvers
Expand Down

0 comments on commit f3a43a2

Please sign in to comment.