Changes between Version 10 and Version 11 of ShortcutSyntaxIdeas

Timestamp:

Sep 21, 2005, 2:22:13 PM (19 years ago)

Author:

brantley (deadwisdom@…

Comment:

--

ShortcutSyntaxIdeas

@@ -96 +96 @@
 === Idea 1 ===
 
+This satisfies the complicated and simplistic decorator, return or yield.
 This goes in django.views.decorators.shortcuts:
 
@@ -103 +104 @@
     def _wrapper(fn):
         def _innerWrapper(request, **args):
-            for i in fn(request, **args):
-                if isinstance(i, httpwrappers.HttpResponse):
+            context_dict = decorator_args.copy()
+            g = fn(request, **args)
+            if not hasattr(g, 'next'):  #Is this a generator?  Otherwise make her a tuple!
+                g = (g,)
+            for i in g:
+                if isinstance(i, 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)
+                    context_dict.update(i)
+            return load_and_render(template, context_dict, context)
             
         return _innerWrapper