Revision: 7401 Author: xqt Date: 2009-10-09 08:24:48 +0000 (Fri, 09 Oct 2009)
Log Message: ----------- prevent relocating categories in templates
Modified Paths: -------------- trunk/pywikipedia/cosmetic_changes.py trunk/pywikipedia/wikipedia.py
Modified: trunk/pywikipedia/cosmetic_changes.py =================================================================== --- trunk/pywikipedia/cosmetic_changes.py 2009-10-09 07:48:53 UTC (rev 7400) +++ trunk/pywikipedia/cosmetic_changes.py 2009-10-09 08:24:48 UTC (rev 7401) @@ -165,10 +165,11 @@ }
class CosmeticChangesToolkit: - def __init__(self, site, debug = False, redirect = False): + def __init__(self, site, debug = False, redirect = False, template = False): self.site = site self.debug = debug self.redirect = redirect + self.template = template
def change(self, text): """ @@ -213,7 +214,7 @@ """ if wikipedia.calledModuleName() <> 'interwiki': interwikiLinks = wikipedia.getLanguageLinks(text, insite = self.site) - text = wikipedia.replaceLanguageLinks(text, interwikiLinks, site = self.site) + text = wikipedia.replaceLanguageLinks(text, interwikiLinks, site = self.site, template = self.template) return text
def standardizeCategories(self, text): @@ -222,7 +223,7 @@ does not sort them. """ # The PyWikipediaBot is no longer allowed to touch categories on the German Wikipedia. See http://de.wikipedia.org/wiki/Hilfe_Diskussion:Personendaten/Archiv/bis_2006#... - if self.site != wikipedia.getSite('de', 'wikipedia'): + if self.site != wikipedia.getSite('de', 'wikipedia') and not self.template: categories = wikipedia.getCategoryLinks(text, site = self.site) text = wikipedia.replaceCategoryLinks(text, categories, site = self.site) return text @@ -471,7 +472,7 @@ # Show the title of the page we're working on. # Highlight the title in purple. wikipedia.output(u"\n\n>>> \03{lightpurple}%s\03{default} <<<" % page.title()) - ccToolkit = CosmeticChangesToolkit(page.site(), debug = True) + ccToolkit = CosmeticChangesToolkit(page.site(), debug = True, template = (page.namespace() == 10)) changedText = ccToolkit.change(page.get()) if changedText != page.get(): if not self.acceptall:
Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2009-10-09 07:48:53 UTC (rev 7400) +++ trunk/pywikipedia/wikipedia.py 2009-10-09 08:24:48 UTC (rev 7401) @@ -1430,7 +1430,7 @@ old = newtext if not config.cosmetic_changes_mylang_only or (self.site().family.name == config.family and self.site().lang == config.mylang): import cosmetic_changes - ccToolkit = cosmetic_changes.CosmeticChangesToolkit(self.site(), redirect=self.isRedirectPage()) + ccToolkit = cosmetic_changes.CosmeticChangesToolkit(self.site(), redirect=self.isRedirectPage(), template = (self.namespace() == 10)) newtext = ccToolkit.change(newtext) if comment and old.strip().replace('\r\n', '\n') != newtext.strip().replace('\r\n', '\n'): comment += translate(self.site(), cosmetic_changes.msg_append)