summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hellkamp <marc@gsites.de>2012-10-04 10:36:37 -0700
committerMarcel Hellkamp <marc@gsites.de>2012-10-04 10:36:37 -0700
commite52b2be25ebed31af7208a37ee47161ed7d5f193 (patch)
tree5ce6bb4c1236270d46828634871bc20a1db32ec9
parent96645e845b87d87cf3fc4c01b105ff4240c36108 (diff)
parent7c45f076c1dab4e582581530085824a801970b06 (diff)
downloadbottle-e52b2be25ebed31af7208a37ee47161ed7d5f193.tar.gz
Merge pull request #381 from fredj/plugin-apply-args
plugin.apply: rename context to route
-rw-r--r--bottle.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/bottle.py b/bottle.py
index dfda045..07e5baf 100644
--- a/bottle.py
+++ b/bottle.py
@@ -1566,7 +1566,7 @@ class JSONPlugin(object):
def __init__(self, json_dumps=json_dumps):
self.json_dumps = json_dumps
- def apply(self, callback, context):
+ def apply(self, callback, route):
dumps = self.json_dumps
if not dumps: return callback
def wrapper(*a, **ka):
@@ -1616,7 +1616,7 @@ class HooksPlugin(object):
if ka.pop('reversed', False): hooks = hooks[::-1]
return [hook(*a, **ka) for hook in hooks]
- def apply(self, callback, context):
+ def apply(self, callback, route):
if self._empty(): return callback
def wrapper(*a, **ka):
self.trigger('before_request')