jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/791750 )
Change subject: [bugfix] replace.py: set preload as default
......................................................................
[bugfix] replace.py: set preload as default
Fix regression introduced with:
- Icfd0442bebb1b39ff8b72533deadbc85e172fa76
Change-Id: I76b51358d7a717f3151d3c407e163bef8453c220
---
M scripts/replace.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/replace.py b/scripts/replace.py
index 7b1ab56..d421283 100755
--- a/scripts/replace.py
+++ b/scripts/replace.py
@@ -897,7 +897,7 @@
edit_summary = ''
# Array which will collect commandline parameters.
# First element is original text, second element is replacement text.
- preload = False # preload pages
+ preload = True # preload pages
commandline_replacements = []
file_replacements = []
# A list of 2-tuples of original text and replacement text.
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/791750
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: I76b51358d7a717f3151d3c407e163bef8453c220
Gerrit-Change-Number: 791750
Gerrit-PatchSet: 1
Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/791715 )
Change subject: [doc] Update licenses.rst
......................................................................
[doc] Update licenses.rst
Change-Id: I7e8fa809bba456596f40ad5cf0e2e377cc39a8db
---
M docs/licenses.rst
1 file changed, 5 insertions(+), 4 deletions(-)
Approvals:
Xqt: Verified; Looks good to me, approved
diff --git a/docs/licenses.rst b/docs/licenses.rst
index 1c56566..965e28e 100644
--- a/docs/licenses.rst
+++ b/docs/licenses.rst
@@ -4,9 +4,10 @@
========
**The framework itself and this documentation** are available under the
-:ref:`MIT license`; manual pages on mediawiki.org are
-available under the `CC-BY-SA 3.0`_ license. The Pywikibot logo is
-available under the `CC-BY-SA 4.0`_ license.
+:ref:`MIT license`; translations by translators and manual pages on
+mediawiki.org are available under the `CC-BY-SA 3.0`_ license. The
+Pywikibot logo is Public domain but it includes material that may be
+protected as a trademark.
MIT License
@@ -17,4 +18,4 @@
.. _CC-BY-SA 3.0: https://creativecommons.org/licenses/by-sa/3.0/
-.. _CC-BY-SA 4.0: https://creativecommons.org/licenses/by-sa/4.0/
+
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/791715
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: I7e8fa809bba456596f40ad5cf0e2e377cc39a8db
Gerrit-Change-Number: 791715
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-MessageType: merged
jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/791714 )
Change subject: [i18n] Remove coding info
......................................................................
[i18n] Remove coding info
- remove coding info from __init__.py because utf-8 is default
in python 3
- also add licence notes
Change-Id: Id5ef020899ab90a2330a0dee8313568eb9d7b3f5
---
M __init__.py
1 file changed, 7 insertions(+), 1 deletion(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/__init__.py b/__init__.py
index a63c9ce..17fce48 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,11 @@
-# -*- coding: utf-8 -*-
"""
This is a fake __init__.py to help pkgutil find the i18n data. There
is no actual python code in this package.
"""
+#
+# (C) Pywikibot team, 2011-2022
+#
+# Distributed under the terms of the MIT license.
+#
+# Translations by translators are licensed CC BY 3.0
+#
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/791714
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/i18n
Gerrit-Branch: master
Gerrit-Change-Id: Id5ef020899ab90a2330a0dee8313568eb9d7b3f5
Gerrit-Change-Number: 791714
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/791679 )
Change subject: [IMPR]: delete.py: count deleted pages and other actions
......................................................................
[IMPR]: delete.py: count deleted pages and other actions
Show how many pages are:
- deleted
- marked for deletion
- no actions taken
Bug: T212040
Change-Id: Icf2a05b0b4d743273e3e768eee0e1b714759ea45
---
M pywikibot/page/_pages.py
M scripts/delete.py
M tests/page_tests.py
3 files changed, 27 insertions(+), 8 deletions(-)
Approvals:
Xqt: Looks good to me, approved
Mpaa: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/page/_pages.py b/pywikibot/page/_pages.py
index 6d2f056..dca6379 100644
--- a/pywikibot/page/_pages.py
+++ b/pywikibot/page/_pages.py
@@ -51,8 +51,8 @@
from pywikibot.page._links import BaseLink, Link
from pywikibot.site import Namespace, NamespaceArgType
from pywikibot.tools import (
- cached,
ComparableMixin,
+ cached,
first_upper,
issue_deprecation_warning,
remove_last_args,
@@ -1795,7 +1795,7 @@
automatic_quit: bool = False,
*,
deletetalk: bool = False
- ) -> None:
+ ) -> int:
"""
Delete the page from the wiki. Requires administrator status.
@@ -1811,6 +1811,12 @@
will be asked before marking pages for deletion.
:param automatic_quit: show also the quit option, when asking
for confirmation.
+
+ :return: the function returns an integer, with values as follows:
+ value meaning
+ 0 no action was done
+ 1 page was deleted
+ -1 page was marked for deletion
"""
if reason is None:
pywikibot.output('Deleting {}.'.format(self.title(as_link=True)))
@@ -1830,7 +1836,9 @@
self.site._noDeletePrompt = True
if answer == 'y':
self.site.delete(self, reason, deletetalk=deletetalk)
- return
+ return 1
+ else:
+ return 0
# Otherwise mark it for deletion
if mark or hasattr(self.site, '_noMarkDeletePrompt'):
@@ -1854,6 +1862,9 @@
target = self
target.text = template + target.text
target.save(summary=reason)
+ return -1
+ else:
+ return 0
def has_deleted_revisions(self) -> bool:
"""Return True if the page has deleted revisions.
diff --git a/scripts/delete.py b/scripts/delete.py
index 99f4cd0..b9876e2 100755
--- a/scripts/delete.py
+++ b/scripts/delete.py
@@ -191,6 +191,7 @@
"""Process one page from the generator."""
if self.opt.undelete:
self.current_page.undelete(self.summary)
+ self.counter['undelete'] += 1
else:
if (self.opt.isorphan is not False
and not self.opt.always):
@@ -210,10 +211,16 @@
if self.current_page.site.user() is None:
self.current_page.site.login()
- self.current_page.delete(self.summary,
- not self.opt.always,
- self.opt.always,
- automatic_quit=True)
+ res = self.current_page.delete(self.summary,
+ not self.opt.always,
+ self.opt.always,
+ automatic_quit=True)
+ if res > 0:
+ self.counter['delete'] += 1
+ elif res < 0:
+ self.counter['marked-for-deletion'] += 1
+ else:
+ self.counter['no-action'] += 1
def main(*args: str) -> None:
diff --git a/tests/page_tests.py b/tests/page_tests.py
index c58d6b8..c9ace28 100755
--- a/tests/page_tests.py
+++ b/tests/page_tests.py
@@ -1047,8 +1047,9 @@
p.save('Pywikibot unit test', botflag=True)
# Test deletion
- p.delete(reason='Pywikibot unit test', prompt=False, mark=False)
+ res = p.delete(reason='Pywikibot unit test', prompt=False, mark=False)
self.assertEqual(p._pageid, 0)
+ self.assertEqual(res, 1)
with self.assertRaisesRegex(NoPageError, NO_PAGE_RE):
p.get(force=True)
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/791679
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: Icf2a05b0b4d743273e3e768eee0e1b714759ea45
Gerrit-Change-Number: 791679
Gerrit-PatchSet: 5
Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com>
Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/791726 )
Change subject: [fix] fix documentation
......................................................................
[fix] fix documentation
Change-Id: Id6152f039a943a8764aa05fc6b191e4f83cb51e8
Signed-off-by: Xqt <info(a)gno.de>
---
M docs/index.rst
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Xqt: Verified; Looks good to me, approved
diff --git a/docs/index.rst b/docs/index.rst
index 3dbd2e9..5ebf2f9 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -20,7 +20,7 @@
``python`` at the CMD or shell prompt.
Python 3.5.3 or higher is currently required to run the bot, but Python 3.6
-or higher is recommended. Python 3.5 support will be dropped with Python 8.
+or higher is recommended. Python 3.5 support will be dropped with Pywikibot 8.
Pywikibot and this documentation are licensed under the
:ref:`MIT license`;
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/791726
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: Id6152f039a943a8764aa05fc6b191e4f83cb51e8
Gerrit-Change-Number: 791726
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged