jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1047202?usp=email )
Change subject: include image repository extensions in APISite.file_extensions
......................................................................
include image repository extensions in APISite.file_extensions
the site's image repository may have different file extensions
configured which should also be considered valid for the site
Change-Id: Ibf449cbf41f5e464ebef0bf4e6927e0dac14c49c
---
M pywikibot/site/_apisite.py
1 file changed, 7 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Xqt: Looks good to me, approved
diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py
index 9a2037c..e1af5e0 100644
--- a/pywikibot/site/_apisite.py
+++ b/pywikibot/site/_apisite.py
@@ -492,8 +492,13 @@
"""File extensions enabled on the wiki.
.. versionadded:: 8.4
+ .. versionchanged:: 9.2
+ also include extensions from the image repository
"""
- return sorted(e['ext'] for e in self.siteinfo.get('fileextensions'))
+ ext = self.siteinfo.get('fileextensions')
+ if self.has_image_repository:
+ ext.extend(self.image_repository().siteinfo.get('fileextensions'))
+ return sorted({e['ext'] for e in ext})
@property
def maxlimit(self) -> int:
@@ -1273,8 +1278,7 @@
@property
def has_image_repository(self) -> bool:
"""Return True if site has a shared image repository like Commons."""
- code, fam = self.shared_image_repository()
- return bool(code or fam)
+ return self.image_repository() is not None
@property
def has_data_repository(self) -> bool:
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1047202?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: Ibf449cbf41f5e464ebef0bf4e6927e0dac14c49c
Gerrit-Change-Number: 1047202
Gerrit-PatchSet: 2
Gerrit-Owner: JJMC89 <jjmc89.wikime...@gmail.com>
Gerrit-Reviewer: Xqt <i...@gno.de>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
Pywikibot-commits mailing list -- pywikibot-commits@lists.wikimedia.org
To unsubscribe send an email to pywikibot-commits-le...@lists.wikimedia.org
