Ticket #14557: base.py.diff

base.py

@@ -30 +30 @@
         # Go through keyword arguments, and either save their values to our
         # instance, or raise an error.
         for key, value in kwargs.iteritems():
+            # sanitize keyword arguments
+            if key in self.http_method_names:
+                raise TypeError(u"You tried to pass in the %s method name as a "
+                                u"keyword argument to %s(). Don't do that."
+                                % (key, self.__class__.__name__))
+            if not hasattr(self, key):
+                raise TypeError(u"%s() received an invalid keyword %r" % (
+                    self.__class__.__name__, key))
+            
             setattr(self, key, value)
 
+            
+    def __call__(self, request, *args, **kwargs):
+        return self.dispatch(request, *args, **kwargs)
+    
     @classonlymethod
     def as_view(cls, **initkwargs):
         """
         Main entry point for a request-response process.
         """
-        # sanitize keyword arguments
-        for key in initkwargs:
-            if key in cls.http_method_names:
-                raise TypeError(u"You tried to pass in the %s method name as a "
-                                u"keyword argument to %s(). Don't do that."
-                                % (key, cls.__name__))
-            if not hasattr(cls, key):
-                raise TypeError(u"%s() received an invalid keyword %r" % (
-                    cls.__name__, key))
-
         def view(request, *args, **kwargs):
             self = cls(**initkwargs)
             return self.dispatch(request, *args, **kwargs)