[Pywikibot-commits] [Gerrit] update mw release 1.24wmf7, sync with core - change (pywikibot/compat)

jenkins-bot has submitted this change and it was merged. Change subject: update mw release 1.24wmf7, sync with core ...................................................................... update mw release 1.24wmf7, sync with core - backport fyinterwiki sorting order function - synchronize crossnamespace sorting sample and some others Change-Id: I22b152c4cf986360d20fbe14c8e05952773f1e9e --- M family.py 1 file changed, 19 insertions(+), 17 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/family.py b/family.py index 5cbdee4..5ca855c 100644 --- a/family.py +++ b/family.py @@ -96,13 +96,10 @@ ] # Order for fy: alphabetical by code, but y counts as i - def fycomp(x, y): - x = x.replace("y", "i") + x.count("y") * "!" - y = y.replace("y", "i") + y.count("y") * "!" - return cmp(x, y) self.fyinterwiki = self.alphabetic[:] self.fyinterwiki.remove('nb') - self.fyinterwiki.sort(fycomp) + self.fyinterwiki.sort(key=lambda x: + x.replace("y", "i") + x.count("y") * "!") self.langs = {} @@ -4055,15 +4052,19 @@ # '_default'; values are a list of namespace numbers self.crossnamespace = collections.defaultdict(dict) ## - ## Examples : - ## Allowing linking to pt' 102 NS from any other lang' 0 NS is - # self.crossnamespace[0] = { - # '_default': { 'pt': [102]} - # } - ## While allowing linking from pt' 102 NS to any other lang' = NS is - # self.crossnamespace[102] = { - # 'pt': { '_default': [0]} - # } + # Examples : + # + # Allowing linking to pt' 102 NS from any other lang' 0 NS is + # + # self.crossnamespace[0] = { + # '_default': { 'pt': [102]} + # } + # + # While allowing linking from pt' 102 NS to any other lang' = NS is + # + # self.crossnamespace[102] = { + # 'pt': { '_default': [0]} + # } @property def iwkeys(self): @@ -4325,7 +4326,7 @@ # Don't use this, use versionnumber() instead. This only exists # to not break family files. # Here we return the latest mw release for downloading - return '1.20wmf2' + return '1.23.0' def versionnumber(self, code, version=None): """Return an int identifying MediaWiki version. @@ -4640,7 +4641,7 @@ return (None, None) def shared_data_repository(self, code, transcluded=False): - """Return the shared wikidata repository, if any.""" + """Return the shared Wikibase repository, if any.""" return (None, None) def server_time(self, code): @@ -4960,7 +4961,8 @@ """Return Wikimedia projects version number as a string.""" # Don't use this, use versionnumber() instead. This only exists # to not break family files. - return '1.24wmf5' + # Here we return the latest mw release of wikimedia projects + return '1.24wmf7' def shared_image_repository(self, code): return ('commons', 'commons') -- To view, visit https://gerrit.wikimedia.org/r/137687 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I22b152c4cf986360d20fbe14c8e05952773f1e9e Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt &lt;info(a)gno.de&gt; Gerrit-Reviewer: Ladsgroup &lt;ladsgroup(a)gmail.com&gt; Gerrit-Reviewer: Siebrand &lt;siebrand(a)kitano.nl&gt; Gerrit-Reviewer: jenkins-bot <>