Revision: 6622 Author: cosoleto Date: 2009-04-18 12:57:37 +0000 (Sat, 18 Apr 2009)
Log Message: ----------- Simplified Page.aslink(). 7% faster with forceInterwiki = True and Python 2.5.2
Modified Paths: -------------- trunk/pywikipedia/wikipedia.py
Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2009-04-18 12:51:06 UTC (rev 6621) +++ trunk/pywikipedia/wikipedia.py 2009-04-18 12:57:37 UTC (rev 6622) @@ -583,19 +583,18 @@ namespaces will be preceded by a : character).
""" - if not noInterwiki and (forceInterwiki or self.site() != getSite()): + if not noInterwiki and (forceInterwiki or self._site != getSite()): + colon = "" if textlink: - left = "[[:" - else: - left = "[[" - if self.site().family != getSite().family \ - and self.site().family.name != self.site().lang: - return u'%s%s:%s:%s]]' % (left, self.site().family.name, - self.site().lang, + colon = ":" + if self._site.family != getSite().family \ + and self._site.family.name != self._site.lang: + return u'[[%s%s:%s:%s]]' % (colon, self._site.family.name, + self._site.lang, self.title(savetitle=True, decode=True)) else: - return u'%s%s:%s]]' % (left, self.site().lang, + return u'[[%s%s:%s]]' % (colon, self._site.lang, self.title(savetitle=True, decode=True)) elif textlink and (self.isImage() or self.isCategory()): return u'[[:%s]]' % self.title(savetitle=True, decode=True)
pywikipedia-svn@lists.wikimedia.org