comparison config.py @ 73:b071ef77377c

String keys in pointmap are no longer treated as iterables except in legacy mode
author Oleg Oshmyan <chortos@inbox.lv>
date Thu, 06 Jan 2011 19:58:45 +0200
parents b9d5857f7b9a
children aea4fc87698a
comparison
equal deleted inserted replaced
72:7520b6bb6636 73:b071ef77377c
138 module.path = os.path.join(os.path.curdir, problem_name) 138 module.path = os.path.join(os.path.curdir, problem_name)
139 else: 139 else:
140 module.path = problem_name 140 module.path = problem_name
141 newpointmap = {} 141 newpointmap = {}
142 for key in module.pointmap: 142 for key in module.pointmap:
143 try: 143 if not options.legacy and isinstance(key, basestring):
144 for k in key:
145 newpointmap[k] = module.pointmap[key]
146 except TypeError:
147 newpointmap[key] = module.pointmap[key] 144 newpointmap[key] = module.pointmap[key]
145 else:
146 try:
147 for k in key:
148 newpointmap[k] = module.pointmap[key]
149 except TypeError:
150 newpointmap[key] = module.pointmap[key]
148 module.pointmap = newpointmap 151 module.pointmap = newpointmap
149 if options.no_maxtime: 152 if options.no_maxtime:
150 module.maxtime = 0 153 module.maxtime = 0
151 sys.dont_write_bytecode = dwb 154 sys.dont_write_bytecode = dwb
152 for name in patterns: 155 for name in patterns: