summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbottle.py5
-rwxr-xr-xdocs/tutorial.rst2
2 files changed, 4 insertions, 3 deletions
diff --git a/bottle.py b/bottle.py
index ad09042..03b6be7 100755
--- a/bottle.py
+++ b/bottle.py
@@ -1967,7 +1967,8 @@ def validate(**vkargs):
"""
dept('Use route wildcard filters instead.')
def decorator(func):
- def wrapper(**kargs):
+ @functools.wraps(func)
+ def wrapper(*args, **kargs):
for key, value in vkargs.iteritems():
if key not in kargs:
abort(403, 'Missing parameter: %s' % key)
@@ -1975,7 +1976,7 @@ def validate(**vkargs):
kargs[key] = value(kargs[key])
except ValueError:
abort(403, 'Wrong parameter format for: %s' % key)
- return func(**kargs)
+ return func(*args, **kargs)
return wrapper
return decorator
diff --git a/docs/tutorial.rst b/docs/tutorial.rst
index 39fa40c..d867435 100755
--- a/docs/tutorial.rst
+++ b/docs/tutorial.rst
@@ -200,7 +200,7 @@ The POST method is commonly used for HTML form submission. This example shows ho
return '''<form method="POST">
<input name="name" type="text" />
<input name="password" type="password" />
- </from>'''
+ </form>'''
@post('/login') # or @route('/login', method='POST')
def login_submit():