Build default configuration into pyconfig directly

2 files changed, 7 insertions, 6 deletions

diff --git a/paste/app_setup.py b/paste/app_setup.py
index 2bc9f9b..007b9d5 100644
--- a/paste/app_setup.py
+++ b/paste/app_setup.py
@@ -72,11 +72,7 @@ def find_template_config(args):
     conf_fn = os.path.join(os.getcwd(), 'server.conf')
     if not os.path.exists(conf_fn):
         return None
-    conf = pyconfig.Config()
-    default_config_fn = os.path.join(os.path.dirname(__file__),
-                                     'default_config.conf')
-    if os.path.exists(default_config_fn):
-        conf.load(default_config_fn)
+    conf = pyconfig.Config(with_default=True)
     conf.load(conf_fn)
     return conf_fn, conf.get('app_template')
 
diff --git a/paste/pyconfig.py b/paste/pyconfig.py
index db6f0f4..497378f 100644
--- a/paste/pyconfig.py
+++ b/paste/pyconfig.py
@@ -34,8 +34,13 @@ class BadCommandLine(Exception):
 
 class Config(UserDict.DictMixin):
 
-    def __init__(self):
+    def __init__(self, with_default=False):
         self.namespaces = []
+        if with_default:
+            default_config_fn = os.path.join(os.path.dirname(__file__),
+                                             'default_config.conf')
+            if os.path.exists(default_config_fn):
+                self.load(default_config_fn)
 
     def __getitem__(self, attr):
         for space in self.namespaces: