Skip to content

Commit

Permalink
point at correct location of get_current_registry
Browse files Browse the repository at this point in the history
  • Loading branch information
mcdonc committed Nov 17, 2010
1 parent 34f44d8 commit 84df816
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Deprecations
------------

- The ``pyramid.settings.get_settings`` API is now deprecated. Use
``pyramid.threadlocals.get_registry().settings`` instead or use the
``pyramid.threadlocals.get_current_registry().settings`` instead or use the
``settings`` attribute of the registry available from the request
(``request.registry.settings``).

Expand Down
8 changes: 4 additions & 4 deletions pyramid/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ def get_settings():
performs the same duty.
.. warning:: This method is deprecated as of Pyramid 1.0. Use
``pyramid.threadlocals.get_registry().settings`` instead or use the
``settings`` attribute of the registry available from the request
``pyramid.threadlocals.get_current_registry().settings`` instead or use '
the ``settings`` attribute of the registry available from the request
(``request.registry.settings``).
"""
reg = get_current_registry()
Expand All @@ -88,8 +88,8 @@ def get_settings():
deprecated(
'get_settings',
'(pyramid.settings.get_settings is deprecated as of Pyramid 1.0. Use'
'``pyramid.threadlocals.get_registry().settings`` instead or use the '
'``settings`` attribute of the registry available from the request '
'``pyramid.threadlocals.get_current_registry().settings`` instead or use '
'the ``settings`` attribute of the registry available from the request '
'(``request.registry.settings``)).')

def asbool(s):
Expand Down

0 comments on commit 84df816

Please sign in to comment.