jenkins-bot has submitted this change and it was merged.
Change subject: Rename family module name to its Family name "wikimediachapter"
......................................................................
Rename family module name to its Family name "wikimediachapter"
This prevents warning if Family.name doesn't match module file name
Change-Id: I9ea8a50e6b20a40c6a2219782c470efc3afe3b0d
---
R pywikibot/families/wikimediachapter_family.py
1 file changed, 0 insertions(+), 0 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
XZise: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/pywikibot/families/wikimedia_family.py b/pywikibot/families/wikimediachapter_family.py
similarity index 100%
rename from pywikibot/families/wikimedia_family.py
rename to pywikibot/families/wikimediachapter_family.py
--
To view, visit https://gerrit.wikimedia.org/r/215655
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9ea8a50e6b20a40c6a2219782c470efc3afe3b0d
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org>
Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot <>
jenkins-bot has submitted this change and it was merged.
Change subject: wdq: Improve errors in getDataFromHost
......................................................................
wdq: Improve errors in getDataFromHost
Bug: T93305
Change-Id: If11b5e5c4dffa4fbe78ff8e0066f7ec7fe6e99d0
---
M pywikibot/data/wikidataquery.py
1 file changed, 12 insertions(+), 3 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
XZise: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/pywikibot/data/wikidataquery.py b/pywikibot/data/wikidataquery.py
index 80d2616..2d7ee3a 100644
--- a/pywikibot/data/wikidataquery.py
+++ b/pywikibot/data/wikidataquery.py
@@ -565,11 +565,20 @@
pywikibot.warning(u"Failed to retrieve %s" % url)
raise
+ data = resp.content
+ if not data:
+ pywikibot.warning('No data received for %s' % url)
+ raise pywikibot.ServerError('No data received for %s' % url)
+
try:
- data = json.loads(resp.content)
+ data = json.loads(data)
except ValueError:
- pywikibot.warning(u"Data received from host but no JSON could be decoded")
- raise pywikibot.ServerError("Data received from host but no JSON could be decoded")
+ pywikibot.warning(
+ 'Data received for %s but no JSON could be decoded: %r'
+ % (url, data))
+ raise pywikibot.ServerError(
+ 'Data received for %s but no JSON could be decoded: %r'
+ % (url, data))
return data
--
To view, visit https://gerrit.wikimedia.org/r/214051
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If11b5e5c4dffa4fbe78ff8e0066f7ec7fe6e99d0
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de>
Gerrit-Reviewer: jenkins-bot <>
jenkins-bot has submitted this change and it was merged.
Change subject: [IMPROV] redirect: Have a more specific doc
......................................................................
[IMPROV] redirect: Have a more specific doc
Bug: T101255
Change-Id: I1b80a0383d028ef3f4e88f3cbdf5956cb6529352
---
M scripts/redirect.py
1 file changed, 9 insertions(+), 6 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/redirect.py b/scripts/redirect.py
index e007146..c8ba68b 100755
--- a/scripts/redirect.py
+++ b/scripts/redirect.py
@@ -15,11 +15,12 @@
double Fix redirects which point to other redirects.
do Shortcut action command is "do".
-broken Tries to fix broken redirect to the last moved target of the
-br destination page. If this fails and -delete option is given
- it deletes redirects where targets don't exist if bot has
- admin rights otherwise it marks the page with a speedy deletion
- template if available. Shortcut action command is "br".
+broken Tries to fix redirect which point to nowhere by using the last
+br moved target of the destination page. If this fails and the
+ -delete option is set, it either deletes the page or marks it for
+ deletion depending on whether the account has admin rights. It
+ will mark the redirect not for deletion if there is no speedy
+ deletion template available. Shortcut action command is "br".
both Both of the above. Retrieves redirect pages from live wiki,
not from a special page.
@@ -60,7 +61,9 @@
-total:n The maximum count of redirects to work upon. If omitted, there
is no limit.
--delete Enables deletion of broken redirects.
+-delete Prompt the user whether broken redirects should be deleted (or
+ marked for deletion if the account has no admin rights) instead
+ of just skipping them.
-always Don't prompt you for each replacement.
--
To view, visit https://gerrit.wikimedia.org/r/215675
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1b80a0383d028ef3f4e88f3cbdf5956cb6529352
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.de>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot <>