diff options
| author | Chris McDonough <chrism@plope.com> | 2011-08-06 16:35:26 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-08-06 16:35:26 -0400 |
| commit | 4f321df3ae4f09445555b653ef421f6b6fd97069 (patch) | |
| tree | 2491d0d88389f92eaca8452a5372233b501e12e3 | |
| parent | 28b40471d5a3558ee0dfe1d445c5b8bec0c1cf0b (diff) | |
| download | pyramid-4f321df3ae4f09445555b653ef421f6b6fd97069.tar.gz pyramid-4f321df3ae4f09445555b653ef421f6b6fd97069.tar.bz2 pyramid-4f321df3ae4f09445555b653ef421f6b6fd97069.zip | |
dont pop pyramid.includes or pyramid.request_handlers from the settings
| -rw-r--r-- | pyramid/config.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pyramid/config.py b/pyramid/config.py index 914bfbd53..6a7b4d328 100644 --- a/pyramid/config.py +++ b/pyramid/config.py @@ -717,9 +717,9 @@ class Configurator(object): other settings using the configurator's current registry, as per the descriptions in the Configurator constructor.""" if settings: - includes = settings.pop('pyramid.include', '') + includes = settings.get('pyramid.include', '') includes = [x.strip() for x in includes.splitlines()] - expl_handler_factories = settings.pop('pyramid.request_handlers','') + expl_handler_factories = settings.get('pyramid.request_handlers','') expl_handler_factories = [x.strip() for x in expl_handler_factories.splitlines()] else: |