equal
deleted
inserted
replaced
24 |
24 |
25 |
25 |
26 import logging |
26 import logging |
27 |
27 |
28 from google.appengine.api import users |
28 from google.appengine.api import users |
|
29 from google.appengine.runtime import DeadlineExceededError |
29 |
30 |
30 from django import http |
31 from django import http |
31 from django.template import loader |
32 from django.template import loader |
32 |
33 |
33 from soc.logic import system |
34 from soc.logic import system |
37 from soc.views.helper import html_menu |
38 from soc.views.helper import html_menu |
38 |
39 |
39 import soc.logic |
40 import soc.logic |
40 import soc.logic.models.user |
41 import soc.logic.models.user |
41 import soc.views.helper.requests |
42 import soc.views.helper.requests |
42 |
|
43 |
|
44 # DeadlineExceededError can live in two different places |
|
45 try: |
|
46 # When deployed |
|
47 from google.appengine.runtime import DeadlineExceededError |
|
48 except ImportError: |
|
49 # In the development server |
|
50 from google.appengine.runtime.apiproxy_errors import DeadlineExceededError |
|
51 |
43 |
52 |
44 |
53 def respond(request, template, context=None, response_args=None): |
45 def respond(request, template, context=None, response_args=None): |
54 """Helper to render a response, passing standard stuff to the response. |
46 """Helper to render a response, passing standard stuff to the response. |
55 |
47 |