Skip to content

Commit 18f43e7

Browse files
author
http://j3h.us/
committed
[project @ Remove sendResponse decorator]
We were using it to do basically the same thing that django.views.generic.simple.direct_to_template does.
1 parent 152afb1 commit 18f43e7

4 files changed

Lines changed: 53 additions & 67 deletions

File tree

‎examples/djopenid/consumer/views.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
from django import http
33
from django.http import HttpResponseRedirect
4+
from django.views.generic.simple import direct_to_template
45

56
from openid.consumer import consumer
67
from openid.consumer.discover import DiscoveryFailure
@@ -23,9 +24,8 @@ def getConsumer(request):
2324

2425
def renderIndexPage(request, **template_args):
2526
template_args['consumer_url'] = util.getViewURL(request, startOpenID)
26-
return 'consumer/index.html', template_args
27+
return direct_to_template(request, 'consumer/index.html', template_args)
2728

28-
@util.sendResponse
2929
def startOpenID(request):
3030
"""
3131
Start the OpenID authentication process. Renders an
@@ -84,11 +84,11 @@ def startOpenID(request):
8484
form_id = 'openid_message'
8585
form_html = auth_request.formMarkup(trust_root, return_to,
8686
False, {'id': form_id})
87-
return 'consumer/request_form.html', {'html': form_html}
87+
return direct_to_template(
88+
request, 'consumer/request_form.html', {'html': form_html})
8889

8990
return renderIndexPage(request)
9091

91-
@util.sendResponse
9292
def finishOpenID(request):
9393
"""
9494
Finish the OpenID authentication process. Invoke the OpenID

‎examples/djopenid/server/views.py‎

Lines changed: 39 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
from djopenid.util import getViewURL
2222

2323
from django import http
24+
from django.views.generic.simple import direct_to_template
2425

2526
from openid.server.server import Server, ProtocolError, CheckIDRequest, \
2627
EncodingError
@@ -56,44 +57,46 @@ def getRequest(request):
5657
"""
5758
return request.session.get('openid_request')
5859

59-
@util.sendResponse
6060
def server(request):
6161
"""
6262
Respond to requests for the server's primary web page.
6363
"""
64-
return 'server/index.html', {
65-
'user_url': getViewURL(request, idPage),
66-
'server_xrds_url': getViewURL(request, idpXrds),
67-
}
64+
return direct_to_template(
65+
request,
66+
'server/index.html',
67+
{'user_url': getViewURL(request, idPage),
68+
'server_xrds_url': getViewURL(request, idpXrds),
69+
})
6870

69-
@util.sendResponse
7071
def idpXrds(request):
7172
"""
7273
Respond to requests for the IDP's XRDS document, which is used in
7374
IDP-driven identifier selection.
7475
"""
75-
body = util.renderTemplate(request, 'server/xrds.html',
76-
{'server_url': getViewURL(request, endpoint)})
77-
r = http.HttpResponse(body)
76+
r = direct_to_template(request, 'server/xrds.html',
77+
{'server_url': getViewURL(request, endpoint)})
7878
r['Content-Type'] = 'application/xrds+xml'
7979
return r
8080

81-
@util.sendResponse
8281
def idPage(request):
8382
"""
8483
Serve the identity page for OpenID URLs.
8584
"""
86-
return 'server/idPage.html', {'server_url': getViewURL(request, endpoint)}
85+
return direct_to_template(
86+
request,
87+
'server/idPage.html',
88+
{'server_url': getViewURL(request, endpoint)})
8789

88-
@util.sendResponse
8990
def trustPage(request):
9091
"""
9192
Display the trust page template, which allows the user to decide
9293
whether to approve the OpenID verification.
9394
"""
94-
return 'server/trust.html', {'trust_handler_url':getViewURL(request, processTrustResult)}
95+
return direct_to_template(
96+
request,
97+
'server/trust.html',
98+
{'trust_handler_url':getViewURL(request, processTrustResult)})
9599

96-
@util.sendResponse
97100
def endpoint(request):
98101
"""
99102
Respond to low-level OpenID protocol messages.
@@ -108,12 +111,18 @@ def endpoint(request):
108111
openid_request = s.decodeRequest(query)
109112
except ProtocolError, why:
110113
# This means the incoming request was invalid.
111-
return 'server/endpoint.html', {'error': str(why)}
114+
return direct_to_template(
115+
request,
116+
'server/endpoint.html',
117+
{'error': str(why)})
112118

113119
# If we did not get a request, display text indicating that this
114120
# is an endpoint.
115121
if openid_request is None:
116-
return 'server/endpoint.html', {}
122+
return direct_to_template(
123+
request,
124+
'server/endpoint.html',
125+
{})
117126

118127
# We got a request; if the mode is checkid_*, we will handle it by
119128
# getting feedback from the user or by checking the session.
@@ -165,15 +174,17 @@ def showDecidePage(request, openid_request):
165174
except DiscoveryFailure, err:
166175
trust_root_valid = "DISCOVERY_FAILED"
167176

168-
return 'server/trust.html', {'idSelect': idSelect,
169-
'identity': identity,
170-
'trust_root': trust_root,
171-
'default_url': default_url,
172-
'trust_handler_url':getViewURL(request, processTrustResult),
173-
'trust_root_valid': trust_root_valid,
174-
}
177+
return direct_to_template(
178+
request,
179+
'server/trust.html',
180+
{'idSelect': idSelect,
181+
'identity': identity,
182+
'trust_root': trust_root,
183+
'default_url': default_url,
184+
'trust_handler_url':getViewURL(request, processTrustResult),
185+
'trust_root_valid': trust_root_valid,
186+
})
175187

176-
@util.sendResponse
177188
def processTrustResult(request):
178189
"""
179190
Handle the result of a trust decision and respond to the RP
@@ -241,7 +252,10 @@ def displayResponse(request, openid_response):
241252
except EncodingError, why:
242253
# If it couldn't be encoded, display an error.
243254
text = why.response.encodeToKVForm()
244-
return 'server/endpoint.html', {'error': cgi.escape(text)}
255+
return direct_to_template(
256+
request,
257+
'server/endpoint.html',
258+
{'error': cgi.escape(text)})
245259

246260
# Construct the appropriate django framework response.
247261
r = http.HttpResponse(webresponse.body)

‎examples/djopenid/util.py‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -84,40 +84,6 @@ def getOpenIDStore(filestore_path, table_prefix):
8484

8585
return s
8686

87-
def renderTemplate(request, template_name, response_data):
88-
context = RequestContext(request, response_data)
89-
template = loader.get_template(template_name)
90-
return template.render(context)
91-
92-
def sendResponse(func):
93-
"""
94-
A decorator to make Django views nicer to use and easier to read.
95-
Wraps a normal Django view and adds these behaviors:
96-
97-
* The view may return a tuple of (template_name, template_context)
98-
where template_name is a normal Django template name and
99-
template_context is a dict of template context data.
100-
101-
* The view may return a plain http.HttpResponse object, which will
102-
be returned to Django as-is.
103-
104-
* The view may return in its template_context a 'response_class'
105-
key whose value is an http.HttpResponse subclass. If this is
106-
found, it will be used to instantiate the final response object
107-
returned to Django.
108-
"""
109-
def _responseWrapper(request, *args, **kwargs):
110-
result = func(request, *args, **kwargs)
111-
112-
if isinstance(result, http.HttpResponse):
113-
return result
114-
else:
115-
template_name, response_data = result
116-
117-
response_class = response_data.get('response_class', http.HttpResponse)
118-
return response_class(renderTemplate(request, template_name, response_data))
119-
return _responseWrapper
120-
12187
def getViewURL(req, view_name_or_obj, args=None, kwargs=None):
12288
relative_url = reverseURL(view_name_or_obj, args=args, kwargs=kwargs)
12389
full_path = req.META.get('SCRIPT_NAME', '') + relative_url

‎examples/djopenid/views.py‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11

22
from djopenid import util
3+
from django.views.generic.simple import direct_to_template
34

4-
@util.sendResponse
55
def index(request):
6-
return 'index.html', {'consumer_url':util.getViewURL(request, 'djopenid.consumer.views.startOpenID'),
7-
'server_url':util.getViewURL(request, 'djopenid.server.views.server'),
8-
}
6+
consumer_url = util.getViewURL(
7+
request, 'djopenid.consumer.views.startOpenID')
8+
server_url = util.getViewURL(request, 'djopenid.server.views.server')
9+
10+
return direct_to_template(
11+
request,
12+
'index.html',
13+
{'consumer_url':consumer_url, 'server_url':server_url})
14+

0 commit comments

Comments
 (0)