diff options
| author | Chris McDonough <chrism@plope.com> | 2011-08-11 22:55:54 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-08-11 22:55:54 -0400 |
| commit | 65a5272b475e2db4cb8da665c39583a506da5644 (patch) | |
| tree | 12e12b917160c29623836f0e17b5b29b6cd75555 | |
| parent | 4d23e6652272956890ef79f003be3aa86fc7241d (diff) | |
| parent | 33277785fd3b088420a4319f567159f7aabfd99e (diff) | |
| download | pyramid-65a5272b475e2db4cb8da665c39583a506da5644.tar.gz pyramid-65a5272b475e2db4cb8da665c39583a506da5644.tar.bz2 pyramid-65a5272b475e2db4cb8da665c39583a506da5644.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
| -rw-r--r-- | pyramid/config.py | 2 | ||||
| -rw-r--r-- | pyramid/tests/test_config.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pyramid/config.py b/pyramid/config.py index b7fa7cac5..988c35a54 100644 --- a/pyramid/config.py +++ b/pyramid/config.py @@ -772,7 +772,7 @@ class Configurator(object): includes = [] if settings: includes = [x.strip() for x in - settings.get('pyramid.include', '').splitlines()] + settings.get('pyramid.includes', '').splitlines()] tweens = [x.strip() for x in settings.get('pyramid.tweens','').splitlines()] registry = self.registry diff --git a/pyramid/tests/test_config.py b/pyramid/tests/test_config.py index 5f5bbdc53..d0c8d9312 100644 --- a/pyramid/tests/test_config.py +++ b/pyramid/tests/test_config.py @@ -577,7 +577,7 @@ class ConfiguratorTests(unittest.TestCase): reg = Registry() config = self._makeOne(reg) settings = { - 'pyramid.include': """pyramid.tests.test_config.dummy_include + 'pyramid.includes': """pyramid.tests.test_config.dummy_include pyramid.tests.test_config.dummy_include2""", } config.setup_registry(settings=settings) |