Changes between Version 8 and Version 9 of ShortcutSyntaxIdeas

Timestamp:

Sep 21, 2005, 1:03:58 PM (19 years ago)

Author:

brantley (deadwisdom@…

Comment:

--

ShortcutSyntaxIdeas

@@ -86 +86 @@
 {{{
 #!python
-class PageException(Exception):
-    def __init__(self, arg):
-        self.arg = arg
-    
-    def __call__(self):
-        pass
-
-class HttpResponseRedirect(PageException):    
-    def __call__(self):
-        return httpwrappers.HttpResponseRedirect(self.arg)
-
-def page(template, **decorator_args):
+def page(template, context=None, **decorator_args):
     def _wrapper(fn):
         def _innerWrapper(request, **args):
-            if (template):
-                tmplt = template_loader.get_template(template)
-                context_dict = decorator_args.copy()
-            try:
-                for i in fn(request, **args):
-                    context_dict.update(i)
-                context = Context(request, context_dict)
-                return httpwrappers.HttpResponse(tmplt.render(context))
-            except PageException, e:
-                return e()
+            for i in fn(request, **args):
+                if isinstance(i, httpwrappers.HttpResponse):
+                    return i
+                if type(i) == type(()):
+                    context_dict[i[0]] = i[1]
+                else:
+                    context_dict.update(i)            
+            return load_and_render(template, context_dict, context=context)
             
         return _innerWrapper
     return _wrapper
+
 }}}