diff options
| author | Michael Merickel <michael@merickel.org> | 2016-03-08 23:58:22 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2016-03-08 23:58:22 -0600 |
| commit | a610d0e52d98fcbeb0bacf6eebc61dbaba2d1cf9 (patch) | |
| tree | 13abe19e0a220f4b3eb60a504b9735324ccd6774 | |
| parent | a59312683873a27cf7f8cf9961002765f66cde1f (diff) | |
| download | pyramid-a610d0e52d98fcbeb0bacf6eebc61dbaba2d1cf9.tar.gz pyramid-a610d0e52d98fcbeb0bacf6eebc61dbaba2d1cf9.tar.bz2 pyramid-a610d0e52d98fcbeb0bacf6eebc61dbaba2d1cf9.zip | |
rename info.orig_view to info.original_view
| -rw-r--r-- | pyramid/config/views.py | 5 | ||||
| -rw-r--r-- | pyramid/interfaces.py | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pyramid/config/views.py b/pyramid/config/views.py index 4a5408ef7..ac95eaa59 100644 --- a/pyramid/config/views.py +++ b/pyramid/config/views.py @@ -1020,7 +1020,7 @@ class ViewsConfiguratorMixin(object): outer_derivers = [('predicated_view', d.predicated_view), ('attr_wrapped_view', d.attr_wrapped_view)] - view = info.orig_view + view = info.original_view derivers = self.registry.queryUtility(IViewDerivers, default=[]) for name, derivation in ( inner_derivers + derivers.sorted() + outer_derivers @@ -1225,6 +1225,7 @@ class ViewsConfiguratorMixin(object): registry=self.registry) options = dict( + view=view, context=context, permission=permission, attr=attr, @@ -1644,7 +1645,7 @@ def isexception(o): @implementer(IViewDeriverInfo) class ViewDeriverInfo(object): def __init__(self, view, registry, package, predicates, options): - self.orig_view = view + self.original_view = view self.registry = registry self.package = package self.predicates = predicates or [] diff --git a/pyramid/interfaces.py b/pyramid/interfaces.py index 5ae7cfbf8..6791befce 100644 --- a/pyramid/interfaces.py +++ b/pyramid/interfaces.py @@ -1202,7 +1202,7 @@ class IViewDeriverInfo(Interface): options = Attribute('The view options passed to the view, including any ' 'default values that were not overriden') predicates = Attribute('The list of predicates active on the view') - orig_view = Attribute('The original view object being wrapped') + original_view = Attribute('The original view object being wrapped') class ICacheBuster(Interface): """ |