maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

Improved cbv and added tests

Browse source
This commit is contained in:
Armin Ronacher 2011-06-28 14:24:37 +02:00
parent dcf21989dc
commit 775caf726d
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
flask/views.py
View file

@ -35,6 +35,10 @@ class View(object):
methods = None methods = None
def dispatch_request(self): def dispatch_request(self):
"""Subclasses have to override this method to implement the
actual view functionc ode. This method is called with all
the arguments from the URL rule.
"""
raise NotImplementedError() raise NotImplementedError()
@classmethod @classmethod
@ -48,8 +52,14 @@ class View(object):
constructor of the class. constructor of the class.
""" """
def view(*args, **kwargs): def view(*args, **kwargs):
self = cls(*class_args, **class_kwargs) self = view.view_class(*class_args, **class_kwargs)
return self.dispatch_request(*args, **kwargs) return self.dispatch_request(*args, **kwargs)
# we attach the view class to the view function for two reasons:
# first of all it allows us to easily figure out what class based
# view this thing came from, secondly it's also used for instanciating
# the view class so you can actually replace it with something else
# for testing purposes and debugging.
view.view_class = cls
view.__name__ = name view.__name__ = name
view.__doc__ = cls.__doc__ view.__doc__ = cls.__doc__
view.__module__ = cls.__module__ view.__module__ = cls.__module__
@ -61,17 +71,17 @@ class MethodViewType(type):
def __new__(cls, name, bases, d): def __new__(cls, name, bases, d):
rv = type.__new__(cls, name, bases, d) rv = type.__new__(cls, name, bases, d)
if rv.methods is None: if 'methods' not in d:
methods = [] methods = set(rv.methods or [])
for key, value in d.iteritems(): for key, value in d.iteritems():
if key in http_method_funcs: if key in http_method_funcs:
methods.append(key.upper()) methods.add(key.upper())
# if we have no method at all in there we don't want to # if we have no method at all in there we don't want to
# add a method list. (This is for instance the case for # add a method list. (This is for instance the case for
# the baseclass or another subclass of a base method view # the baseclass or another subclass of a base method view
# that does not introduce new methods). # that does not introduce new methods).
if methods: if methods:
rv.methods = methods rv.methods = sorted(methods)
return rv return rv