jenkins-bot has submitted this change and it was merged.
Change subject: Simpler sitematrix access in APISite.fromDBName()
......................................................................
Simpler sitematrix access in APISite.fromDBName()
by using .items()
Change-Id: Ifea48f7b969ec88764f546f36edb6d085d38b282
---
M pywikibot/site.py
1 file changed, 6 insertions(+), 6 deletions(-)
Approvals:
XZise: Looks good to me, approved
Mpaa: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/pywikibot/site.py b/pywikibot/site.py
index e0f4b49..b1d33e0 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -1460,18 +1460,18 @@
site=pywikibot.Site('meta', 'meta'),
action='sitematrix')
data = req.submit()
- for num in data['sitematrix']:
- if num == 'count':
+ for key, val in data['sitematrix'].items():
+ if key == 'count':
continue
- if 'code' in data['sitematrix'][num]:
- lang = data['sitematrix'][num]['code']
- for site in data['sitematrix'][num]['site']:
+ if 'code' in val:
+ lang = val['code']
+ for site in val['site']:
if site['dbname'] == dbname:
if site['code'] == 'wiki':
site['code'] = 'wikipedia'
return APISite(lang, site['code'])
else:
- for site in data['sitematrix'][num]:
+ for site in val:
if site['dbname'] == dbname:
return APISite(site['code'], site['code'])
raise ValueError("Cannot parse a site out of %s." % dbname)
--
To view, visit https://gerrit.wikimedia.org/r/178654
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifea48f7b969ec88764f546f36edb6d085d38b282
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa <ricordisa...@openmailbox.org>
Gerrit-Reviewer: John Vandenberg <jay...@gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgr...@gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhall...@arctus.nl>
Gerrit-Reviewer: Mpaa <mpaa.w...@gmail.com>
Gerrit-Reviewer: XZise <commodorefabia...@gmx.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
Pywikibot-commits mailing list
Pywikibot-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits
