Magul has uploaded a new change for review. https://gerrit.wikimedia.org/r/323098
Change subject: Fix for generating WMF Labs families. ...................................................................... Fix for generating WMF Labs families. Also creation of family with interwikis on Travis. Bug: T151372 Change-Id: Iefe1ccee01468586706780796c80e267c1a3b543 --- M .travis.yml M generate_family_file.py 2 files changed, 14 insertions(+), 15 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/98/323098/1 diff --git a/.travis.yml b/.travis.yml index 9d46272..ca5e14b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,10 +61,10 @@ - python pwb.py generate_family_file 'https://wiki.musicbrainz.org/' musicbrainz 'n' - if [[ $FAMILY == 'wpbeta' ]]; then - python -m generate_family_file 'http://'$LANGUAGE'.wikipedia.beta.wmflabs.org/' 'wpbeta' 'n' ; + python -m generate_family_file 'http://'$LANGUAGE'.wikipedia.beta.wmflabs.org/' 'wpbeta' 'y' ; fi - if [[ $FAMILY == 'wsbeta' ]]; then - python -m generate_family_file 'http://'$LANGUAGE'.wikisource.beta.wmflabs.org/' 'wsbeta' 'n' ; + python -m generate_family_file 'http://'$LANGUAGE'.wikisource.beta.wmflabs.org/' 'wsbeta' 'y' ; fi - python -W error::UserWarning -m generate_user_files -dir:~/.pywikibot/ -family:$FAMILY -lang:$LANGUAGE -v -user:"$PYWIKIBOT2_USERNAME" diff --git a/generate_family_file.py b/generate_family_file.py index 5505b69..cd1caa7 100755 --- a/generate_family_file.py +++ b/generate_family_file.py @@ -64,7 +64,7 @@ print("Generating family file from %s" % self.base_url) w = Wiki(self.base_url) - self.wikis[w.iwpath] = w + self.wikis[w.lang] = w print() print("==================================") print("api url: %s" % w.api) @@ -122,9 +122,9 @@ print("Loading wikis... ") for lang in self.langs: print(" * %s... " % (lang[u'prefix']), end="") - if lang[u'url'] not in self.wikis: + if lang['prefix'] not in self.wikis: try: - self.wikis[lang[u'url']] = Wiki(lang[u'url']) + self.wikis[lang['prefix']] = Wiki(lang['url']) print("downloaded") except Exception as e: print(e) @@ -167,38 +167,37 @@ self.langs = { """.lstrip() % {'url': self.base_url, 'name': self.name}) - for w in self.wikis.values(): + for k, w in self.wikis.items(): f.write(" '%(lang)s': '%(hostname)s',\n" - % {'lang': w.lang, 'hostname': urlparse(w.server).netloc}) + % {'lang': k, 'hostname': urlparse(w.server).netloc}) f.write(" }\n\n") - f.write(" def scriptpath(self, code):\n") f.write(" return {\n") - for w in self.wikis.values(): + for k, w in self.wikis.items(): f.write(" '%(lang)s': '%(path)s',\n" - % {'lang': w.lang, 'path': w.scriptpath}) + % {'lang': k, 'path': w.scriptpath}) f.write(" }[code]\n") f.write("\n") f.write(" @deprecated('APISite.version()')\n") f.write(" def version(self, code):\n") f.write(" return {\n") - for w in self.wikis.values(): + for k, w in self.wikis.items(): if w.version is None: - f.write(" '%(lang)s': None,\n" % {'lang': w.lang}) + f.write(" '%(lang)s': None,\n" % {'lang': k}) else: f.write(" '%(lang)s': u'%(ver)s',\n" - % {'lang': w.lang, 'ver': w.version}) + % {'lang': k, 'ver': w.version}) f.write(" }[code]\n") f.write("\n") f.write(" def protocol(self, code):\n") f.write(" return {\n") - for w in self.wikis.values(): + for k, w in self.wikis.items(): f.write(" '%(lang)s': u'%(protocol)s',\n" - % {'lang': w.lang, 'protocol': urlparse(w.server).scheme}) + % {'lang': k, 'protocol': urlparse(w.server).scheme}) f.write(" }[code]\n") -- To view, visit https://gerrit.wikimedia.org/r/323098 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iefe1ccee01468586706780796c80e267c1a3b543 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Magul <tomasz.magul...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
