Revision: 8597 Author: xqt Date: 2010-09-25 11:08:10 +0000 (Sat, 25 Sep 2010) Log Message: ----------- update from trunk Modified Paths: -------------- branches/rewrite/pywikibot/textlib.py Modified: branches/rewrite/pywikibot/textlib.py =================================================================== --- branches/rewrite/pywikibot/textlib.py 2010-09-25 10:15:35 UTC (rev 8596) +++ branches/rewrite/pywikibot/textlib.py 2010-09-25 11:08:10 UTC (rev 8597) @@ -369,7 +369,7 @@ """ # Find a marker that is not already in the text. - marker = findmarker( oldtext, u'@@') + marker = findmarker(oldtext, u'@@') if site is None: site = pywikibot.getSite() separator = site.family.interwiki_text_separator @@ -383,8 +383,8 @@ separator=separatorstripped) s = interwikiFormat(new, insite = site) if s: - separator = site.family.interwiki_text_separator - if site.language() in site.family.interwiki_attop: + if site.language() in site.family.interwiki_attop or \ + u'<!-- interwiki at top -->' in oldtext: newtext = s + separator + s2.replace(marker,'').strip() else: # calculate what was after the language links on the page @@ -627,7 +627,6 @@ separator=separatorstripped) s = categoryFormat(new, insite = site) if s: - separator = site.family.category_text_separator if site.language() in site.family.category_attop: newtext = s + separator + s2 else: