Revision: 7055 Author: russblau Date: 2009-07-13 13:47:49 +0000 (Mon, 13 Jul 2009)
Log Message: ----------- Port r7035 from trunk
Modified Paths: -------------- branches/rewrite/pywikibot/site.py
Modified: branches/rewrite/pywikibot/site.py =================================================================== --- branches/rewrite/pywikibot/site.py 2009-07-13 13:43:48 UTC (rev 7054) +++ branches/rewrite/pywikibot/site.py 2009-07-13 13:47:49 UTC (rev 7055) @@ -102,10 +102,14 @@ raise NoSuchSite("Language %s in family %s is obsolete" % (self.__code, self.__family.name)) if self.__code not in self.languages(): - if self.__code == 'zh-classic' and 'zh-classical' in self.languages(): + if self.__code == 'zh-classic' \ + and 'zh-classical' in self.languages(): self.__code = 'zh-classical' - # database hack (database is varchar[10] -> zh-classical - # is cut to zh-classic. + # database hack (database is varchar[10], so zh-classical + # is cut to zh-classic) + elif self.__family.name in self.__family.langs.keys() \ + or len(self.__family.langs) == 1: + self.__code = self.__family.name else: raise NoSuchSite("Language %s does not exist in family %s" % (self.__code, self.__family.name))