jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/996127?usp=email )
Change subject: [IMPR] simplify Siteinfo._get_siteinfo
......................................................................
[IMPR] simplify Siteinfo._get_siteinfo
Decrease nested flow statements after exception cause is either
raised or a return statement leaves it.
Change-Id: I3395dc9b9aa11e26683f98e0ee0aa1fe4bcda158
---
M pywikibot/site/_siteinfo.py
1 file changed, 33 insertions(+), 20 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/site/_siteinfo.py b/pywikibot/site/_siteinfo.py
index cf7251a..3283d54 100644
--- a/pywikibot/site/_siteinfo.py
+++ b/pywikibot/site/_siteinfo.py
@@ -137,33 +137,34 @@
except APIError as e:
if e.code == 'siunknown_siprop':
if len(props) == 1:
- pywikibot.log(
- f"Unable to get siprop '{props[0]}'")
+ pywikibot.log(f"Unable to get siprop '{props[0]}'")
return {props[0]: (EMPTY_DEFAULT, False)}
+
pywikibot.log('Unable to get siteinfo, because at least '
- "one property is unknown: '{}'".format(
- "', '".join(props)))
+ "one property is unknown: '{}'"
+ .format("', '".join(props)))
results = {}
for prop in props:
results.update(self._get_siteinfo(prop, expiry))
return results
raise
- else:
- result = {}
- if invalid_properties:
- for prop in invalid_properties:
- result[prop] = (EMPTY_DEFAULT, False)
- pywikibot.log("Unable to get siprop(s) '{}'".format(
- "', '".join(invalid_properties)))
- if 'query' in data:
- # If the request is a CachedRequest, use the _cachetime attr.
- cache_time = getattr(
- request, '_cachetime', None) or datetime.datetime.utcnow()
- for prop in props:
- if prop in data['query']:
- self._post_process(prop, data['query'][prop])
- result[prop] = (data['query'][prop], cache_time)
- return result
+
+ result = {}
+ if invalid_properties:
+ for prop in invalid_properties:
+ result[prop] = (EMPTY_DEFAULT, False)
+ pywikibot.log("Unable to get siprop(s) '{}'"
+ .format("', '".join(invalid_properties)))
+
+ if 'query' in data:
+ # If the request is a CachedRequest, use the _cachetime attr.
+ cache_time = getattr(
+ request, '_cachetime', None) or datetime.datetime.utcnow()
+ for prop in props:
+ if prop in data['query']:
+ self._post_process(prop, data['query'][prop])
+ result[prop] = (data['query'][prop], cache_time)
+ return result
@staticmethod
def _is_expired(cache_date, expire):
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/996127?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: I3395dc9b9aa11e26683f98e0ee0aa1fe4bcda158
Gerrit-Change-Number: 996127
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
_______________________________________________
Pywikibot-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
