diff options
| author | Chris McDonough <chrism@plope.com> | 2011-04-22 13:42:19 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-04-22 13:42:19 -0400 |
| commit | ed7ffe0e2065100f551793b3774656d8bdde0fb0 (patch) | |
| tree | 53637b76d148774c5a7c3b9e103373e33e6c2f9e /docs/narr/advconfig.rst | |
| parent | c150d77248653172b487326a1059b8c0bc5056e4 (diff) | |
| download | pyramid-ed7ffe0e2065100f551793b3774656d8bdde0fb0.tar.gz pyramid-ed7ffe0e2065100f551793b3774656d8bdde0fb0.tar.bz2 pyramid-ed7ffe0e2065100f551793b3774656d8bdde0fb0.zip | |
- Make sure deprecation warnings aren't raised when tests are run.
- Modify documentation for cross-referencing.
- Use add_view(viewname) syntax rather than add_view(view=viewname)
syntax for normalization.
- Use warnings.warn rather than zope.deprecated in order to make
testing easier.
- Move tests which test deprecated methods of configurator to a
separate test case.
Diffstat (limited to 'docs/narr/advconfig.rst')
| -rw-r--r-- | docs/narr/advconfig.rst | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst index 7ae80155b..5ee554284 100644 --- a/docs/narr/advconfig.rst +++ b/docs/narr/advconfig.rst @@ -295,15 +295,9 @@ These are the methods of the configurator which provide conflict detection: :meth:`~pyramid.config.Configurator.set_locale_negotiator` and :meth:`~pyramid.config.Configurator.set_default_permission`. -Some other methods of the configurator also indirectly provide conflict -detection, because they're implemented in terms of conflict-aware methods: - -- :meth:`~pyramid.config.Configurator.add_route` does a second type of - conflict detection when a ``view`` parameter is passed (it calls - ``add_view``). This behavior has been deprecated in :app:`Pyramid` 1.1. - -- :meth:`~pyramid.config.Configurator.static_view`, a frontend for - ``add_route`` and ``add_view``. +:meth:`~pyramid.config.Configurator.add_static_view` also indirectly +provides conflict detection, because it's implemented in terms of the +conflict-aware ``add_route`` and ``add_view`` methods. .. _including_configuration: |