http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11410
Revision: 11410 Author: xqt Date: 2013-04-21 12:58:43 +0000 (Sun, 21 Apr 2013) Log Message: ----------- update textlib from trunk r11409 and previous commits solving several problems with digits between nested templates.
Modified Paths: -------------- branches/rewrite/pywikibot/textlib.py
Modified: branches/rewrite/pywikibot/textlib.py =================================================================== --- branches/rewrite/pywikibot/textlib.py 2013-04-21 12:56:59 UTC (rev 11409) +++ branches/rewrite/pywikibot/textlib.py 2013-04-21 12:58:43 UTC (rev 11410) @@ -140,16 +140,22 @@ text = text.replace(item, '%s%d%s' % (marker2, count, marker2)) values[count] = item inside = {} - count = 0 + seen = set() while TEMP_REGEX.search(text) is not None: for m in TEMP_REGEX.finditer(text): - count += 1 item = m.group() + if item in seen: + continue # speed up + seen.add(item) + count = len(seen) text = text.replace(item, '%s%d%s' % (marker1, count, marker1))
# Make sure stored templates don't contain markers - for m2 in Rmarker1.finditer(item): - item = item.replace(m2.group(), inside[int(m2.group(1))]) + # We replace the last item first, otherwise inside templates + # like {{A{{B}}{{C}}1{{D}}}} could fail + for i in range(count - 1, 0, -1): + item = item.replace('%s%d%s' % (marker1, i, marker1), + inside[i]) for m2 in Rmarker2.finditer(item): item = item.replace(m2.group(), values[int(m2.group(1))]) inside[count] = item @@ -906,35 +912,40 @@ count = 0 for m in Rmath.finditer(thistxt): count += 1 - text = m.group() - thistxt = thistxt.replace(text, '%s%d%s' % (marker3, count, marker3)) - maths[count] = text + item = m.group() + thistxt = thistxt.replace(item, '%s%d%s' % (marker3, count, marker3)) + maths[count] = item
values = {} count = 0 for m in Rvalue.finditer(thistxt): count += 1 - text = m.group() - thistxt = thistxt.replace(text, '%s%d%s' % (marker4, count, marker4)) - values[count] = text + item = m.group() + thistxt = thistxt.replace(item, '%s%d%s' % (marker4, count, marker4)) + values[count] = item
inside = {} - count = 0 + seen = set() while TEMP_REGEX.search(thistxt) is not None: for m in TEMP_REGEX.finditer(thistxt): # Make sure it is not detected again - count += 1 - text = m.group() - thistxt = thistxt.replace(text, - '%s%d%s' % (marker, count, marker)) + item = m.group() + if item in seen: + continue # speed up + seen.add(item) + count = len(seen) + thistxt = thistxt.replace(item, '%s%d%s' % (marker, count, marker)) # Make sure stored templates don't contain markers - for m2 in Rmarker.finditer(text): - text = text.replace(m2.group(), inside[int(m2.group(1))]) - for m2 in Rmarker3.finditer(text): - text = text.replace(m2.group(), maths[int(m2.group(1))]) - for m2 in Rmarker4.finditer(text): - text = text.replace(m2.group(), values[int(m2.group(1))]) - inside[count] = text + # We replace the last item first, otherwise inside templates + # like {{A|{{B}}{{C}}1{{D}}}} could fail + for i in range(count - 1, 0, -1): + item = item.replace('%s%d%s' % (marker, count, marker), + inside[i]) + for m2 in Rmarker3.finditer(item): + item = item.replace(m2.group(), maths[int(m2.group(1))]) + for m2 in Rmarker4.finditer(item): + item = item.replace(m2.group(), values[int(m2.group(1))]) + inside[count] = item
# Name name = m.group('name').strip() @@ -982,10 +993,10 @@ count2 = 0 for m2 in pywikibot.link_regex.finditer(paramString): count2 += 1 - text = m2.group(0) + item = m2.group(0) paramString = paramString.replace( - text, '%s%d%s' % (marker2, count2, marker2)) - links[count2] = text + item, '%s%d%s' % (marker2, count2, marker2)) + links[count2] = item # Parse string markedParams = paramString.split('|') # Replace markers @@ -996,9 +1007,11 @@ param_name = unicode(numbered_param) param_val = param numbered_param += 1 - for m2 in Rmarker.finditer(param_val): - param_val = param_val.replace(m2.group(), - inside[int(m2.group(1))]) + count = len(inside) + for i in range(count - 1, 0, -1): + param_val = param_val.replace('%s%d%s' + % (marker, i, marker), + inside[i]) for m2 in Rmarker2.finditer(param_val): param_val = param_val.replace(m2.group(), links[int(m2.group(1))])