summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-01-30 18:54:51 -0500
committerChris McDonough <chrism@plope.com>2011-01-30 18:54:51 -0500
commitb9e87bb8ce648d00de596dc7d0d16204825c9ee7 (patch)
tree2d57665cde2e10625217ee9d1d54f1b9519797f6
parent5236f382ebc58f4b46f273c034449664d198fce0 (diff)
downloadpyramid-b9e87bb8ce648d00de596dc7d0d16204825c9ee7.tar.gz
pyramid-b9e87bb8ce648d00de596dc7d0d16204825c9ee7.tar.bz2
pyramid-b9e87bb8ce648d00de596dc7d0d16204825c9ee7.zip
remove useless warnings
-rw-r--r--pyramid/settings.py17
1 files changed, 5 insertions, 12 deletions
diff --git a/pyramid/settings.py b/pyramid/settings.py
index 9d1bb6acb..b1078f2ec 100644
--- a/pyramid/settings.py
+++ b/pyramid/settings.py
@@ -71,18 +71,11 @@ class Settings(dict):
def get_settings():
"""
- Return a 'settings' object for the current application. A
- 'settings' object is a dictionary-like object that contains
- key/value pairs based on the dictionary passed as the ``settings``
- argument to the :class:`pyramid.config.Configurator`
- constructor or the :func:`pyramid.router.make_app` API.
-
- .. note:: For backwards compatibility, dictionary keys can also be
- looked up as attributes of the settings object.
-
- .. note:: the
- :class:`pyramid.config.Configurator.get_settings` method
- performs the same duty.
+ Return a :term:`deployment settings` object for the current application.
+ The object is a dictionary-like object that contains key/value pairs
+ based on the dictionary passed as the ``settings`` argument to the
+ :class:`pyramid.config.Configurator` constructor or the
+ :func:`pyramid.router.make_app` API.
.. warning:: This method is deprecated as of Pyramid 1.0. Use
``pyramid.threadlocals.get_current_registry().settings`` instead or use