summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pyramid/config.py4
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: