Revision: 5018 Author: rotem Date: 2008-02-14 17:24:45 +0000 (Thu, 14 Feb 2008)
Log Message: ----------- Always encode wiki syntax in Page.aslink and Category.aslink.
Modified Paths: -------------- trunk/pywikipedia/catlib.py trunk/pywikipedia/wikipedia.py
Modified: trunk/pywikipedia/catlib.py =================================================================== --- trunk/pywikipedia/catlib.py 2008-02-14 17:22:58 UTC (rev 5017) +++ trunk/pywikipedia/catlib.py 2008-02-14 17:24:45 UTC (rev 5018) @@ -72,22 +72,22 @@
This method is different from Page.aslink() as the sortkey may have to be included. - + """ if self.sortKey: - titleWithSortKey = '%s|%s' % (self.title(), self.sortKey) + titleWithSortKey = '%s|%s' % (self.title(savetitle=True), self.sortKey) else: - titleWithSortKey = self.title() + titleWithSortKey = self.title(savetitle=True) if not noInterwiki and (forceInterwiki or self.site() != wikipedia.getSite()): if self.site().family != wikipedia.getSite().family \ and self.site().family.name != self.site().lang: return '[[%s:%s:%s]]' % (self.site().family.name, - self.site().lang, self.title()) + self.site().lang, self.title(savetitle=True)) else: - return '[[%s:%s]]' % (self.site().lang, self.title()) + return '[[%s:%s]]' % (self.site().lang, self.title(savetitle=True)) elif textlink: - return '[[:%s]]' % self.title() + return '[[:%s]]' % self.title(savetitle=True) else: return '[[%s]]' % titleWithSortKey
Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2008-02-14 17:22:58 UTC (rev 5017) +++ trunk/pywikipedia/wikipedia.py 2008-02-14 17:24:45 UTC (rev 5018) @@ -512,9 +512,9 @@ return u'[[%s:%s]]' % (self.site().lang, self.title(savetitle=True)) elif textlink and (self.isImage() or self.isCategory()): - return u'[[:%s]]' % self.title() + return u'[[:%s]]' % self.title(savetitle=True) else: - return u'[[%s]]' % self.title() + return u'[[%s]]' % self.title(savetitle=True)
def autoFormat(self): """Return (dictName, value) if title is in date.autoFormat dictionary.
pywikipedia-l@lists.wikimedia.org