diff options
| -rw-r--r-- | CHANGES.txt | 10 | ||||
| -rw-r--r-- | TODO.txt | 14 | ||||
| -rw-r--r-- | docs/whatsnew-1.2.rst | 10 | ||||
| -rw-r--r-- | pyramid/traversal.py | 25 | ||||
| -rw-r--r-- | pyramid/url.py | 8 | ||||
| -rw-r--r-- | pyramid/view.py | 8 |
6 files changed, 38 insertions, 37 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 7f2834542..873c445e9 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -15,6 +15,16 @@ Features HTTP method names. Previously it was restricted to being a string representing a single HTTP method name. +- Undeprecated ``pyramid.traversal.find_model``, + ``pyramid.traversal.model_path``, ``pyramid.traversal.model_path_tuple``, + and ``pyramid.url.model_url``, which were all deprecated in Pyramid 1.0. + There's just not much cost to keeping them around forever as aliases to + their renamed ``resource_*`` prefixed functions. + +- Undeprecated ``pyramid.view.bfg_view``, which was deprecated in Pyramid + 1.0. This is a low-cost alias to ``pyramid.view.view_config`` which we'll + just keep around forever. + Dependencies ------------ @@ -100,6 +100,20 @@ Future - 1.3: Add a default-view-config-params decorator that can be applied to a class which names defaults for method-based view_config decorator options. +- 1.4: Remove ``chameleon_text`` / ``chameleon_zpt`` deprecated functions + (render_*) + +- 1.4: Remove ``pyramid.configuration.ConfigurationError`` (deprecated). + +- 1.4: Remove ``pyramid.paster.PyramidTemplate`` (deprecated). + +- 1.3: Remove ``pyramid.renderers.renderer_from_name`` (deprecated). + +- 1.5: Remove ``pyramid.requests.DeprecatedRequestMethodsMixin``. + +- 1.4: Remove ``pyramid.settings.get_settings`` (deprecated). + +- 1.5: Remove all deprecated ``pyramid.testing`` functions. Probably Bad Ideas ------------------ diff --git a/docs/whatsnew-1.2.rst b/docs/whatsnew-1.2.rst index 4147b4285..bebc1e0be 100644 --- a/docs/whatsnew-1.2.rst +++ b/docs/whatsnew-1.2.rst @@ -160,6 +160,16 @@ Minor Feature Additions tuple of HTTP method names. Previously it was restricted to being a string representing a single HTTP method name. +- Undeprecated ``pyramid.traversal.find_model``, + ``pyramid.traversal.model_path``, ``pyramid.traversal.model_path_tuple``, + and ``pyramid.url.model_url``, which were all deprecated in Pyramid 1.0. + There's just not much cost to keeping them around forever as aliases to + their renamed ``resource_*`` prefixed functions. + +- Undeprecated ``pyramid.view.bfg_view``, which was deprecated in Pyramid + 1.0. This is a low-cost alias to ``pyramid.view.view_config`` which we'll + just keep around forever. + Deprecations ------------ diff --git a/pyramid/traversal.py b/pyramid/traversal.py index 73f994bda..bab5389a4 100644 --- a/pyramid/traversal.py +++ b/pyramid/traversal.py @@ -3,7 +3,6 @@ import warnings from zope.interface import implements from zope.interface.interfaces import IInterface -from zope.deprecation import deprecated from repoze.lru import lru_cache @@ -85,13 +84,7 @@ def find_resource(resource, path): raise KeyError('%r has no subelement %s' % (context, view_name)) return context -find_model = find_resource # b/w compat - -deprecated( - 'find_model', - 'pyramid.traversal.find_model is deprecated as of Pyramid 1.0. Use' - '``pyramid.traversal.find_resource`` instead (API-compat, simple ' - 'rename).') +find_model = find_resource # b/w compat (forever) def find_interface(resource, class_or_interface): """ @@ -159,13 +152,7 @@ def resource_path(resource, *elements): # which caches the joined result for us return _join_path_tuple(resource_path_tuple(resource, *elements)) -model_path = resource_path # b/w compat - -deprecated( - 'model_path', - 'pyramid.traversal.model_path is deprecated as of Pyramid 1.0. Use' - '``pyramid.traversal.resource_path`` instead (API-compat, simple rename).') - +model_path = resource_path # b/w compat (forever) def traverse(resource, path): """Given a resource object as ``resource`` and a string or tuple @@ -369,13 +356,7 @@ def resource_path_tuple(resource, *elements): """ return tuple(_resource_path_list(resource, *elements)) -model_path_tuple = resource_path_tuple # b/w compat - -deprecated( - 'model_path_tuple', - 'pyramid.traversal.model_path_tuple is deprecated as of Pyramid 1.0. Use' - '``pyramid.traversal.resource_path_tuple`` instead (API-compat, simple ' - 'rename).') +model_path_tuple = resource_path_tuple # b/w compat (forever) def _resource_path_list(resource, *elements): """ Implementation detail shared by resource_path and resource_path_tuple""" diff --git a/pyramid/url.py b/pyramid/url.py index a3059fa87..a28228290 100644 --- a/pyramid/url.py +++ b/pyramid/url.py @@ -2,8 +2,6 @@ import os -from zope.deprecation import deprecated - from repoze.lru import lru_cache from pyramid.interfaces import IContextURL @@ -528,12 +526,6 @@ def resource_url(resource, request, *elements, **kw): model_url = resource_url # b/w compat (forever) -deprecated( - 'model_url', - 'pyramid.url.model_url is deprecated as of Pyramid 1.0. Use ' - '``pyramid.url.resource_url`` instead (API-compat, simple ' - 'rename) or the ``pyramid.request.Request.resource_url`` method.') - def static_url(path, request, **kw): """ This is a backwards compatibility function. Its result is the same as diff --git a/pyramid/view.py b/pyramid/view.py index ce9cb6bc9..96b7c6413 100644 --- a/pyramid/view.py +++ b/pyramid/view.py @@ -230,13 +230,7 @@ class view_config(object): settings['_info'] = info.codeinfo # fbo "action_method" return wrapped -bfg_view = view_config - -deprecated( - 'bfg_view', - 'pyramid.view.bfg_view is deprecated as of Pyramid 1.0. Use ' - 'pyramid.view.view_config instead (API-compat, simple ' - 'rename).') +bfg_view = view_config # bw compat (forever) class AppendSlashNotFoundViewFactory(object): """ There can only be one :term:`Not Found view` in any |