Revision: 4372 Author: cosoleto Date: 2007-09-27 18:18:15 +0000 (Thu, 27 Sep 2007)
Log Message: ----------- fix for my previous commit about Swedish wikis
Modified Paths: -------------- trunk/pywikipedia/family.py trunk/pywikipedia/wikipedia.py
Modified: trunk/pywikipedia/family.py =================================================================== --- trunk/pywikipedia/family.py 2007-09-27 14:12:09 UTC (rev 4371) +++ trunk/pywikipedia/family.py 2007-09-27 18:18:15 UTC (rev 4372) @@ -2258,10 +2258,10 @@ for num, val in namespaces.items(): self.namespaces[num][code]=val
- def get_known_families(self, code): - if code == 'sv': - # In Swedish wiki projects 's:' is part of page title - # not a family prefix for 'wikisource'. + def get_known_families(self, site): + # In Swedish Wikipedia 's:' is part of page title not a family + # prefix for 'wikisource'. + if site.lang == 'sv' and site.family.name in ['wikipedia']: d = self.known_families.copy() d.pop('s') ; d['src'] = 'wikisource' return d
Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2007-09-27 14:12:09 UTC (rev 4371) +++ trunk/pywikipedia/wikipedia.py 2007-09-27 18:18:15 UTC (rev 4372) @@ -304,8 +304,8 @@ if t != '' and t[0] == ':': self._namespace = 0 t = t[1:] - elif lowerNs in self.site().family.get_known_families(code = self.site().lang): - if self.site().get_family.known_families(code = self.site().lang)[lowerNs] == self.site().family.name: + elif lowerNs in self.site().family.get_known_families(site = self.site()): + if self.site().family.get_known_families(site = self.site())[lowerNs] == self.site().family.name: t = m.group(2) else: # This page is from a different family @@ -313,7 +313,7 @@ otherlang = self.site().lang if lowerNs in ['commons']: otherlang = lowerNs - familyName = self.site().family.known_families[lowerNs] + familyName = self.site().family.get_known_families(site = self.site())[lowerNs] try: self._site = getSite(otherlang, familyName) except ValueError: @@ -4031,7 +4031,7 @@ return self.isInterwikiLink(rest) else: return True - if first in self.family.get_known_families(code = self.lang): + if first in self.family.get_known_families(site = self): if first == self.family.name: return self.isInterwikiLink(rest) else: