Xqt has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1328312?usp=email )
Change subject: wikibase: Reuse collection key views
......................................................................
wikibase: Reuse collection key views
Resolve the current and comparison key views once while serializing language
and alias differences. Reuse them across intersection and difference checks.
Change-Id: Ia4dbfb40141a433c0cc85d9c158b41cedfea15b0
---
M pywikibot/page/_collections.py
1 file changed, 10 insertions(+), 6 deletions(-)
Approvals:
Xqt: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/page/_collections.py b/pywikibot/page/_collections.py
index 263cf3a..6735e23 100644
--- a/pywikibot/page/_collections.py
+++ b/pywikibot/page/_collections.py
@@ -120,11 +120,13 @@
"""
data = {}
diffto = diffto or {}
- for key in diffto.keys() - self.keys():
+ current_keys = self.keys()
+ diffto_keys = diffto.keys()
+ for key in diffto_keys - current_keys:
data[key] = {'language': key, 'value': ''}
- for key in self.keys() - diffto.keys():
+ for key in current_keys - diffto_keys:
data[key] = {'language': key, 'value': self[key]}
- for key in self.keys() & diffto.keys():
+ for key in current_keys & diffto_keys:
if self[key] != diffto[key]['value']:
data[key] = {'language': key, 'value': self[key]}
return data
@@ -183,16 +185,18 @@
"""
data = {}
diffto = diffto or {}
- for lang in diffto.keys() & self.keys():
+ current_keys = self.keys()
+ diffto_keys = diffto.keys()
+ for lang in diffto_keys & current_keys:
if (sorted(val['value'] for val in diffto[lang])
!= sorted(self[lang])):
data[lang] = [{'language': lang, 'value': i}
for i in self[lang]]
- for lang in diffto.keys() - self.keys():
+ for lang in diffto_keys - current_keys:
data[lang] = [
{'language': lang, 'value': i['value'], 'remove': ''}
for i in diffto[lang]]
- for lang in self.keys() - diffto.keys():
+ for lang in current_keys - diffto_keys:
data[lang] = [{'language': lang, 'value': i} for i in self[lang]]
return data
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1328312?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: Ia4dbfb40141a433c0cc85d9c158b41cedfea15b0
Gerrit-Change-Number: 1328312
Gerrit-PatchSet: 2
Gerrit-Owner: Mahveotm <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
Pywikibot-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
