[DJ1.11] Use a dict instead of django.template.Context

helios/view_utils.py

@@ -4,22 +4,16 @@ Utilities for all views
 Ben Adida (12-30-2008)
 """
 
-from django.template import Context, Template, loader
-from django.http import HttpResponse, Http404
+from django.conf import settings
+from django.http import HttpResponse
 from django.shortcuts import render_to_response
-
-import utils
-
-from helios import datatypes
-
+from django.template import loader
 # nicely update the wrapper function
 from functools import update_wrapper
 
-from helios_auth.security import get_user
-
 import helios
-
-from django.conf import settings
+import utils
+from helios_auth.security import get_user
 
 ##
 ## BASICS
@@ -33,8 +27,8 @@ FAILURE = HttpResponse("FAILURE")
 ##
 ## template abstraction
 ##
-def prepare_vars(request, vars):
-  vars_with_user = vars.copy()
+def prepare_vars(request, values):
+  vars_with_user = values.copy() if values is not None else {}
   vars_with_user['user'] = get_user(request)
 
   # csrf protection
@@ -50,32 +44,32 @@ def prepare_vars(request, vars):
 
   return vars_with_user
 
-def render_template(request, template_name, vars = {}, include_user=True):
-  t = loader.get_template(template_name + '.html')
 
-  vars_with_user = prepare_vars(request, vars)
+def render_template(request, template_name, values = None, include_user=True):
+  vars_with_user = prepare_vars(request, values)
 
   if not include_user:
     del vars_with_user['user']
 
   return render_to_response('helios/templates/%s.html' % template_name, vars_with_user)
 
-def render_template_raw(request, template_name, vars={}):
+
+def render_template_raw(request, template_name, values=None):
   t = loader.get_template(template_name)
 
   # if there's a request, prep the vars, otherwise can't do it.
   if request:
-    full_vars = prepare_vars(request, vars)
+    full_vars = prepare_vars(request, values)
   else:
-    full_vars = vars
+    full_vars = values or {}
 
-  c = Context(full_vars)  
-  return t.render(c)
+  return t.render(context=full_vars, request=request)
 
 
 def render_json(json_txt):
   return HttpResponse(json_txt, "application/json")
 
+
 # decorator
 def return_json(func):
     """
@@ -92,4 +86,3 @@ def return_json(func):
         raise e
 
     return update_wrapper(convert_to_json,func)
-    

helios_auth/view_utils.py

@@ -4,15 +4,13 @@ Utilities for all views
 Ben Adida (12-30-2008)
 """
 
-from django.template import Context, Template, loader
-from django.http import HttpResponse, Http404
+from django.conf import settings
+from django.http import HttpResponse
 from django.shortcuts import render_to_response
-
-from helios_auth.security import get_user
+from django.template import loader
 
 import helios_auth
-
-from django.conf import settings
+from helios_auth.security import get_user
 
 ##
 ## BASICS
@@ -24,8 +22,8 @@ SUCCESS = HttpResponse("SUCCESS")
 ## template abstraction
 ##
 
-def prepare_vars(request, vars):
-  vars_with_user = vars.copy()
+def prepare_vars(request, values):
+  vars_with_user = values.copy()
 
   if request:
     vars_with_user['user'] = get_user(request)
@@ -40,21 +38,21 @@ def prepare_vars(request, vars):
 
   return vars_with_user
 
-def render_template(request, template_name, vars = {}):
-  t = loader.get_template(template_name + '.html')
 
-  vars_with_user = prepare_vars(request, vars)
+def render_template(request, template_name, values=None):
+  vars_with_user = prepare_vars(request, values or {})
 
   return render_to_response('helios_auth/templates/%s.html' % template_name, vars_with_user)
 
-def render_template_raw(request, template_name, vars={}):
+
+def render_template_raw(request, template_name, values=None):
   t = loader.get_template(template_name + '.html')
+  values = values or {}
 
-  vars_with_user = prepare_vars(request, vars)
-  c = Context(vars_with_user)  
-  return t.render(c)
+  vars_with_user = prepare_vars(request, values)
 
-def render_json(json_txt):
-  return HttpResponse(json_txt)
+  return t.render(context=vars_with_user, request=request)
 
 
+def render_json(json_txt):
+  return HttpResponse(json_txt)

server_ui/view_utils.py

@@ -4,21 +4,17 @@ Utilities for single election views
 Ben Adida (2009-07-18)
 """
 
-from django.template import Context, Template, loader
-from django.http import HttpResponse, Http404
+from django.conf import settings
 from django.shortcuts import render_to_response
 
 from helios_auth.security import get_user
 
-from django.conf import settings
 
 ##
 ## template abstraction
 ##
-def render_template(request, template_name, vars = {}):
-  t = loader.get_template(template_name + '.html')
-  
-  vars_with_user = vars.copy()
+def render_template(request, template_name, values = None):
+  vars_with_user = values.copy() if values is not None else {}
   vars_with_user['user'] = get_user(request)
   vars_with_user['settings'] = settings
   vars_with_user['CURRENT_URL'] = request.path