Changeset 612 in tailor

Timestamp:

08/17/05 19:43:15 (8 years ago)

Author:

lele@…

Hash name:

20050817174315-97f81-77122dd79cffc2e1849f2777a3f544853e4e108c

Message:

Pass vars to ConfigParser?.get() to override defaults with project's settings

Location:

vcpx

Files:

• config.py (modified) (1 diff)
• repository.py (modified) (1 diff)

vcpx/config.py

@@ -54 +54 @@
         return defaultp or [s for s in self.sections() if not ':' in s]
 
-    def get(self, section, option, default=None):
+    def get(self, section, option, default=None, vars=None):
         """
         Return the requested option value if present, otherwise the default.
         """
-        if self.has_option(section, option):
-            value = SafeConfigParser.get(self, section, option)
+
+        if self.has_option(section, option) or (vars and option in vars):
+            value = SafeConfigParser.get(self, section, option, vars=vars)
             if value == 'None':
                 return default

vcpx/repository.py

@@ -50 +50 @@
                       config.get(self.name, '%s-module' % which)
         self.rootdir = config.get(self.name, 'root-directory',
-                                  self.project.rootdir)
-        self.subdir = config.get(self.name, 'subdir', self.project.subdir)
+                                  vars={'root-directory': self.project.rootdir})
+        self.subdir = config.get(self.name, 'subdir',
+                                 vars={'subdir': self.project.subdir})
 
     def _validateConfiguration(self):