summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBert JW Regeer <bertjw@regeer.org>2015-10-16 00:00:32 -0600
committerBert JW Regeer <bertjw@regeer.org>2015-10-20 23:21:26 -0600
commitc5172f355ec48a8e9a7f63d5711ae34b7572307b (patch)
tree74e5ba608e24c7c0e0abda428b57a9643115ea29
parent3a20b74382c920638418a72789ed7d75b085b2d6 (diff)
downloadpyramid-c5172f355ec48a8e9a7f63d5711ae34b7572307b.tar.gz
pyramid-c5172f355ec48a8e9a7f63d5711ae34b7572307b.tar.bz2
pyramid-c5172f355ec48a8e9a7f63d5711ae34b7572307b.zip
Change default to value
-rw-r--r--pyramid/config/derivations.py22
1 files changed, 11 insertions, 11 deletions
diff --git a/pyramid/config/derivations.py b/pyramid/config/derivations.py
index b163bf12a..c23e5c479 100644
--- a/pyramid/config/derivations.py
+++ b/pyramid/config/derivations.py
@@ -154,8 +154,8 @@ class DefaultViewMapper(object):
def wraps_view(wrapper):
- def inner(view, default, **kw):
- wrapper_view = wrapper(view, default, **kw)
+ def inner(view, value, **kw):
+ wrapper_view = wrapper(view, value, **kw)
return preserve_view_attrs(view, wrapper_view)
return inner
@@ -193,7 +193,7 @@ def preserve_view_attrs(view, wrapper):
return wrapper
-def mapped_view(view, default, **kw):
+def mapped_view(view, value, **kw):
mapper = kw.get('mapper')
if mapper is None:
mapper = getattr(view, '__view_mapper__', None)
@@ -205,7 +205,7 @@ def mapped_view(view, default, **kw):
mapped_view = mapper(**kw)(view)
return mapped_view
-def owrapped_view(view, default, **kw):
+def owrapped_view(view, value, **kw):
wrapper_viewname = kw.get('wrapper_viewname')
viewname = kw.get('viewname')
if not wrapper_viewname:
@@ -224,7 +224,7 @@ def owrapped_view(view, default, **kw):
return wrapped_response
return _owrapped_view
-def http_cached_view(view, default, **kw):
+def http_cached_view(view, value, **kw):
if kw['registry'].settings.get('prevent_http_cache', False):
return view
@@ -253,7 +253,7 @@ def http_cached_view(view, default, **kw):
return wrapper
-def secured_view(view, default, **kw):
+def secured_view(view, value, **kw):
permission = kw.get('permission')
if permission == NO_PERMISSION_REQUIRED:
# allow views registered within configurations that have a
@@ -285,7 +285,7 @@ def secured_view(view, default, **kw):
return wrapped_view
-def authdebug_view(view, default, **kw):
+def authdebug_view(view, value, **kw):
wrapped_view = view
settings = kw['registry'].settings
permission = kw.get('permission')
@@ -322,7 +322,7 @@ def authdebug_view(view, default, **kw):
return wrapped_view
-def predicated_view(view, default, **kw):
+def predicated_view(view, value, **kw):
preds = kw.get('predicates', ())
if not preds:
return view
@@ -341,7 +341,7 @@ def predicated_view(view, default, **kw):
predicate_wrapper.__predicates__ = preds
return predicate_wrapper
-def attr_wrapped_view(view, default, **kw):
+def attr_wrapped_view(view, value, **kw):
kw = kw
accept, order, phash = (kw.get('accept', None),
kw.get('order', MAX_ORDER),
@@ -364,7 +364,7 @@ def attr_wrapped_view(view, default, **kw):
attr_view.__permission__ = kw.get('permission')
return attr_view
-def rendered_view(view, default, **kw):
+def rendered_view(view, value, **kw):
# one way or another this wrapper must produce a Response (unless
# the renderer is a NullRendererHelper)
renderer = kw.get('renderer')
@@ -432,7 +432,7 @@ def rendered_view(view, default, **kw):
return rendered_view
-def decorated_view(view, default, **kw):
+def decorated_view(view, value, **kw):
decorator = kw.get('decorator')
if decorator is None:
return view