Mercurial > ~astiob > upreckon > hgweb

comparison 2.00/config.py @ 38:a6d554679ce8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed a bug with nested configuration namespaces in config.py
author Oleg Oshmyan <chortos@inbox.lv>
date Fri, 03 Dec 2010 02:45:56 +0000
parents dc4be35d17e0
children 81f58c938ec5
comparison
equal deleted inserted replaced
37:ddb3e1098727 38:a6d554679ce8
120 except TypeError: 120 except TypeError:
121 module.paddummies = module.padwithzeroestolength 121 module.paddummies = module.padwithzeroestolength
122 for name in defaults_problem: 122 for name in defaults_problem:
123 if not hasattr(globalconf, name): 123 if not hasattr(globalconf, name):
124 setattr(module, name, getattr(module, name, defaults_problem[name])) 124 setattr(module, name, getattr(module, name, defaults_problem[name]))
125 module = Config(module, globalconf)
125 if not module.dummyinname: 126 if not module.dummyinname:
126 module.dummyinname = getattr(module, 'testcaseinname', module.dummyinname) 127 module.dummyinname = getattr(module, 'testcaseinname', module.dummyinname)
127 if not module.dummyoutname: 128 if not module.dummyoutname:
128 module.dummyoutname = getattr(module, 'testcaseoutname', module.dummyoutname) 129 module.dummyoutname = getattr(module, 'testcaseoutname', module.dummyoutname)
129 if not hasattr(module, 'path'): 130 if not hasattr(module, 'path'):
134 else: 135 else:
135 module.path = problem_name 136 module.path = problem_name
136 if options.no_maxtime: 137 if options.no_maxtime:
137 module.maxtime = 0 138 module.maxtime = 0
138 sys.dont_write_bytecode = dwb 139 sys.dont_write_bytecode = dwb
139 module = Config(module, globalconf)
140 for name in patterns: 140 for name in patterns:
141 if hasattr(module, name): 141 if hasattr(module, name):
142 setattr(module, name, getattr(module, name).replace('%', problem_name)) 142 setattr(module, name, getattr(module, name).replace('%', problem_name))
143 return module 143 return module
144 144