Mercurial > ~astiob > upreckon > hgweb
diff upreckon/problem.py @ 196:67088c1765b4
Regexps now work with test archives
Excuse me while I rewrite files.{File,regexp} almost from scratch...
| author | Oleg Oshmyan <chortos@inbox.lv> |
|---|---|
| date | Mon, 15 Aug 2011 19:52:58 +0300 |
| parents | a76cdc26ba9d |
| children | 166a23999bf7 |
line wrap: on
line diff
--- a/upreckon/problem.py Sun Aug 14 01:02:10 2011 +0300 +++ b/upreckon/problem.py Mon Aug 15 19:52:58 2011 +0300 @@ -355,13 +355,13 @@ reobj = re.compile(pattern, re.UNICODE) if not group: ids = [] - for path, vpath in files.regexp(pattern): - ids.append(re.match(reobj, vpath).group(1)) + for f in files.regexp(pattern): + ids.append(re.match(reobj, f.virtual_path).group(1)) return natsorted(ids) else: ids = {} - for path, vpath in files.regexp(pattern): - m = re.match(reobj, vpath) + for f in files.regexp(pattern): + m = re.match(reobj, f.virtual_path) g = m.group(group) ids.setdefault(g, []) ids[g].append(m.group(1))