Fixes raw to interpolated value by recursive substitution. Avoid too deeply recursive extended interpolation cross sections (test covered now);

pull/1750/head
sebres 7 years ago
parent 0782b28460
commit 9a768c19d0

@ -164,8 +164,8 @@ after = 1.conf
except KeyError: except KeyError:
continue continue
else: else:
# get substituted value of opt in section: # get raw value of opt in section:
v = self.get(sec, opt) v = self.get(sec, opt, raw=True)
else: else:
try: try:
v = self._defaults[opt] v = self._defaults[opt]

@ -170,24 +170,31 @@ a = def-a
b = def-b,a:`%(a)s` b = def-b,a:`%(a)s`
c = def-c,b:"%(b)s" c = def-c,b:"%(b)s"
d = def-d-b:"%(known/b)s" d = def-d-b:"%(known/b)s"
[jail] [jail]
a = jail-a-%(test/a)s a = jail-a-%(test/a)s
b = jail-b-%(test/b)s b = jail-b-%(test/b)s
y = %(test/y)s
[test] [test]
a = test-a-%(default/a)s a = test-a-%(default/a)s
b = test-b-%(known/b)s b = test-b-%(known/b)s
x = %(test/x)s
y = %(jail/y)s
""") """)
self.assertTrue(self.c.read('g')) self.assertTrue(self.c.read('g'))
self.assertEqual(self.c.get('test', 'a'), 'test-a-def-a') self.assertEqual(self.c.get('test', 'a'), 'test-a-def-a')
self.assertEqual(self.c.get('test', 'b'), 'test-b-def-b,a:`test-a-def-a`') self.assertEqual(self.c.get('test', 'b'), 'test-b-def-b,a:`test-a-def-a`')
self.assertEqual(self.c.get('jail', 'a'), 'jail-a-test-a-def-a') self.assertEqual(self.c.get('jail', 'a'), 'jail-a-test-a-def-a')
self.assertEqual(self.c.get('jail', 'b'), 'jail-b-test-b-def-b,a:`test-a-def-a`') self.assertEqual(self.c.get('jail', 'b'), 'jail-b-test-b-def-b,a:`jail-a-test-a-def-a`')
self.assertEqual(self.c.get('jail', 'c'), 'def-c,b:"jail-b-test-b-def-b,a:`test-a-def-a`"') self.assertEqual(self.c.get('jail', 'c'), 'def-c,b:"jail-b-test-b-def-b,a:`jail-a-test-a-def-a`"')
self.assertEqual(self.c.get('jail', 'd'), 'def-d-b:"def-b,a:`jail-a-test-a-def-a`"') self.assertEqual(self.c.get('jail', 'd'), 'def-d-b:"def-b,a:`jail-a-test-a-def-a`"')
self.assertEqual(self.c.get('test', 'c'), 'def-c,b:"test-b-def-b,a:`test-a-def-a`"') self.assertEqual(self.c.get('test', 'c'), 'def-c,b:"test-b-def-b,a:`test-a-def-a`"')
self.assertEqual(self.c.get('test', 'd'), 'def-d-b:"def-b,a:`test-a-def-a`"') self.assertEqual(self.c.get('test', 'd'), 'def-d-b:"def-b,a:`test-a-def-a`"')
self.assertEqual(self.c.get('DEFAULT', 'c'), 'def-c,b:"def-b,a:`def-a`"') self.assertEqual(self.c.get('DEFAULT', 'c'), 'def-c,b:"def-b,a:`def-a`"')
self.assertEqual(self.c.get('DEFAULT', 'd'), 'def-d-b:"def-b,a:`def-a`"') self.assertEqual(self.c.get('DEFAULT', 'd'), 'def-d-b:"def-b,a:`def-a`"')
self.assertRaises(Exception, self.c.get, 'test', 'x')
self.assertRaises(Exception, self.c.get, 'jail', 'y')
class JailReaderTest(LogCaptureTestCase): class JailReaderTest(LogCaptureTestCase):

Loading…
Cancel
Save