# HG changeset patch
# User Todd Larsen <tlarsen@google.com>
# Date 1223075869 0
# Node ID 00cea07656c06e6b0e3bab23193dc357822d49ff
# Parent  01e90bb21b7ed97238c843dbd313431f58c9f5be
Move helpers/response_helpers.py to helper/responses.py.

Patch by: Todd Larsen
Review by: to-be-reviewed

diff -r 01e90bb21b7e -r 00cea07656c0 app/soc/views/docs/show.py
--- a/app/soc/views/docs/show.py	Fri Oct 03 23:08:28 2008 +0000
+++ b/app/soc/views/docs/show.py	Fri Oct 03 23:17:49 2008 +0000
@@ -30,8 +30,8 @@
 from soc.logic import out_of_band
 from soc.views import simple
 from soc.views import helper
+import soc.views.helper.responses
 import soc.views.helper.templates
-from soc.views.helpers import response_helpers
 
 
 DEF_DOCS_PUBLIC_TMPL = 'soc/docs/public.html'
@@ -54,7 +54,7 @@
     be filled out, or a redirect to the correct view in the interface.
   """
   # create default template context for use with any templates
-  context = response_helpers.getUniversalContext(request)
+  context = helper.responses.getUniversalContext(request)
 
   # TODO: there eventually needs to be a call to some controller logic that
   #   implements some sort of access controls, based on the currently
@@ -73,4 +73,4 @@
   doc.content = helper.templates.unescape(doc.content)
   context['document'] = doc
 
-  return response_helpers.respond(request, template, context)
+  return helper.responses.respond(request, template, context)
diff -r 01e90bb21b7e -r 00cea07656c0 app/soc/views/helper/responses.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/soc/views/helper/responses.py	Fri Oct 03 23:17:49 2008 +0000
@@ -0,0 +1,152 @@
+#!/usr/bin/python2.5
+#
+# Copyright 2008 the Melange authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Helpers used to render response.
+"""
+
+__authors__ = [
+  '"Todd Larsen" <tlarsen@google.com>',
+  '"Pawel Solyga" <pawel.solyga@gmail.com>',
+  ]
+
+
+import logging
+
+from google.appengine.api import users
+
+from django import http
+from django.template import loader
+
+# DeadlineExceededError can live in two different places
+try:
+  # When deployed
+  from google.appengine.runtime import DeadlineExceededError
+except ImportError:
+  # In the development server
+  from google.appengine.runtime.apiproxy_errors import DeadlineExceededError
+
+from soc.logic import system
+from soc.logic.site import id_user
+from soc.logic.site import sidebar
+from soc.views import helper
+import soc.views.helper.requests
+from soc.views.helpers import html_menu
+
+
+def respond(request, template, context=None, response_args=None):
+  """Helper to render a response, passing standard stuff to the response.
+
+  Args:
+    request: the Django HTTP request object
+    template: the template (or search list of templates) to render
+    context: the context supplied to the template (implements dict)
+    response_args: keyword arguments passed to http.HttpResponse()
+      (response_args['content'] is created with
+      render_to_string(template, dictionary=context) if it is not present)
+
+  Returns:
+    django.shortcuts.render_to_response(template, context) results
+
+  Raises:
+    Any exceptions that django.template.loader.render_to_string() or
+    django.http.HttpResponse() might raise.
+  """
+  context = getUniversalContext(request, context=context)
+
+  if response_args is None:
+    response_args = {}
+
+  try:
+    response_args['content'] = response_args.get(
+        'content', loader.render_to_string(template, dictionary=context))
+    return http.HttpResponse(**response_args)
+  except DeadlineExceededError:
+    logging.exception('DeadlineExceededError')
+    return http.HttpResponse('DeadlineExceededError')
+  except MemoryError:
+    logging.exception('MemoryError')
+    return http.HttpResponse('MemoryError')
+  except AssertionError:
+    logging.exception('AssertionError')
+    return http.HttpResponse('AssertionError')
+
+
+def getUniversalContext(request, context=None):
+  """Constructs a template context dict will many common variables defined.
+  
+  Args:
+    request: the Django HTTP request object
+    context: the template context dict to be updated in-place (pass in a copy
+      if the original must not be modified), or None if a new one is to be
+      created; any existing fields already present in the context dict passed
+      in by the caller are left unaltered 
+      
+  Returns:
+    updated template context dict supplied by the caller, or a new context
+    dict if the caller supplied None
+    
+    {
+      'request': the Django HTTP request object passed in by the caller
+      'id': the logged-in Google Account if there is one
+      'user': the User entity corresponding to the Google Account in
+        context['id']
+      'is_admin': True if users.is_current_user_admin() is True
+      'is_debug': True if system.isDebug() is True
+      'sign_in': a Google Account login URL
+      'sign_out': a Google Account logout URL
+      'sidebar_menu_html': an HTML string that renders the sidebar menu
+    }
+  """
+  if context is None:
+    context = {}
+
+  # set some universal values if caller did not already set them  
+  context['request'] = context.get('request', request)
+  context['id'] = id_user.getIdIfMissing(context.get('id', None))
+  context['user'] = id_user.getUserIfMissing(context.get('user', None),
+                                             context['id'])
+  context['is_admin'] = context.get(
+      'is_admin', id_user.isIdDeveloper(id=context['id']))
+  context['is_debug'] = context.get('is_debug', system.isDebug())
+  context['sign_in'] = context.get(
+      'sign_in', users.create_login_url(request.path))
+  context['sign_out'] = context.get(
+      'sign_out', users.create_logout_url(request.path))
+
+  if not context.get('sidebar_menu_html'):
+    # pass the currently constructed context as keyword arguments to
+    # all of the sidebar builder functions
+    context['sidebar_menu_html'] = str(html_menu.UlMenu(
+      sidebar.buildSidebar(**context)))
+
+  return context
+
+
+def redirectToChangedSuffix(
+    request, old_suffix, new_suffix=None, params=None):
+  """Changes suffix of URL path and returns an HTTP redirect response.
+  
+  Args:
+    request: the Django HTTP request object; redirect path is derived from
+      request.path
+    old_suffix, new_suffix, params:  see helper.requests.replaceSuffix()
+      
+  Returns:
+    a Django HTTP redirect response pointing to the altered path
+  """
+  path = helper.requests.replaceSuffix(request.path, old_suffix, new_suffix,
+                                       params=params)
+  return http.HttpResponseRedirect(path)
diff -r 01e90bb21b7e -r 00cea07656c0 app/soc/views/helpers/response_helpers.py
--- a/app/soc/views/helpers/response_helpers.py	Fri Oct 03 23:08:28 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,152 +0,0 @@
-#!/usr/bin/python2.5
-#
-# Copyright 2008 the Melange authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Helpers used to render response.
-"""
-
-__authors__ = [
-  '"Todd Larsen" <tlarsen@google.com>',
-  '"Pawel Solyga" <pawel.solyga@gmail.com>',
-  ]
-
-
-import logging
-
-from google.appengine.api import users
-
-from django import http
-from django.template import loader
-
-# DeadlineExceededError can live in two different places
-try:
-  # When deployed
-  from google.appengine.runtime import DeadlineExceededError
-except ImportError:
-  # In the development server
-  from google.appengine.runtime.apiproxy_errors import DeadlineExceededError
-
-from soc.logic import system
-from soc.logic.site import id_user
-from soc.logic.site import sidebar
-from soc.views import helper
-import soc.views.helper.requests
-from soc.views.helpers import html_menu
-
-
-def respond(request, template, context=None, response_args=None):
-  """Helper to render a response, passing standard stuff to the response.
-
-  Args:
-    request: the Django HTTP request object
-    template: the template (or search list of templates) to render
-    context: the context supplied to the template (implements dict)
-    response_args: keyword arguments passed to http.HttpResponse()
-      (response_args['content'] is created with
-      render_to_string(template, dictionary=context) if it is not present)
-
-  Returns:
-    django.shortcuts.render_to_response(template, context) results
-
-  Raises:
-    Any exceptions that django.template.loader.render_to_string() or
-    django.http.HttpResponse() might raise.
-  """
-  context = getUniversalContext(request, context=context)
-
-  if response_args is None:
-    response_args = {}
-
-  try:
-    response_args['content'] = response_args.get(
-        'content', loader.render_to_string(template, dictionary=context))
-    return http.HttpResponse(**response_args)
-  except DeadlineExceededError:
-    logging.exception('DeadlineExceededError')
-    return http.HttpResponse('DeadlineExceededError')
-  except MemoryError:
-    logging.exception('MemoryError')
-    return http.HttpResponse('MemoryError')
-  except AssertionError:
-    logging.exception('AssertionError')
-    return http.HttpResponse('AssertionError')
-
-
-def getUniversalContext(request, context=None):
-  """Constructs a template context dict will many common variables defined.
-  
-  Args:
-    request: the Django HTTP request object
-    context: the template context dict to be updated in-place (pass in a copy
-      if the original must not be modified), or None if a new one is to be
-      created; any existing fields already present in the context dict passed
-      in by the caller are left unaltered 
-      
-  Returns:
-    updated template context dict supplied by the caller, or a new context
-    dict if the caller supplied None
-    
-    {
-      'request': the Django HTTP request object passed in by the caller
-      'id': the logged-in Google Account if there is one
-      'user': the User entity corresponding to the Google Account in
-        context['id']
-      'is_admin': True if users.is_current_user_admin() is True
-      'is_debug': True if system.isDebug() is True
-      'sign_in': a Google Account login URL
-      'sign_out': a Google Account logout URL
-      'sidebar_menu_html': an HTML string that renders the sidebar menu
-    }
-  """
-  if context is None:
-    context = {}
-
-  # set some universal values if caller did not already set them  
-  context['request'] = context.get('request', request)
-  context['id'] = id_user.getIdIfMissing(context.get('id', None))
-  context['user'] = id_user.getUserIfMissing(context.get('user', None),
-                                             context['id'])
-  context['is_admin'] = context.get(
-      'is_admin', id_user.isIdDeveloper(id=context['id']))
-  context['is_debug'] = context.get('is_debug', system.isDebug())
-  context['sign_in'] = context.get(
-      'sign_in', users.create_login_url(request.path))
-  context['sign_out'] = context.get(
-      'sign_out', users.create_logout_url(request.path))
-
-  if not context.get('sidebar_menu_html'):
-    # pass the currently constructed context as keyword arguments to
-    # all of the sidebar builder functions
-    context['sidebar_menu_html'] = str(html_menu.UlMenu(
-      sidebar.buildSidebar(**context)))
-
-  return context
-
-
-def redirectToChangedSuffix(
-    request, old_suffix, new_suffix=None, params=None):
-  """Changes suffix of URL path and returns an HTTP redirect response.
-  
-  Args:
-    request: the Django HTTP request object; redirect path is derived from
-      request.path
-    old_suffix, new_suffix, params:  see helper.requests.replaceSuffix()
-      
-  Returns:
-    a Django HTTP redirect response pointing to the altered path
-  """
-  path = helper.requests.replaceSuffix(request.path, old_suffix, new_suffix,
-                                       params=params)
-  return http.HttpResponseRedirect(path)
diff -r 01e90bb21b7e -r 00cea07656c0 app/soc/views/simple.py
--- a/app/soc/views/simple.py	Fri Oct 03 23:08:28 2008 +0000
+++ b/app/soc/views/simple.py	Fri Oct 03 23:17:49 2008 +0000
@@ -28,8 +28,8 @@
 from soc.logic import out_of_band
 from soc.logic.site import id_user
 from soc.views import helper
+import soc.views.helper.responses
 import soc.views.helper.templates
-from soc.views.helpers import response_helpers
 
 
 def templateWithLinkName(request,
@@ -52,14 +52,14 @@
     A subclass of django.http.HttpResponse containing the generated page.
   """
   context['linkname'] = linkname
-  context = response_helpers.getUniversalContext(request, context=context)
+  context = helper.responses.getUniversalContext(request, context=context)
 
   try:
     context['linkname_user'] = id_user.getUserIfLinkName(linkname)
   except out_of_band.ErrorResponse, error:
     return errorResponse(request, error, template, context)
 
-  return response_helpers.respond(request, template, context)
+  return helper.responses.respond(request, template, context)
 
 
 def public(request, template, linkname, context):
@@ -95,7 +95,7 @@
       error_status: error.response_args['status'], or None if a status code
         was not supplied to the ErrorResponse
   """
-  context = response_helpers.getUniversalContext(request, context=context)
+  context = helper.responses.getUniversalContext(request, context=context)
   
   # make a list of possible "sibling" templates, then append a default
   error_templates = helper.templates.makeSiblingTemplatesList(
@@ -104,7 +104,7 @@
   context['error_status'] = error.response_args.get('status')
   context['error_message'] = error.message
 
-  return response_helpers.respond(request, error_templates, context=context,
+  return helper.responses.respond(request, error_templates, context=context,
                                   response_args=error.response_args)
 
 
@@ -128,7 +128,7 @@
       login_message: the caller can completely construct the message supplied
         to the login template in lieu of using login_message_fmt
   """
-  context = response_helpers.getUniversalContext(request, context=context)
+  context = helper.responses.getUniversalContext(request, context=context)
   
   # make a list of possible "sibling" templates, then append a default
   login_templates = helper.templates.makeSiblingTemplatesList(
@@ -139,7 +139,7 @@
       login_message_fmt = DEF_LOGIN_MSG_FMT
     context['login_message'] = login_message_fmt % context  
   
-  return response_helpers.respond(request, login_templates, context=context)
+  return helper.responses.respond(request, login_templates, context=context)
 
 
 def getAltResponseIfNotLoggedIn(request, context=None,
@@ -167,7 +167,7 @@
     return None
 
   # if missing, create default template context for use with any templates
-  context = response_helpers.getUniversalContext(request, context=context)
+  context = helper.responses.getUniversalContext(request, context=context)
 
   return requestLogin(request, template, context,
                       login_message_fmt=login_message_fmt)
@@ -200,7 +200,7 @@
     return None
 
   # if missing, create default template context for use with any templates
-  context = response_helpers.getUniversalContext(request, context=context)
+  context = helper.responses.getUniversalContext(request, context=context)
 
   return requestLogin(request, template, context,
                       login_message_fmt=DEF_NO_USER_LOGIN_MSG_FMT)
@@ -234,7 +234,7 @@
   id = id_user.getIdIfMissing(id)
 
   # if missing, create default template context for use with any templates
-  context = response_helpers.getUniversalContext(request, context=context)
+  context = helper.responses.getUniversalContext(request, context=context)
 
   if not id:
     return requestLogin(request, template, context,
diff -r 01e90bb21b7e -r 00cea07656c0 app/soc/views/site/docs/edit.py
--- a/app/soc/views/site/docs/edit.py	Fri Oct 03 23:08:28 2008 +0000
+++ b/app/soc/views/site/docs/edit.py	Fri Oct 03 23:17:49 2008 +0000
@@ -34,10 +34,10 @@
 from soc.logic.site import id_user
 from soc.views import helper
 import soc.views.helper.requests
+import soc.views.helper.responses
 import soc.views.helper.widgets
 from soc.views import simple
 from soc.views.helpers import forms_helpers
-from soc.views.helpers import response_helpers
 from soc.views.user import profile
 
 import soc.models.document
@@ -89,7 +89,7 @@
     be filled out, or a redirect to the correct view in the interface.
   """
   # create default template context for use with any templates
-  context = response_helpers.getUniversalContext(request)
+  context = helper.responses.getUniversalContext(request)
 
   logged_in_id = users.get_current_user()
   
@@ -153,7 +153,7 @@
         
       # redirect to new /site/docs/edit/new_path?s=0
       # (causes 'Profile saved' message to be displayed)
-      return response_helpers.redirectToChangedSuffix(
+      return helper.responses.redirectToChangedSuffix(
           request, path, new_path,
           params=profile.SUBMIT_PROFILE_SAVED_PARAMS)
   else: # method == 'GET':
@@ -199,7 +199,7 @@
   context.update({'form': form,
                   'existing_doc': doc})
 
-  return response_helpers.respond(request, template, context)
+  return helper.responses.respond(request, template, context)
 
 
 class CreateForm(forms_helpers.DbModelForm):
@@ -240,7 +240,7 @@
     be filled out, or a redirect to the correct view in the interface.
   """
   # create default template context for use with any templates
-  context = response_helpers.getUniversalContext(request)
+  context = helper.responses.getUniversalContext(request)
 
   alt_response = simple.getAltResponseIfNotDeveloper(request,
                                                      context=context)
@@ -271,7 +271,7 @@
         
       # redirect to new /site/docs/edit/new_path?s=0
       # (causes 'Profile saved' message to be displayed)
-      return response_helpers.redirectToChangedSuffix(
+      return helper.responses.redirectToChangedSuffix(
           request, None, new_path,
           params=profile.SUBMIT_PROFILE_SAVED_PARAMS)
   else: # method == 'GET':
@@ -280,4 +280,4 @@
 
   context.update({'form': form})
 
-  return response_helpers.respond(request, template, context)
+  return helper.responses.respond(request, template, context)
diff -r 01e90bb21b7e -r 00cea07656c0 app/soc/views/site/docs/list.py
--- a/app/soc/views/site/docs/list.py	Fri Oct 03 23:08:28 2008 +0000
+++ b/app/soc/views/site/docs/list.py	Fri Oct 03 23:17:49 2008 +0000
@@ -26,7 +26,7 @@
 from soc.views import simple
 from soc.views import helper
 import soc.views.helper.lists
-from soc.views.helpers import response_helpers
+import soc.views.helper.responses
 
 import soc.models.document
 
@@ -46,7 +46,7 @@
     be filled out, or a redirect to the correct view in the interface.
   """
   # create default template context for use with any templates
-  context = response_helpers.getUniversalContext(request)
+  context = helper.responses.getUniversalContext(request)
 
   alt_response = simple.getAltResponseIfNotDeveloper(request,
                                                      context=context)
@@ -71,4 +71,4 @@
       request, context, docs, 
       offset=offset, limit=limit, list_templates=list_templates)
 
-  return response_helpers.respond(request, template, context)
+  return helper.responses.respond(request, template, context)
diff -r 01e90bb21b7e -r 00cea07656c0 app/soc/views/site/home.py
--- a/app/soc/views/site/home.py	Fri Oct 03 23:08:28 2008 +0000
+++ b/app/soc/views/site/home.py	Fri Oct 03 23:17:49 2008 +0000
@@ -38,10 +38,10 @@
 from soc.logic.site import id_user
 from soc.views import simple
 from soc.views import helper
+import soc.views.helper.responses
 import soc.views.helper.templates
 import soc.views.helper.widgets
 from soc.views.helpers import forms_helpers
-from soc.views.helpers import response_helpers
 
 import soc.models.site_settings
 import soc.models.document
@@ -104,7 +104,7 @@
     A subclass of django.http.HttpResponse with generated template.
   """
   # create default template context for use with any templates
-  context = response_helpers.getUniversalContext(request)
+  context = helper.responses.getUniversalContext(request)
   
   site_settings = soc.logic.site.settings.getSiteSettings(DEF_SITE_SETTINGS_PATH)
 
@@ -116,7 +116,7 @@
       site_doc.content = helper.templates.unescape(site_doc.content)
       context.update({'site_document': site_doc})
 
-  return response_helpers.respond(request, template, context)
+  return helper.responses.respond(request, template, context)
 
 
 DEF_SITE_HOME_EDIT_TMPL = 'soc/site/home/edit.html'
@@ -132,7 +132,7 @@
     A subclass of django.http.HttpResponse with generated template.
   """
   # create default template context for use with any templates
-  context = response_helpers.getUniversalContext(request)
+  context = helper.responses.getUniversalContext(request)
   
   logged_in_id = users.get_current_user()
   
@@ -204,4 +204,4 @@
   context.update({'document_form': document_form,
                   'settings_form': settings_form })
   
-  return response_helpers.respond(request, template, context)
+  return helper.responses.respond(request, template, context)
diff -r 01e90bb21b7e -r 00cea07656c0 app/soc/views/site/sponsor/list.py
--- a/app/soc/views/site/sponsor/list.py	Fri Oct 03 23:08:28 2008 +0000
+++ b/app/soc/views/site/sponsor/list.py	Fri Oct 03 23:17:49 2008 +0000
@@ -27,7 +27,7 @@
 
 from soc.views import helper
 import soc.views.helper.lists
-from soc.views.helpers import response_helpers
+import soc.views.helper.responses
 
 
 DEF_SITE_SPONSOR_LIST_ALL_TMPL = 'soc/group/list/all.html'
@@ -36,7 +36,7 @@
   """Show a list of all Sponsors (limit rows per page).
   """
   # create default template context for use with any templates
-  context = response_helpers.getUniversalContext(request)
+  context = helper.responses.getUniversalContext(request)
 
   alt_response = simple.getAltResponseIfNotDeveloper(request,
                                                      context=context)
@@ -61,4 +61,4 @@
                                  
   context['group_type'] = 'Sponsor'
 
-  return response_helpers.respond(request, template, context)
+  return helper.responses.respond(request, template, context)
diff -r 01e90bb21b7e -r 00cea07656c0 app/soc/views/site/sponsor/profile.py
--- a/app/soc/views/site/sponsor/profile.py	Fri Oct 03 23:08:28 2008 +0000
+++ b/app/soc/views/site/sponsor/profile.py	Fri Oct 03 23:17:49 2008 +0000
@@ -33,10 +33,10 @@
 from soc.logic.site import id_user
 from soc.views import helper
 import soc.views.helper.requests
+import soc.views.helper.responses
 import soc.views.helper.widgets
 from soc.views import simple
 from soc.views.helpers import forms_helpers
-from soc.views.helpers import response_helpers
 from soc.views.user import profile
 
 import soc.models.sponsor
@@ -96,7 +96,7 @@
     be filled out, or a redirect to the correct view in the interface.
   """
   # create default template context for use with any templates
-  context = response_helpers.getUniversalContext(request)
+  context = helper.responses.getUniversalContext(request)
 
   alt_response = simple.getAltResponseIfNotDeveloper(request,
                                                      context=context)
@@ -150,7 +150,7 @@
         
       # redirect to new /site/sponsor/profile/form_link_name?s=0
       # (causes 'Profile saved' message to be displayed)
-      return response_helpers.redirectToChangedSuffix(
+      return helper.responses.redirectToChangedSuffix(
           request, None, form_ln,
           params=profile.SUBMIT_PROFILE_SAVED_PARAMS)
 
@@ -184,4 +184,4 @@
                   'existing_group':  existing_sponsor,
                   'group_type': 'Sponsor'})
 
-  return response_helpers.respond(request, template, context)
\ No newline at end of file
+  return helper.responses.respond(request, template, context)
\ No newline at end of file
diff -r 01e90bb21b7e -r 00cea07656c0 app/soc/views/site/user/list.py
--- a/app/soc/views/site/user/list.py	Fri Oct 03 23:08:28 2008 +0000
+++ b/app/soc/views/site/user/list.py	Fri Oct 03 23:17:49 2008 +0000
@@ -26,7 +26,7 @@
 from soc.views import simple
 from soc.views import helper
 import soc.views.helper.lists
-from soc.views.helpers import response_helpers
+import soc.views.helper.responses
 
 import soc.models.user
 
@@ -46,7 +46,7 @@
     be filled out, or a redirect to the correct view in the interface.
   """
   # create default template context for use with any templates
-  context = response_helpers.getUniversalContext(request)
+  context = helper.responses.getUniversalContext(request)
 
   alt_response = simple.getAltResponseIfNotDeveloper(request,
                                                      context=context)
@@ -70,5 +70,5 @@
       request, context, users,
       offset=offset, limit=limit, list_templates=list_templates)
 
-  return response_helpers.respond(request, template, context)
+  return helper.responses.respond(request, template, context)
                  
diff -r 01e90bb21b7e -r 00cea07656c0 app/soc/views/site/user/profile.py
--- a/app/soc/views/site/user/profile.py	Fri Oct 03 23:08:28 2008 +0000
+++ b/app/soc/views/site/user/profile.py	Fri Oct 03 23:17:49 2008 +0000
@@ -35,8 +35,8 @@
 from soc.views import helper
 import soc.views.helper.lists
 import soc.views.helper.requests
+import soc.views.helper.responses
 from soc.views.helpers import forms_helpers
-from soc.views.helpers import response_helpers
 from soc.views.user import profile
 
 import soc.models.user
@@ -104,7 +104,7 @@
     be filled out, or a redirect to the correct view in the interface.
   """
   # create default template context for use with any templates
-  context = response_helpers.getUniversalContext(request)
+  context = helper.responses.getUniversalContext(request)
 
   alt_response = simple.getAltResponseIfNotDeveloper(request,
                                                      context=context)
@@ -181,7 +181,7 @@
                   'email_error': email_error,
                   'lookup_message': lookup_message})
 
-  return response_helpers.respond(request, template, context)
+  return helper.responses.respond(request, template, context)
 
 
 class EditForm(forms_helpers.DbModelForm):
@@ -250,7 +250,7 @@
     be filled out, or a redirect to the correct view in the interface.
   """
   # create default template context for use with any templates
-  context = response_helpers.getUniversalContext(request)
+  context = helper.responses.getUniversalContext(request)
 
   alt_response = simple.getAltResponseIfNotDeveloper(request,
                                                      context=context)
@@ -286,7 +286,7 @@
         
       # redirect to new /site/user/profile/new_linkname?s=0
       # (causes 'Profile saved' message to be displayed)
-      return response_helpers.redirectToChangedSuffix(
+      return helper.responses.redirectToChangedSuffix(
           request, linkname, new_linkname,
           params=profile.SUBMIT_PROFILE_SAVED_PARAMS)
   else: # method == 'GET':
@@ -331,7 +331,7 @@
   context.update({'form': form,
                   'existing_user': user})
 
-  return response_helpers.respond(request, template, context)
+  return helper.responses.respond(request, template, context)
 
 
 class CreateForm(forms_helpers.DbModelForm):
@@ -392,7 +392,7 @@
     be filled out, or a redirect to the correct view in the interface.
   """
   # create default template context for use with any templates
-  context = response_helpers.getUniversalContext(request)
+  context = helper.responses.getUniversalContext(request)
 
   alt_response = simple.getAltResponseIfNotDeveloper(request,
                                                      context=context)
@@ -417,7 +417,7 @@
 
       # redirect to new /site/user/profile/new_linkname?s=0
       # (causes 'Profile saved' message to be displayed)
-      return response_helpers.redirectToChangedSuffix(
+      return helper.responses.redirectToChangedSuffix(
           request, None, new_linkname,
           params=profile.SUBMIT_PROFILE_SAVED_PARAMS)
   else: # method == 'GET':
@@ -426,4 +426,4 @@
 
   context['form'] = form
 
-  return response_helpers.respond(request, template, context)
+  return helper.responses.respond(request, template, context)
diff -r 01e90bb21b7e -r 00cea07656c0 app/soc/views/sponsor/profile.py
--- a/app/soc/views/sponsor/profile.py	Fri Oct 03 23:08:28 2008 +0000
+++ b/app/soc/views/sponsor/profile.py	Fri Oct 03 23:17:49 2008 +0000
@@ -26,8 +26,8 @@
 from soc.logic import sponsor
 from soc.views import simple
 from soc.views import helper
+import soc.views.helper.responses
 import soc.views.helper.templates
-from soc.views.helpers import response_helpers
 
 
 DEF_SPONSOR_PUBLIC_TMPL = 'soc/group/profile/public.html'
@@ -44,7 +44,7 @@
     A subclass of django.http.HttpResponse with generated template.
   """
   # create default template context for use with any templates
-  context = response_helpers.getUniversalContext(request)
+  context = helper.responses.getUniversalContext(request)
 
   try:
     linkname_sponsor = sponsor.getSponsorIfLinkName(linkname)
@@ -58,4 +58,4 @@
   context.update({'linkname_group': linkname_sponsor,
                   'group_type': 'Sponsor'})
 
-  return response_helpers.respond(request, template, context)
\ No newline at end of file
+  return helper.responses.respond(request, template, context)
\ No newline at end of file
diff -r 01e90bb21b7e -r 00cea07656c0 app/soc/views/user/profile.py
--- a/app/soc/views/user/profile.py	Fri Oct 03 23:08:28 2008 +0000
+++ b/app/soc/views/user/profile.py	Fri Oct 03 23:17:49 2008 +0000
@@ -33,9 +33,9 @@
 from soc.logic.site import id_user
 from soc.views import helper
 import soc.views.helper.requests
+import soc.views.helper.responses
 from soc.views import simple
 from soc.views.helpers import forms_helpers
-from soc.views.helpers import response_helpers
 
 import soc.models.user
 
@@ -90,7 +90,7 @@
   id = users.get_current_user()
 
   # create default template context for use with any templates
-  context = response_helpers.getUniversalContext(request)
+  context = helper.responses.getUniversalContext(request)
 
   if (not id) and (not linkname):
     # not logged in, and no link name, so request that the user sign in 
@@ -130,7 +130,7 @@
 
       # redirect to new /user/profile/new_linkname?s=0
       # (causes 'Profile saved' message to be displayed)
-      return response_helpers.redirectToChangedSuffix(
+      return helper.responses.redirectToChangedSuffix(
           request, linkname, new_linkname, params=SUBMIT_PROFILE_SAVED_PARAMS)
   else: # request.method == 'GET'
     # try to fetch User entity corresponding to Google Account if one exists    
@@ -161,5 +161,5 @@
       # no User entity exists for this Google Account, so show a blank form
       form = UserForm()
 
-  context.update({'form': form})
-  return response_helpers.respond(request, template, context)
+  context['form'] = form
+  return helper.responses.respond(request, template, context)