summaryrefslogtreecommitdiff
path: root/repoze/bfg/view.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-11-18 00:37:21 +0000
committerChris McDonough <chrism@agendaless.com>2009-11-18 00:37:21 +0000
commit57267a39be342ace47cccfcb481dcc407a48b0d7 (patch)
tree2160f1a0d4f5614f410626b6a3a3b0c76a7547ac /repoze/bfg/view.py
parent541e450d8098988209af3ecfd3829b242999039c (diff)
downloadpyramid-57267a39be342ace47cccfcb481dcc407a48b0d7.tar.gz
pyramid-57267a39be342ace47cccfcb481dcc407a48b0d7.tar.bz2
pyramid-57267a39be342ace47cccfcb481dcc407a48b0d7.zip
- The ``repoze.bfg.registry.make_registry`` callable has been removed.
- The ``repoze.bfg.view.map_view`` callable has been removed. - The ``repoze.bfg.view.owrap_view`` callable has been removed. - The ``repoze.bfg.view.predicate_wrap`` callable has been removed. - The ``repoze.bfg.view.secure_view`` callable has been removed. - The ``repoze.bfg.view.authdebug_view`` callable has been removed. - The ``repoze.bfg.view.renderer_from_name`` callable has been removed. - Coverage.
Diffstat (limited to 'repoze/bfg/view.py')
-rw-r--r--repoze/bfg/view.py83
1 files changed, 21 insertions, 62 deletions
diff --git a/repoze/bfg/view.py b/repoze/bfg/view.py
index 47f752274..9406d5852 100644
--- a/repoze/bfg/view.py
+++ b/repoze/bfg/view.py
@@ -513,42 +513,6 @@ def derive_view(original_view, permission=None, predicates=(), attr=None,
wrapper_viewname=wrapper_viewname,
viewname=viewname)
-def renderer_from_name(self, path):
- reg = getSiteManager()
- from repoze.bfg.configuration import Configurator
- config = Configurator(reg)
- return config.renderer_from_name(path)
-
-def map_view(view, attr=None, renderer_name=None):
- reg = getSiteManager()
- from repoze.bfg.configuration import Configurator
- config = Configurator(reg)
- return reg.map_view(view, attr=attr, renderer_name=renderer_name)
-
-def owrap_view(view, viewname, wrapper_viewname):
- reg = getSiteManager()
- from repoze.bfg.configuration import Configurator
- config = Configurator(reg)
- return config.owrap_view(view, viewname, wrapper_viewname)
-
-def predicate_wrap(view, predicates):
- reg = getSiteManager()
- from repoze.bfg.configuration import Configurator
- config = Configurator(reg)
- return reg.predicate_wrap(view, predicates)
-
-def secure_view(view, permission):
- reg = getSiteManager()
- from repoze.bfg.configuration import Configurator
- config = Configurator(reg)
- return config.secure_view(view, permission)
-
-def authdebug_view(self, view, permission):
- reg = getSiteManager()
- from repoze.bfg.configuration import Configurator
- config = Configurator(reg)
- return config.authdebug_view(view, permission)
-
def requestonly(class_or_callable, attr=None):
""" Return true of the class or callable accepts only a request argument,
as opposed to something that accepts context, request """
@@ -631,28 +595,27 @@ class MultiView(object):
raise NotFound(self.name)
def decorate_view(wrapped_view, original_view):
- if wrapped_view is not original_view:
- wrapped_view.__module__ = original_view.__module__
- wrapped_view.__doc__ = original_view.__doc__
- try:
- wrapped_view.__name__ = original_view.__name__
- except AttributeError:
- wrapped_view.__name__ = repr(original_view)
- try:
- wrapped_view.__permitted__ = original_view.__permitted__
- except AttributeError:
- pass
- try:
- wrapped_view.__call_permissive__ = \
- original_view.__call_permissive__
- except AttributeError:
- pass
- try:
- wrapped_view.__predicated__ = original_view.__predicated__
- except AttributeError:
- pass
- return True
- return False
+ if wrapped_view is original_view:
+ return False
+ wrapped_view.__module__ = original_view.__module__
+ wrapped_view.__doc__ = original_view.__doc__
+ try:
+ wrapped_view.__name__ = original_view.__name__
+ except AttributeError:
+ wrapped_view.__name__ = repr(original_view)
+ try:
+ wrapped_view.__permitted__ = original_view.__permitted__
+ except AttributeError:
+ pass
+ try:
+ wrapped_view.__call_permissive__ = original_view.__call_permissive__
+ except AttributeError:
+ pass
+ try:
+ wrapped_view.__predicated__ = original_view.__predicated__
+ except AttributeError:
+ pass
+ return True
def rendered_response(renderer, response, view, context,request,
renderer_name):
@@ -681,7 +644,3 @@ def rendered_response(renderer, response, view, context,request,
if cache_for is not None:
response.cache_expires = cache_for
return response
-
-
-
-