Xqt has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1326326?usp=email )
Change subject: datasite: Reuse entity identifiers
......................................................................
datasite: Reuse entity identifiers
Retrieve property and claim identifiers once in repeated request paths.
Reuse each snapshot for response lookup, local updates, and source
serialization.
Change-Id: Ia44bb995aafc2f3b4badc460bfb4c90c5a3c9829
---
M pywikibot/site/_datasite.py
1 file changed, 13 insertions(+), 10 deletions(-)
Approvals:
Xqt: Verified; Looks good to me, approved
diff --git a/pywikibot/site/_datasite.py b/pywikibot/site/_datasite.py
index aa2545d..d089e07 100644
--- a/pywikibot/site/_datasite.py
+++ b/pywikibot/site/_datasite.py
@@ -247,7 +247,8 @@
:raises NoWikibaseEntityError: *prop* does not exist
"""
- params = {'action': 'wbgetentities', 'ids': prop.getID(),
+ prop_id = prop.getID()
+ params = {'action': 'wbgetentities', 'ids': prop_id,
'props': 'datatype'}
expiry = datetime.timedelta(days=365 * 100)
# Store it for 100 years
@@ -257,14 +258,14 @@
# the IDs returned from the API can be upper or lowercase, depending
# on the version. See bug T55894 for more information.
try:
- entity = data['entities'][prop.getID()]
+ entity = data['entities'][prop_id]
except KeyError:
- entity = data['entities'][prop.getID().lower()]
+ entity = data['entities'][prop_id.lower()]
if 'missing' in entity:
raise NoWikibaseEntityError(
prop if isinstance(prop, pywikibot.page.WikibaseEntity)
- else pywikibot.page.WikibaseEntity(self, prop.getID())
+ else pywikibot.page.WikibaseEntity(self, prop_id)
)
return entity['datatype']
@@ -381,10 +382,11 @@
req = self.simple_request(**params)
data = req.submit()
# Update the item
- if claim.getID() in entity.claims:
- entity.claims[claim.getID()].append(claim)
+ claim_id = claim.getID()
+ if claim_id in entity.claims:
+ entity.claims[claim_id].append(claim)
else:
- entity.claims[claim.getID()] = [claim]
+ entity.claims[claim_id] = [claim]
entity.latest_revision_id = data['pageinfo']['lastrevid']
@need_right('edit')
@@ -514,14 +516,15 @@
snak = {}
for sourceclaim in sources:
datavalue = sourceclaim._formatDataValue()
- valuesnaks = snak.get(sourceclaim.getID(), [])
+ sourceclaim_id = sourceclaim.getID()
+ valuesnaks = snak.get(sourceclaim_id, [])
valuesnaks.append({
'snaktype': 'value',
- 'property': sourceclaim.getID(),
+ 'property': sourceclaim_id,
'datavalue': datavalue,
})
- snak[sourceclaim.getID()] = valuesnaks
+ snak[sourceclaim_id] = valuesnaks
# set the hash if the source should be changed.
# if present, all claims of one source have the same hash
if not new and hasattr(sourceclaim, 'hash'):
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1326326?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: Ia44bb995aafc2f3b4badc460bfb4c90c5a3c9829
Gerrit-Change-Number: 1326326
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]
