Revision: 6516
Author: russblau
Date: 2009-03-20 12:13:42 +0000 (Fri, 20 Mar 2009)
Log Message:
-----------
Merge family files from trunk
Modified Paths:
--------------
branches/rewrite/pywikibot/families/wikipedia_family.py
branches/rewrite/pywikibot/family.py
Property Changed:
----------------
branches/rewrite/pywikibot/families/
branches/rewrite/pywikibot/family.py
Property changes on: branches/rewrite/pywikibot/families
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/pywikipedia/families:5896-6165,6168-6197,6212-6322,6325-6434
+ /trunk/pywikipedia/families:5896-6165,6168-6197,6212-6322,6325-6434,6436-6515
Modified: branches/rewrite/pywikibot/families/wikipedia_family.py
===================================================================
--- branches/rewrite/pywikibot/families/wikipedia_family.py 2009-03-19 11:02:28 UTC (rev 6515)
+++ branches/rewrite/pywikibot/families/wikipedia_family.py 2009-03-20 12:13:42 UTC (rev 6516)
@@ -33,7 +33,7 @@
'tet', 'sd', 'ce', 'pa', 'ba', 'rmy', 'na', 'iu', 'lo', 'bo',
'got', 'stq', 'chr', 'bcl', 'om', 'hak', 'ug', 'sm', 'ee', 'ti',
'as', 'cdo', 'av', 'bm', 'dsb', 'zu', 'nv', 'my', 'pih', 'pap',
- 'cr', 've', 'ss', 'rw', 'xh', 'kl', 'ik', 'bug', 'dz', 'ts',
+ 'cr', 've', 'ss', 'rw', 'xh', 'kl', 'ik', 'bug', 'dz', 'ts', 'pnt',
'kv', 'bi', 'xal', 'st', 'tn', 'ch', 'ak', 'bxr', 'ny', 'ab',
'fj', 'tw', 'lbe', 'za', 'ff', 'tum', 'ha', 'sn', 'sg', 'lg',
'ki', 'rn', 'chy', 'ng', 'ext', 'gan', 'hif', 'kaa', 'mdf',
@@ -164,7 +164,8 @@
u'Homonymie de comtés', u'Internationalisation',
u'Isomérie', u'Homonymie de nom romain',
u'Paronymie', u'Patronyme', u'Personnes homonymes',
- u'Unités homonymes', u'Villes homonymes', u'Homonymie bateau'],
+ u'Unités homonymes', u'Villes homonymes', u'Homonymie bateau',
+ u'Toponymie'],
'frp': [u'Homonimos'],
'fy': [u'Tfs', u'Neibetsjuttings'],
'ga': [u'Idirdhealú', u'Disambig'],
@@ -243,7 +244,8 @@
'tg': [u'Ибҳомзудоӣ', u'Disambig', u'Рафъи ибҳом', u'Disambiguation'],
'th': [u'แก้กำกวม', u'Disambig', u'คำกำกวม'],
'tl': [u'Paglilinaw', u'Disambig'],
- 'tr': [u'Anlam ayrım', u'Disambig', u'Anlam ayrımı'],
+ 'tr': [u'Anlam ayrım', u'Disambig', u'Anlam ayrımı',
+ u'Kişi adları (anlam ayrımı)', u'Yerleşim yerleri (anlam ayrımı)'],
'uk': [u'Неоднозначність',u'DisambigG', u'Disambig', u'DisambigN',
u'Багатозначність'],
'vec': [u'Disambigua'],
@@ -355,7 +357,7 @@
'li','ln','jbo','lg','lmo','hu','mk','mg','ml','mt','mi','mr','mzn','chm','cdo','mdf','mo',
'mn','mus','my','nah','fj','nl','nds-nl','cr','ne','new','ja','nap','ce',
'pih','no','nn','nrm','nov','oc','or','om','ng','hz','ug','uz','pa',
- 'pi','pag','pap','ps','km','pms','nds','pl','pt','kaa','kk-tr','ty','ksh','ro',
+ 'pi','pag','pap','ps','km','pms','nds','pl','pnt','pt','kaa','kk-tr','ty','ksh','ro',
'rmy','rm','qu','ru','se','sa','sg','sc','sah','sco','stq','st','tn','sq','scn',
'si','simple','sd','ss','sk','cu','sl','szl','so','sr','sh','fi','sv','tl',
'ta','kab','roa-tara','tt','te','tet','th','vi','ti','tg','tpi','chr','chy',
@@ -380,7 +382,7 @@
'cdo', 'mo', 'mn', 'mus', 'my', 'nah', 'fj', 'nap', 'nds-nl', 'nl', 'cr', 'ne', 'new', 'ce',
'pih', 'no', 'nn', 'nrm', 'nov', 'oc', 'or', 'om', 'ng', 'hz', 'ug', 'uz', 'pa', 'kk',
'kk-cn', 'kk-kz', 'kk-tr',
- 'pi', 'pam', 'pag', 'pap', 'ps', 'km', 'pms', 'nds', 'pl', 'pt', 'ty', 'ksh', 'ro', 'rmy', 'rm', 'qu',
+ 'pi', 'pam', 'pag', 'pap', 'ps', 'km', 'pms', 'nds', 'pl', 'pnt', 'pt', 'ty', 'ksh', 'ro', 'rmy', 'rm', 'qu',
'ru', 'se', 'sa', 'sg', 'sc', 'sco', 'st', 'tn', 'sq', 'scn', 'si',
'simple', 'sd', 'ss', 'sk', 'cu', 'sl', 'so', 'sr', 'sh', 'fi', 'sv', 'tl',
'ta', 'kab', 'roa-tara', 'tt', 'te', 'tet', 'th', 'vi', 'ti', 'tg', 'tpi', 'cv', 'tr',
Modified: branches/rewrite/pywikibot/family.py
===================================================================
--- branches/rewrite/pywikibot/family.py 2009-03-19 11:02:28 UTC (rev 6515)
+++ branches/rewrite/pywikibot/family.py 2009-03-20 12:13:42 UTC (rev 6516)
@@ -33,29 +33,26 @@
'kk', 'kw', 'rw', 'ky', 'rn', 'sw', 'kv', 'kg', 'ht', 'kj',
'ku', 'lad', 'lbe', 'lo', 'la', 'lv', 'lb', 'lt', 'lij', 'li',
'ln', 'jbo', 'lg', 'lmo', 'hu', 'mk', 'mg', 'ml', 'mt', 'mi',
- 'mr', 'mzn', 'ms', 'cdo', 'mdf', 'mo', 'mn', 'mus', 'my', 'nah',
- 'na', 'fj', 'nl', 'nds-nl', 'cr', 'ne', 'new', 'ja', 'nap',
- 'ce', 'pih', 'no', 'nn', 'nrm', 'nov', 'oc', 'or', 'om', 'ng',
- 'hz', 'ug', 'uz', 'pa', 'pi', 'pag', 'pap', 'ps', 'km', 'pms',
- 'nds', 'pl', 'pt', 'kaa', 'crh', 'ty', 'ksh', 'ro', 'rmy', 'rm',
- 'qu', 'ru', 'sah', 'se', 'sm', 'sa', 'sg', 'sc', 'sco', 'stq',
- 'st', 'tn', 'sq', 'scn', 'si', 'simple', 'sd', 'ss', 'sk', 'cu',
- 'sl', 'szl', 'so', 'sr', 'sh', 'srn', 'su', 'fi', 'sv', 'tl',
- 'ta', 'kab', 'roa-tara', 'tt', 'te', 'tet', 'th', 'vi', 'ti',
- 'tg', 'tpi', 'to', 'chr', 'chy', 've', 'tr', 'tk', 'tw', 'udm',
- 'bug', 'uk', 'ur', 'vec', 'vo', 'fiu-vro', 'wa', 'vls', 'war',
- 'wo', 'wuu', 'ts', 'ii', 'yi', 'yo', 'zh-yue', 'cbk-zam', 'diq',
- 'zea', 'bat-smg', 'zh',
+ 'mr', 'mzn', 'ms', 'cdo', 'mdf', 'mo', 'mn', 'mus', 'my', 'nah', 'na',
+ 'fj', 'nl', 'nds-nl', 'cr', 'ne', 'new', 'ja', 'nap', 'ce', 'pih',
+ 'no', 'nn', 'nrm', 'nov', 'oc', 'or', 'om', 'ng', 'hz', 'ug',
+ 'uz', 'pa', 'pi', 'pag', 'pap', 'ps', 'km', 'pms', 'nds', 'pl', 'pnt',
+ 'pt', 'kaa', 'crh', 'ty', 'ksh', 'ro', 'rmy', 'rm', 'qu', 'ru', 'sah', 'se',
+ 'sm', 'sa', 'sg', 'sc', 'sco', 'stq', 'st', 'tn', 'sq', 'scn', 'si',
+ 'simple', 'sd', 'ss', 'sk', 'cu', 'sl', 'szl', 'so', 'sr', 'sh',
+ 'srn', 'su', 'fi', 'sv', 'tl', 'ta', 'kab', 'roa-tara', 'tt', 'te', 'tet',
+ 'th', 'vi', 'ti', 'tg', 'tpi', 'to', 'chr', 'chy', 've', 'tr',
+ 'tk', 'tw', 'udm', 'bug', 'uk', 'ur', 'vec', 'vo', 'fiu-vro', 'wa',
+ 'vls', 'war', 'wo', 'wuu', 'ts', 'ii', 'yi', 'yo', 'zh-yue', 'cbk-zam',
+ 'diq', 'zea', 'bat-smg', 'zh',
]
self.langs = {}
-## # The timedelta to GMT of the server.
-## # Exemple for a server running CET :
-## # timedelta(hours=+1)
-## self.servergmtoffset = timedelta()
# letters that can follow a wikilink and are regarded as part of
- # this link # This depends on the linktrail setting in LanguageXx.php and on # [[MediaWiki:Linktrail]].
+ # this link
+ # This depends on the linktrail setting in LanguageXx.php and on
+ # [[MediaWiki:Linktrail]].
# Note: this is a regular expression.
self.linktrails = {
'_default': u'[a-z]*',
@@ -639,121 +636,6 @@
"ERROR: linktrail in language %(language_code)s unknown"
% {'language_code': code})
-## def namespace(self, code, ns_number, fallback='_default', all=False):
-## if not self.isDefinedNS(ns_number):
-## raise KeyError(
-##'ERROR: Unknown namespace %(ns_number)d for %(language_code)s:%(ns_name)s'
-## % {'ns_number': ns_number,
-## 'language_code': code,
-## 'ns_name': self.name})
-## elif self.isNsI18N(ns_number, code):
-## v = self.namespaces[ns_number][code]
-## if type(v) is not list:
-## v = [v,]
-## if all and self.isNsI18N(ns_number, fallback):
-## v2 = self.namespaces[ns_number][fallback]
-## if type(v2) is list:
-## v.extend(v2)
-## else:
-## v.append(v2)
-## elif fallback and self.isNsI18N(ns_number, fallback):
-## v = self.namespaces[ns_number][fallback]
-## if type(v) is not list:
-## v = [v,]
-## else:
-## raise KeyError(
-##'ERROR: title for namespace %(ns_number)d in language %(language_code)s unknown'
-## % {'ns_number': ns_number,
-## 'language_code': code})
-## if all:
-## namespaces = list(set(v))
-## # Lowercase versions of namespaces
-## if code not in self.nocapitalize:
-## namespaces.extend([ns[0].lower() + ns[1:]
-## for ns in namespaces
-## if ns and ns[0].lower() != ns[0].upper()])
-## # Underscore versions of namespaces
-## namespaces.extend([ns.replace(' ', '_')
-## for ns in namespaces if ns and ' ' in ns])
-## return tuple(namespaces)
-## else:
-## return v[0]
-##
-## def isDefinedNS(self, ns_number):
-## """Return True if the namespace has been defined in this family."""
-##
-## return self.namespaces.has_key(ns_number)
-##
-## def isNsI18N(self, ns_number, code):
-## """Return True if the namespace has been internationalized.
-##
-## (it has a custom entry for a given language)
-##
-## """
-## return self.namespaces[ns_number].has_key(code)
-##
-## def isDefinedNSLanguage(self, ns_number, code, fallback='_default'):
-## """Return True if the namespace has been defined in this family
-## for this language or its fallback.
-## """
-## if not self.isDefinedNS(ns_number):
-## return False
-## elif self.isNsI18N(ns_number, code):
-## return True
-## elif fallback and self.isNsI18N(ns_number, fallback):
-## return True
-## else:
-## return False
-##
-## def normalizeNamespace(self, code, value):
-## """Given a value, attempt to match it with all available namespaces,
-## with default and localized versions. Sites may have more than one
-## way to write the same namespace - choose the first one in the list.
-## If nothing can be normalized, return the original value.
-## """
-## for ns, items in self.namespaces.iteritems():
-## if items.has_key(code):
-## v = items[code]
-## elif items.has_key('_default'):
-## v = items['_default']
-## else:
-## continue
-## if type(v) is list:
-## if value in v: return v[0]
-## else:
-## if value == v: return v
-## try:
-## if value == self.namespace('_default', ns):
-## return self.namespace(code, ns)
-## except KeyError:
-## pass
-## return value
-##
-## def getNamespaceIndex(self, lang, namespace):
-## """Given a namespace, attempt to match it with all available
-## namespaces. Sites may have more than one way to write the same
-## namespace - choose the first one in the list. Returns namespace
-## index or None.## """
-## namespace = namespace.lower()
-## for n in self.namespaces.keys():
-## try:
-## nslist = self.namespaces[n][lang]
-## if type(nslist) != type([]):
-## nslist = [nslist]
-## for ns in nslist:
-## if ns.lower() == namespace:
-## return n
-## except (KeyError,AttributeError):
-## # The namespace has no localized name defined
-## pass
-## if lang != '_default':
-## # This is not a localized namespace. Try if it
-## # is a default (English) namespace.
-## return self.getNamespaceIndex('_default', namespace)
-## else:
-## # give up
-## return None
-
def category_redirects(self, code, fallback="_default"):
if code in self.category_redirect_templates:
return self.category_redirect_templates[code]
Property changes on: branches/rewrite/pywikibot/family.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/pywikipedia/family.py:6057-6165,6168-6209,6212-6322,6325-6434
+ /trunk/pywikipedia/family.py:6057-6165,6168-6209,6212-6322,6325-6434,6436-6515