summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-11-16 20:51:56 -0500
committerChris McDonough <chrism@plope.com>2010-11-16 20:51:56 -0500
commit84df816470b6745c628c177c99dee9fa844812c4 (patch)
treea9740b2f176380ad8b8f744a3386ee11787b9db3
parent34f44d844ffe75738046a154202a6faf4d5dfc38 (diff)
downloadpyramid-84df816470b6745c628c177c99dee9fa844812c4.tar.gz
pyramid-84df816470b6745c628c177c99dee9fa844812c4.tar.bz2
pyramid-84df816470b6745c628c177c99dee9fa844812c4.zip
point at correct location of get_current_registry
-rw-r--r--CHANGES.txt2
-rw-r--r--pyramid/settings.py8
2 files changed, 5 insertions, 5 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 28637c1a7..2737e6893 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -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``).
diff --git a/pyramid/settings.py b/pyramid/settings.py
index d6b0a6470..64b108421 100644
--- a/pyramid/settings.py
+++ b/pyramid/settings.py
@@ -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()
@@ -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):