Mercurial > ~astiob > upreckon > hgweb
comparison 2.00/config.py @ 43:81f58c938ec5
Fixed the -s option
author | Oleg Oshmyan <chortos@inbox.lv> |
---|---|
date | Sun, 05 Dec 2010 15:37:35 +0100 |
parents | a6d554679ce8 |
children |
comparison
equal
deleted
inserted
replaced
42:44609b41868b | 43:81f58c938ec5 |
---|---|
40 'maxexitcode': 0, | 40 'maxexitcode': 0, |
41 'inname': '', | 41 'inname': '', |
42 'ansname': ''} | 42 'ansname': ''} |
43 defaults_global = {'tasknames': None, | 43 defaults_global = {'tasknames': None, |
44 'force_zero_exitcode': True} | 44 'force_zero_exitcode': True} |
45 defaults_noerase = {'inname': '%.in', | |
46 'outname': '%.out', | |
47 'ansname': '%.ans'} | |
45 patterns = ('inname', 'outname', 'ansname', 'testcaseinname', | 48 patterns = ('inname', 'outname', 'ansname', 'testcaseinname', |
46 'testcaseoutname', 'dummyinname', 'dummyoutname') | 49 'testcaseoutname', 'dummyinname', 'dummyoutname') |
47 | 50 |
48 class Config(object): | 51 class Config(object): |
49 __slots__ = 'modules', '__dict__' | 52 __slots__ = 'modules', '__dict__' |
168 with ReadDeleting(inputdatafname) as f: | 171 with ReadDeleting(inputdatafname) as f: |
169 module = imp.load_module('testconf', f, metafile.full_real_path, ('.py', 'r', imp.PY_SOURCE)) | 172 module = imp.load_module('testconf', f, metafile.full_real_path, ('.py', 'r', imp.PY_SOURCE)) |
170 del sys.modules['testconf'] | 173 del sys.modules['testconf'] |
171 for name in defaults_global: | 174 for name in defaults_global: |
172 setattr(module, name, getattr(module, name, defaults_global[name])) | 175 setattr(module, name, getattr(module, name, defaults_global[name])) |
176 if not options.erase: | |
177 for name in defaults_noerase: | |
178 setattr(module, name, getattr(module, name, defaults_noerase[name])) | |
173 global globalconf | 179 global globalconf |
174 globalconf = module | 180 globalconf = module |
175 sys.dont_write_bytecode = dwb | 181 sys.dont_write_bytecode = dwb |
176 return module | 182 return module |