Pywikibot-commits April 2020

pywikibot-commits@lists.wikimedia.org

1 participants
98 discussions

[Gerrit] pywikibot/core[master]: [IMPR] move specialbots.py to its own folder
by jenkins-bot (Code Review) 20 Apr '20

20 Apr '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/591032 ) Change subject: [IMPR] move specialbots.py to its own folder ...................................................................... [IMPR] move specialbots.py to its own folder Currently specialbots holds BaseBot templates for UploadRobot used by several scripts and BaseUnlinkBotused by selflink.py and unlink.py scripts. But there are other scripts like add_txt, cache, category, image, imagerecat, noreferences, replace which are reused several by other scripts and should be places here. Change-Id: I1379ced2f0e04ae484101edfef13da08111c2eff --- M docs/api_ref/pywikibot.rst A docs/api_ref/pywikibot.specialbots.rst M pywikibot/CONTENT.rst M pywikibot/DIRECTORIES.rst R pywikibot/specialbots/__init__.py M tox.ini 6 files changed, 15 insertions(+), 8 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/api_ref/pywikibot.rst b/docs/api_ref/pywikibot.rst index 5c05135..aaaf2f3 100644 --- a/docs/api_ref/pywikibot.rst +++ b/docs/api_ref/pywikibot.rst @@ -13,6 +13,7 @@ pywikibot.families pywikibot.page pywikibot.site + pywikibot.specialbots pywikibot.tools pywikibot.userinterfaces @@ -129,11 +130,6 @@ .. automodule:: pywikibot.site_detect -pywikibot.specialbots module ----------------------------- - -.. automodule:: pywikibot.specialbots - pywikibot.textlib module ------------------------ diff --git a/docs/api_ref/pywikibot.specialbots.rst b/docs/api_ref/pywikibot.specialbots.rst new file mode 100644 index 0000000..901605d --- /dev/null +++ b/docs/api_ref/pywikibot.specialbots.rst @@ -0,0 +1,4 @@ +pywikibot.specialbots package +============================= + +.. automodule:: pywikibot.specialbots diff --git a/pywikibot/CONTENT.rst b/pywikibot/CONTENT.rst index d0ae901..5c8669f 100644 --- a/pywikibot/CONTENT.rst +++ b/pywikibot/CONTENT.rst @@ -59,8 +59,6 @@ +----------------------------+------------------------------------------------------+ | site_detect.py | Classes for detecting a MediaWiki site | +----------------------------+------------------------------------------------------+ - | specialbots.py | Predefined special bot classes | - +----------------------------+------------------------------------------------------+ | textlib.py | Functions for manipulating wiki-text | +----------------------------+------------------------------------------------------+ | throttle.py | Mechanics to slow down wiki read and/or write rate | @@ -114,6 +112,13 @@ +----------------------------+------------------------------------------------------+ + | specialbots | Module containing special bots reusable by scripts | + +============================+======================================================+ + | __init__.py | Predefined special bot classes | + +----------------------------+------------------------------------------------------+ + + + +----------------------------+------------------------------------------------------+ | tools | Miscellaneous helper functions (not wiki-dependent). | +============================+======================================================+ | __init__.py | several classes and methods | diff --git a/pywikibot/DIRECTORIES.rst b/pywikibot/DIRECTORIES.rst index 3e1fe86..d2b3c1b 100644 --- a/pywikibot/DIRECTORIES.rst +++ b/pywikibot/DIRECTORIES.rst @@ -16,6 +16,8 @@ +---------------------------+------------------------------------------------------+ | pywikibot/site | Module with classes for MediaWiki sites | +---------------------------+------------------------------------------------------+ + | pywikibot/specialbots | Module containing special bots reusable by scripts | + +---------------------------+------------------------------------------------------+ | pywikibot/tools | Miscellaneous helper functions (not wiki-dependent) | +---------------------------+------------------------------------------------------+ | pywikibot/userinterfaces | GUI and terminal interface | diff --git a/pywikibot/specialbots.py b/pywikibot/specialbots/__init__.py similarity index 100% rename from pywikibot/specialbots.py rename to pywikibot/specialbots/__init__.py diff --git a/tox.ini b/tox.ini index b0c26f8..7eb1bd2 100644 --- a/tox.ini +++ b/tox.ini @@ -144,7 +144,7 @@ pywikibot/page/__init__.py: N802 pywikibot/pagegenerators.py : N802, N803, N806, N816 pywikibot/site/__init__.py: N802, N815 - pywikibot/specialbots.py : N803, N806, N802 + pywikibot/specialbots/__init__.py : N803, N806, N802 pywikibot/textlib.py : N801, N802, N803, N806, N816 pywikibot/throttle.py: N802 pywikibot/tools/_logging.py: N802 -- To view, visit https://gerrit.wikimedia.org/r/591032 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1379ced2f0e04ae484101edfef13da08111c2eff Gerrit-Change-Number: 591032 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [IMPR] Simplify generators
by jenkins-bot (Code Review) 20 Apr '20

20 Apr '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/590325 ) Change subject: [IMPR] Simplify generators ...................................................................... [IMPR] Simplify generators Change-Id: I08e773599990174bd302819bed4ef971b1d9dde5 --- M pywikibot/page/__init__.py M pywikibot/pagegenerators.py M pywikibot/site/__init__.py 3 files changed, 27 insertions(+), 51 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index f90adf4..5cdb83c 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -3548,8 +3548,7 @@ @param total: limit result to this number of pages. @type total: int. """ - for item in self.contributions(total=total): - yield item[0] + return (item[0] for item in self.contributions(total=total)) @deprecated_args(limit='total', namespace='namespaces') def contributions(self, total=500, **kwargs): diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 60faedb..d45c181 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -1384,9 +1384,8 @@ # defaults to namespace 0 because that's how Special:Newpages defaults if site is None: site = pywikibot.Site() - for page, item in site.newpages(namespaces=namespaces, total=total, - returndict=True): - yield page + return (page for page, _ in site.newpages(namespaces=namespaces, + total=total, returndict=True)) @deprecated_args(nobots=None, step=None) @@ -1493,15 +1492,13 @@ def InterwikiPageGenerator(page): """Iterate over all interwiki (non-language) links on a page.""" - for link in page.interwiki(): - yield pywikibot.Page(link) + return (pywikibot.Page(link) for link in page.interwiki()) @deprecated_args(step=None) def LanguageLinksPageGenerator(page, total=None): """Iterate over all interwiki language links on a page.""" - for link in page.iterlanglinks(total=total): - yield pywikibot.Page(link) + return (pywikibot.Page(link) for link in page.iterlanglinks(total=total)) @deprecated_args(step=None) @@ -1732,9 +1729,7 @@ pywikibot.exception(e) raise - for page in generator: - if page.namespace() in namespaces: - yield page + return (page for page in generator if page.namespace() in namespaces) @deprecated_args(ignoreList='ignore_list') @@ -2283,10 +2278,8 @@ """ if site is None: site = pywikibot.Site() - for entry in site.logevents(logtype='upload', total=total): - # entry is an UploadEntry object - # entry.page() returns a Page object - yield entry.page() + return (entry.page() + for entry in site.logevents(logtype='upload', total=total)) def WikibaseItemGenerator(gen): @@ -2359,8 +2352,7 @@ """ if site is None: site = pywikibot.Site() - for page in site.unusedfiles(total=total): - yield page + return site.unusedfiles(total=total) @deprecated_args(number='total', repeat=None) @@ -2374,8 +2366,7 @@ """ if site is None: site = pywikibot.Site() - for page in site.withoutinterwiki(total=total): - yield page + return site.withoutinterwiki(total=total) @deprecated_args(number='total', repeat=None) @@ -2390,8 +2381,7 @@ """ if site is None: site = pywikibot.Site() - for page in site.uncategorizedcategories(total=total): - yield page + return site.uncategorizedcategories(total=total) @deprecated_args(number='total', repeat=None) @@ -2406,8 +2396,7 @@ """ if site is None: site = pywikibot.Site() - for page in site.uncategorizedimages(total=total): - yield page + return site.uncategorizedimages(total=total) @deprecated_args(number='total', repeat=None) @@ -2422,8 +2411,7 @@ """ if site is None: site = pywikibot.Site() - for page in site.uncategorizedpages(total=total): - yield page + return site.uncategorizedpages(total=total) @deprecated_args(number='total', repeat=None) @@ -2438,8 +2426,7 @@ """ if site is None: site = pywikibot.Site() - for page in site.uncategorizedtemplates(total=total): - yield page + return site.uncategorizedtemplates(total=total) @deprecated_args(number='total', repeat=None) @@ -2454,8 +2441,7 @@ """ if site is None: site = pywikibot.Site() - for page in site.lonelypages(total=total): - yield page + return site.lonelypages(total=total) @deprecated_args(number='total', repeat=None) @@ -2470,8 +2456,7 @@ """ if site is None: site = pywikibot.Site() - for page in site.unwatchedpages(total=total): - yield page + return site.unwatchedpages(total=total) def page_with_property_generator(name, total=None, site=None): @@ -2517,8 +2502,7 @@ """ if site is None: site = pywikibot.Site() - for page, timestamp in site.ancientpages(total=total): - yield page + return (page for page, _ in site.ancientpages(total=total)) @deprecated_args(number='total', repeat=None) @@ -2533,8 +2517,7 @@ """ if site is None: site = pywikibot.Site() - for page in site.deadendpages(total=total): - yield page + return site.deadendpages(total=total) @deprecated_args(number='total', repeat=None) @@ -2549,8 +2532,7 @@ """ if site is None: site = pywikibot.Site() - for page, length in site.longpages(total=total): - yield page + return (page for page, _ in site.longpages(total=total)) @deprecated_args(number='total', repeat=None) @@ -2565,8 +2547,7 @@ """ if site is None: site = pywikibot.Site() - for page, length in site.shortpages(total=total): - yield page + return (page for page, _ in site.shortpages(total=total)) @deprecated_args(number='total') @@ -2581,8 +2562,7 @@ """ if site is None: site = pywikibot.Site() - for page in site.randompages(total=total, namespaces=namespaces): - yield page + return site.randompages(total=total, namespaces=namespaces) @deprecated_args(number='total') @@ -2597,9 +2577,8 @@ """ if site is None: site = pywikibot.Site() - for page in site.randompages(total=total, namespaces=namespaces, - redirects=True): - yield page + return site.randompages(total=total, namespaces=namespaces, + redirects=True) @deprecated_args(link='url', euprotocol='protocol', step=None) @@ -2636,8 +2615,7 @@ """ if site is None: site = pywikibot.Site() - for page in site.search(query, total=total, namespaces=namespaces): - yield page + return site.search(query, total=total, namespaces=namespaces) def LiveRCPageGenerator(site=None, total=None): @@ -3005,8 +2983,7 @@ repo = site.data_repository() data = repo.search_entities(text, language, total=total) - for item in data: - yield pywikibot.ItemPage(repo, item['id']) + return (pywikibot.ItemPage(repo, item['id']) for item in data) class PetScanPageGenerator(object): diff --git a/pywikibot/site/__init__.py b/pywikibot/site/__init__.py index fc016c2..bf3f1f5 100644 --- a/pywikibot/site/__init__.py +++ b/pywikibot/site/__init__.py @@ -2355,8 +2355,8 @@ if hasattr(notifications, 'values'): notifications = notifications.values() - for notification in notifications: - yield Notification.fromJSON(self, notification) + return (Notification.fromJSON(self, notification) + for notification in notifications) @need_extension('Echo') def notifications_mark_read(self, **kwargs): -- To view, visit https://gerrit.wikimedia.org/r/590325 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I08e773599990174bd302819bed4ef971b1d9dde5 Gerrit-Change-Number: 590325 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [bugfix] Remove duplicate counter in replace.py
by jenkins-bot (Code Review) 20 Apr '20

20 Apr '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/589872 ) Change subject: [bugfix] Remove duplicate counter in replace.py ...................................................................... [bugfix] Remove duplicate counter in replace.py Page counting is already done BaseBot. Remove duplicate page counter. Bug: T196851 Change-Id: I57e7e42ebe3d193fcef8481217c5b7b8c045abbb --- M scripts/replace.py 1 file changed, 4 insertions(+), 7 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/replace.py b/scripts/replace.py index ab361b9..7033908 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -578,7 +578,6 @@ self.sleep = sleep self.summary = summary - self.changed_pages = 0 self._pending_processed_titles = Queue() def isTitleExcepted(self, title, exceptions=None): @@ -667,11 +666,10 @@ new_text = self.apply_replacements(original_text, set(), page=page) return new_text - def _count_changes(self, page, err): - """Count successfully changed pages; log changed titles for display.""" + def _log_changes(self, page, err): + """Log changed titles for display.""" # This is an async put callback if not isinstance(err, Exception): - self.changed_pages += 1 self._pending_processed_titles.put((page.title( as_link=True), True)) else: # unsuccessful pages @@ -680,11 +678,11 @@ def _replace_async_callback(self, page, err): """Callback for asynchronous page edit.""" - self._count_changes(page, err) + self._log_changes(page, err) def _replace_sync_callback(self, page, err): """Callback for synchronous page edit.""" - self._count_changes(page, err) + self._log_changes(page, err) if isinstance(err, Exception): raise err @@ -1200,7 +1198,6 @@ # Explicitly call pywikibot.stopme(). It will make sure the callback is # triggered before replace.py is unloaded. pywikibot.stopme() - pywikibot.output('\n{0} pages changed.'.format(bot.changed_pages)) if __name__ == '__main__': -- To view, visit https://gerrit.wikimedia.org/r/589872 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I57e7e42ebe3d193fcef8481217c5b7b8c045abbb Gerrit-Change-Number: 589872 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [bugfix] Use Bot.userPut() method to handle PageSaveRelatedError
by jenkins-bot (Code Review) 19 Apr '20

19 Apr '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/589843 ) Change subject: [bugfix] Use Bot.userPut() method to handle PageSaveRelatedError ...................................................................... [bugfix] Use Bot.userPut() method to handle PageSaveRelatedError - Use Bot.userPut() method to handle PageSaveRelatedError This method is called by a local save method to simplify the parameters - always use asynchronous parameter, otherwise it will be set depending on "always" option - userPut has its own user_confirm() method. Rewrite it and just return True Bug: T205205 Change-Id: I1f447a3767a447e144e35d43112eff9b388ffff5 --- M scripts/replace.py 1 file changed, 17 insertions(+), 21 deletions(-) Approvals: Huji: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/replace.py b/scripts/replace.py index d358ff8..ab361b9 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -810,11 +810,10 @@ if choice == 'a': self.options['always'] = True if choice == 'y': - page.text = new_text - page.save(summary=self.generate_summary(applied), - asynchronous=True, + self.save(page, original_text, new_text, applied, + show_diff=False, quiet=True, callback=self._replace_async_callback, - quiet=True) + asynchronous=True) while not self._pending_processed_titles.empty(): proc_title, res = self._pending_processed_titles.get() pywikibot.output('Page {0}{1} saved' @@ -824,23 +823,10 @@ break if self.getOption('always') and new_text != original_text: - try: - page.text = new_text - page.save(summary=self.generate_summary(applied), - callback=self._replace_sync_callback, quiet=True) - except pywikibot.EditConflict: - pywikibot.output('Skipping {0} because of edit conflict' - .format(page.title(),)) - except pywikibot.SpamfilterError as e: - pywikibot.output( - 'Cannot change {0} because of blacklist entry {1}' - .format(page.title(), e.url)) - except pywikibot.LockedPage: - pywikibot.output('Skipping {0} (locked page)' - .format(page.title(),)) - except pywikibot.PageNotSaved as error: - pywikibot.output('Error putting page: {0}' - .format(error.args,)) + self.save(page, original_text, new_text, applied, + show_diff=False, quiet=True, + callback=self._replace_sync_callback, + asynchronous=False) if self._pending_processed_titles.qsize() > 50: while not self._pending_processed_titles.empty(): proc_title, res = self._pending_processed_titles.get() @@ -848,6 +834,16 @@ .format(proc_title, '' if res else ' not')) + def save(self, page, oldtext, newtext, applied, **kwargs): + """Save the given page.""" + self.userPut(page, oldtext, newtext, + summary=self.generate_summary(applied), + ignore_save_related_errors=True, **kwargs) + + def user_confirm(self, question): + """Always return True due to our own input choice.""" + return True + def prepareRegexForMySQL(pattern): """Convert regex to MySQL syntax.""" -- To view, visit https://gerrit.wikimedia.org/r/589843 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1f447a3767a447e144e35d43112eff9b388ffff5 Gerrit-Change-Number: 589843 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Bináris <wikiposta(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: Huji <huji.huji(a)gmail.com> Gerrit-Reviewer: Liuxinyu970226 <541329866(a)qq.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75) Gerrit-CC: Matěj Suchánek <matejsuchanek97(a)gmail.com>

1 0

[Gerrit] pywikibot/core[master]: [IMPR] raise SpamblacklistError with spamblacklist APIError
by jenkins-bot (Code Review) 19 Apr '20

19 Apr '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/586037 ) Change subject: [IMPR] raise SpamblacklistError with spamblacklist APIError ...................................................................... [IMPR] raise SpamblacklistError with spamblacklist APIError - rename SpamfilterError with SpamblacklistError - add SpamblacklistError to the _ep_errors exceptions list - SpamblacklistError needs an additional url parameter. pass err.other[err.code]['matches'] to it which contains the expected additional urls. The wikitext err.info is already shown by the api warning message. - Python 3 in contrast to Python 2 also prints the APIError exception by default with that subsequent message: "During handling of the above exception, another exception occurred:" The error can be raise with "from statement", e.g. "from err" In that case the APIError will be printed too but the subsequent message changes to: "The above exception was the direct cause of the following exception:" To hide the APIError exception printing in Python 3 SpamblacklistError must be raised "from None". To support Python 2 compatibility exec method is needed here. Bug: T249436 Change-Id: I4346e2e6c56a38718c35191f0d0653e818a66333 --- M pywikibot/__init__.py M pywikibot/bot.py M pywikibot/exceptions.py M pywikibot/site/__init__.py 4 files changed, 42 insertions(+), 16 deletions(-) Approvals: Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index e5aaf8a..b33c68c 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -44,11 +44,11 @@ LockedPage, CascadeLockedPage, LockedNoPage, NoCreateError, EditConflict, PageDeletedConflict, PageCreatedConflict, ServerError, FatalServerError, Server504Error, - CaptchaError, SpamfilterError, TitleblacklistError, + CaptchaError, SpamblacklistError, TitleblacklistError, CircularRedirect, InterwikiRedirectPage, WikiBaseError, NoWikibaseEntity, CoordinateGlobeUnknownException, DeprecatedPageNotFoundError as _DeprecatedPageNotFoundError, - _EmailUserError, + _DeprecatedSpamfilterError, _EmailUserError, ) from pywikibot.family import Family from pywikibot.i18n import translate @@ -104,10 +104,10 @@ 'Page', 'PageCreatedConflict', 'PageDeletedConflict', 'PageNotSaved', 'PageRelatedError', 'PageSaveRelatedError', 'PropertyPage', 'QuitKeyboardInterrupt', 'SectionError', 'Server504Error', 'ServerError', - 'showHelp', 'Site', 'SiteDefinitionError', 'SiteLink', 'SpamfilterError', - 'stdout', 'TitleblacklistError', 'translate', 'ui', 'unicode2html', - 'UnicodeMixin', 'UnknownExtension', 'UnknownFamily', 'UnknownSite', - 'UnsupportedPage', 'UploadWarning', 'url2unicode', 'User', + 'showHelp', 'Site', 'SiteDefinitionError', 'SiteLink', + 'SpamblacklistError', 'stdout', 'TitleblacklistError', 'translate', 'ui', + 'unicode2html', 'UnicodeMixin', 'UnknownExtension', 'UnknownFamily', + 'UnknownSite', 'UnsupportedPage', 'UploadWarning', 'url2unicode', 'User', 'UserActionRefuse', 'UserBlocked', 'warning', 'WikiBaseError', 'WikidataBot', ) @@ -1445,6 +1445,11 @@ 'used by pywikibot; use http.fetch() instead.'), since='20140924') wrapper._add_deprecated_attr( + 'SpamfilterError', _DeprecatedSpamfilterError, + warning_message='SpamfilterError is deprecated; ' + 'use SpamblacklistError instead.', + since='20200405') +wrapper._add_deprecated_attr( 'UserActionRefuse', _EmailUserError, warning_message='UserActionRefuse is deprecated; ' 'use UserRightsError and/or NotEmailableError instead.', diff --git a/pywikibot/bot.py b/pywikibot/bot.py index a2b65ca..456d069 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -1263,7 +1263,7 @@ if isinstance(e, pywikibot.EditConflict): pywikibot.output('Skipping %s because of edit conflict' % page.title()) - elif isinstance(e, pywikibot.SpamfilterError): + elif isinstance(e, pywikibot.SpamblacklistError): pywikibot.output( 'Cannot change %s because of blacklist entry %s' % (page.title(), e.url)) diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py index deca5ea..f5479e8 100644 --- a/pywikibot/exceptions.py +++ b/pywikibot/exceptions.py @@ -38,7 +38,7 @@ PageSaveRelatedError: page exceptions within the save operation on a Page (alias: PageNotSaved). - - SpamfilterError: MediaWiki spam filter detected a blacklisted URL + - SpamblacklistError: MediaWiki spam filter detected a blacklisted URL - TitleblacklistError: MediaWiki detected a blacklisted page title - OtherPageSaveError: misc. other save related exception. - LockedPage: Page is locked @@ -451,7 +451,7 @@ pass -class SpamfilterError(PageSaveRelatedError): +class SpamblacklistError(PageSaveRelatedError): """Page save failed because MediaWiki detected a blacklisted spam URL.""" @@ -461,7 +461,7 @@ def __init__(self, page, url): """Initializer.""" self.url = url - super(SpamfilterError, self).__init__(page) + super(SpamblacklistError, self).__init__(page) class TitleblacklistError(PageSaveRelatedError): @@ -627,6 +627,14 @@ pass +@__deprecated(since='20200405') +class _DeprecatedSpamfilterError(SpamblacklistError): + + """MediaWiki detected a blacklisted spam URL (deprecated).""" + + pass + + wrapper = _ModuleDeprecationWrapper(__name__) wrapper._add_deprecated_attr( 'UploadWarning', @@ -639,6 +647,10 @@ 'longer used by pywikibot; use ' 'http.fetch() instead.', since='20141214') +wrapper._add_deprecated_attr('SpamfilterError', _DeprecatedSpamfilterError, + warning_message='SpamfilterError is deprecated; ' + 'use SpamblacklistError instead.', + since='20200405') wrapper._add_deprecated_attr( 'UserActionRefuse', _EmailUserError, warning_message='UserActionRefuse is deprecated; ' diff --git a/pywikibot/site/__init__.py b/pywikibot/site/__init__.py index f7b8471..3906be9 100644 --- a/pywikibot/site/__init__.py +++ b/pywikibot/site/__init__.py @@ -63,7 +63,7 @@ PageRelatedError, PageSaveRelatedError, SiteDefinitionError, - SpamfilterError, + SpamblacklistError, TitleblacklistError, UnknownExtension, UnknownSite, @@ -5265,6 +5265,7 @@ 'protectedtitle': LockedNoPage, 'cascadeprotected': CascadeLockedPage, 'titleblacklist-forbidden': TitleblacklistError, + 'spamblacklist': SpamblacklistError, } _ep_text_overrides = {'appendtext', 'prependtext', 'undo'} @@ -5390,16 +5391,24 @@ 'logged in' % err.code, _logger) if err.code in self._ep_errors: - if isinstance(self._ep_errors[err.code], UnicodeType): + exception = self._ep_errors[err.code] + if isinstance(exception, UnicodeType): errdata = { 'site': self, 'title': page.title(with_section=False), 'user': self.user(), 'info': err.info } - raise Error(self._ep_errors[err.code] % errdata) + raise Error(exception % errdata) + elif issubclass(exception, SpamblacklistError): + urls = ', '.join(err.other[err.code]['matches']) + exec_string = ('raise exception(page, url="{}")' + .format(urls)) + if not PY2: + exec_string += ' from None' + exec(exec_string) else: - raise self._ep_errors[err.code](page) + raise exception(page) pywikibot.debug( "editpage: Unexpected error code '%s' received." % err.code, @@ -5450,8 +5459,8 @@ return False if 'spamblacklist' in result['edit']: - raise SpamfilterError(page, - result['edit']['spamblacklist']) + raise SpamblacklistError( + page, result['edit']['spamblacklist']) if 'code' in result['edit'] and 'info' in result['edit']: pywikibot.error( -- To view, visit https://gerrit.wikimedia.org/r/586037 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4346e2e6c56a38718c35191f0d0653e818a66333 Gerrit-Change-Number: 586037 Gerrit-PatchSet: 13 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75) Gerrit-CC: Dvorapa <dvorapa(a)seznam.cz> Gerrit-CC: Matěj Suchánek <matejsuchanek97(a)gmail.com>

1 0

[Gerrit] pywikibot/core[master]: [IMPR] Simplify code
by jenkins-bot (Code Review) 18 Apr '20

18 Apr '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/576633 ) Change subject: [IMPR] Simplify code ...................................................................... [IMPR] Simplify code isAllowedLicense(): - just return flickr_allowed_license lookup result getTags(): - use list comprehension instead of building a list getFilename(): - create FilePage title only once - use FilePage instead of Pag which respects namespace identifier - use exists() condition instead of additional return statement buildDescription(): - combine "if flickrreview" and "if reviewer" Change-Id: Ie132b7053b29b9eb65ece0272d574c1dcc63a43b --- M scripts/flickrripper.py 1 file changed, 24 insertions(+), 37 deletions(-) Approvals: D3r1ck01: Looks good to me, but someone else must approve Huji: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/flickrripper.py b/scripts/flickrripper.py index 7de0d27..9dc6652 100755 --- a/scripts/flickrripper.py +++ b/scripts/flickrripper.py @@ -93,11 +93,8 @@ TODO: Maybe add more licenses """ - license = photoInfo.find('photo').attrib['license'] - if flickr_allowed_license[int(license)]: - return True - else: - return False + photo_license = photoInfo.find('photo').attrib['license'] + return flickr_allowed_license[int(photo_license)] def getPhotoUrl(photoSizes): @@ -142,16 +139,14 @@ def getTags(photoInfo, raw=False): - """Get all the tags on a photo.""" - result = [] - for tag in photoInfo.find('photo').find('tags').findall('tag'): - if raw: - # use original tag name - # see https://www.flickr.com/services/api/misc.tags.html - result.append(tag.attrib['raw'].lower()) - else: - result.append(tag.text.lower()) - return result + """Get all the tags on a photo. + + @param raw: use original tag name + see https://www.flickr.com/services/api/misc.tags.html + @type raw: bool + """ + return [tag.attrib['raw'].lower() if raw else tag.text.lower() + for tag in photoInfo.find('photo').find('tags').findall('tag')] def getFlinfoDescription(photo_id): @@ -199,20 +194,14 @@ fileformat = photoInfo.find('photo').attrib['originalformat'] if not fileformat and photo_url: - fileformat = photo_url.split('.')[-1] - - if pywikibot.Page(site, 'File:{} - {} - {}.{}' - .format(title, project, username, fileformat)).exists(): - i = 1 - while True: - name = '{} - {} - {} ({}).{}'.format(title, project, username, + _, fileformat = photo_url.rsplit('.', 1) + filename = '{} - {} - {}.{}'.format(title, project, username, fileformat) + i = 1 + while pywikibot.FilePage(site, filename).exists(): + filename = '{} - {} - {} ({}).{}'.format(title, project, username, i, fileformat) - if pywikibot.Page(site, 'File:' + name).exists(): - i += 1 - else: - return name - else: - return '{} - {} - {}.{}'.format(title, project, username, fileformat) + i += 1 + return filename def cleanUpTitle(title): @@ -270,13 +259,13 @@ '') description = description.replace('=={{int:license}}==', '=={{int:license}}==\n' + override) - elif flickrreview: - if reviewer: - description = description.replace( - '{{flickrreview}}', - '{{flickrreview|%s|' - '{{subst:CURRENTYEAR}}-{{subst:CURRENTMONTH}}-' - '{{subst:CURRENTDAY2}}}}' % reviewer) + elif flickrreview and reviewer: + description = description.replace( + '{{flickrreview}}', + '{{flickrreview|%s|' + '{{subst:CURRENTYEAR}}-{{subst:CURRENTMONTH}}-' + '{{subst:CURRENTDAY2}}}}' % reviewer) + if '{{subst:unc}}' not in description: # Request category check description += '\n{{subst:chc}}\n' @@ -424,8 +413,6 @@ pywikibot.output('Flickr api problem, sleeping') pywikibot.sleep(30) - return - def main(*args): """ -- To view, visit https://gerrit.wikimedia.org/r/576633 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie132b7053b29b9eb65ece0272d574c1dcc63a43b Gerrit-Change-Number: 576633 Gerrit-PatchSet: 6 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: Huji <huji.huji(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm(a)member.fsf.org> Gerrit-Reviewer: Multichill <maarten(a)mdammers.nl> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [bugfix] Use SingleSiteBot with ReplaceRobot
by jenkins-bot (Code Review) 18 Apr '20

18 Apr '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/589892 ) Change subject: [bugfix] Use SingleSiteBot with ReplaceRobot ...................................................................... [bugfix] Use SingleSiteBot with ReplaceRobot Use SingleSiteBot to omit site warning with Bot class Change-Id: I7a4f8fde46684b9a9a432da1411c4cbf4c2266fc --- M scripts/replace.py 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/replace.py b/scripts/replace.py index d358ff8..39248c6 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -156,7 +156,8 @@ from pywikibot.exceptions import ArgumentDeprecationWarning # Imports predefined replacements tasks from fixes.py from pywikibot import fixes -from pywikibot import i18n, textlib, pagegenerators, Bot +from pywikibot import i18n, textlib, pagegenerators +from pywikibot.bot import SingleSiteBot from pywikibot.tools import ( chars, deprecated, @@ -499,7 +500,7 @@ return False -class ReplaceRobot(Bot): +class ReplaceRobot(SingleSiteBot): """A bot that can do text replacements. -- To view, visit https://gerrit.wikimedia.org/r/589892 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7a4f8fde46684b9a9a432da1411c4cbf4c2266fc Gerrit-Change-Number: 589892 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [IMPR] rename replace.run() with replace.treat()
by jenkins-bot (Code Review) 18 Apr '20

18 Apr '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/589717 ) Change subject: [IMPR] rename replace.run() with replace.treat() ...................................................................... [IMPR] rename replace.run() with replace.treat() This enables - KeyboardInterrupt handling - edit counting - further improvements later by using BaseBot methods Bug: T196851 Bug: T171713 Change-Id: I414d6ec16662dc1885b109cc947c326f2ab07dd5 --- M scripts/replace.py 1 file changed, 123 insertions(+), 123 deletions(-) Approvals: Matěj Suchánek: Looks good to me, but someone else must approve Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/replace.py b/scripts/replace.py index 3a9d5a4..d358ff8 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -715,138 +715,138 @@ semicolon = self.site.mediawiki_message('semicolon-separator') return semicolon.join(summary_messages) - def run(self): - """Start the bot.""" - # Run the generator which will yield Pages which might need to be - # changed. - for page in self.generator: - if self.isTitleExcepted(page.title()): - pywikibot.output( - 'Skipping {0} because the title is on the exceptions list.' - .format(page.title(as_link=True))) - continue - try: - # Load the page's text from the wiki - original_text = page.get(get_redirect=True) - if not page.has_permission(): - pywikibot.output("You can't edit page " - + page.title(as_link=True)) - continue - except pywikibot.NoPage: - pywikibot.output('Page {0} not found' + def treat(self, page): + """Work on each page retrieved from generator.""" + if self.isTitleExcepted(page.title()): + pywikibot.output( + 'Skipping {0} because the title is on the exceptions list.' + .format(page.title(as_link=True))) + return + + try: + # Load the page's text from the wiki + original_text = page.get(get_redirect=True) + if not page.has_permission(): + pywikibot.output("You can't edit page " + + page.title(as_link=True)) + return + except pywikibot.NoPage: + pywikibot.output('Page {0} not found' + .format(page.title(as_link=True))) + return + + applied = set() + new_text = original_text + last_text = None + context = 0 + while True: + if self.isTextExcepted(new_text): + pywikibot.output('Skipping {0} because it contains text ' + 'that is on the exceptions list.' .format(page.title(as_link=True))) + break + while new_text != last_text: + last_text = new_text + new_text = self.apply_replacements(last_text, applied, + page) + if not self.recursive: + break + if new_text == original_text: + pywikibot.output('No changes were necessary in ' + + page.title(as_link=True)) + break + if hasattr(self, 'addedCat'): + # Fetch only categories in wikitext, otherwise the others + # will be explicitly added. + cats = textlib.getCategoryLinks(new_text, site=page.site) + if self.addedCat not in cats: + cats.append(self.addedCat) + new_text = textlib.replaceCategoryLinks(new_text, + cats, + site=page.site) + # Show the title of the page we're working on. + # Highlight the title in purple. + pywikibot.output(color_format( + '\n\n>>> {lightpurple}{0}{default} <<<', page.title())) + pywikibot.showDiff(original_text, new_text, context=context) + if self.getOption('always'): + break + choice = pywikibot.input_choice( + 'Do you want to accept these changes?', + [('Yes', 'y'), ('No', 'n'), ('Edit original', 'e'), + ('edit Latest', 'l'), ('open in Browser', 'b'), + ('More context', 'm'), ('All', 'a')], + default='N') + if choice == 'm': + context = context * 3 if context else 3 continue - applied = set() - new_text = original_text - last_text = None - context = 0 - while True: - if self.isTextExcepted(new_text): - pywikibot.output('Skipping {0} because it contains text ' - 'that is on the exceptions list.' - .format(page.title(as_link=True))) - break - while new_text != last_text: + if choice == 'e': + editor = editarticle.TextEditor() + as_edited = editor.edit(original_text) + # if user didn't press Cancel + if as_edited and as_edited != new_text: + new_text = as_edited + continue + if choice == 'l': + editor = editarticle.TextEditor() + as_edited = editor.edit(new_text) + # if user didn't press Cancel + if as_edited and as_edited != new_text: + new_text = as_edited + # prevent changes from being applied again last_text = new_text - new_text = self.apply_replacements(last_text, applied, - page) - if not self.recursive: - break - if new_text == original_text: - pywikibot.output('No changes were necessary in ' - + page.title(as_link=True)) + continue + if choice == 'b': + pywikibot.bot.open_webbrowser(page) + try: + original_text = page.get(get_redirect=True, force=True) + except pywikibot.NoPage: + pywikibot.output('Page {0} has been deleted.' + .format(page.title())) break - if hasattr(self, 'addedCat'): - # Fetch only categories in wikitext, otherwise the others - # will be explicitly added. - cats = textlib.getCategoryLinks(new_text, site=page.site) - if self.addedCat not in cats: - cats.append(self.addedCat) - new_text = textlib.replaceCategoryLinks(new_text, - cats, - site=page.site) - # Show the title of the page we're working on. - # Highlight the title in purple. - pywikibot.output(color_format( - '\n\n>>> {lightpurple}{0}{default} <<<', page.title())) - pywikibot.showDiff(original_text, new_text, context=context) - if self.getOption('always'): - break - choice = pywikibot.input_choice( - 'Do you want to accept these changes?', - [('Yes', 'y'), ('No', 'n'), ('Edit original', 'e'), - ('edit Latest', 'l'), ('open in Browser', 'b'), - ('More context', 'm'), ('All', 'a')], - default='N') - if choice == 'm': - context = context * 3 if context else 3 - continue - if choice == 'e': - editor = editarticle.TextEditor() - as_edited = editor.edit(original_text) - # if user didn't press Cancel - if as_edited and as_edited != new_text: - new_text = as_edited - continue - if choice == 'l': - editor = editarticle.TextEditor() - as_edited = editor.edit(new_text) - # if user didn't press Cancel - if as_edited and as_edited != new_text: - new_text = as_edited - # prevent changes from being applied again - last_text = new_text - continue - if choice == 'b': - pywikibot.bot.open_webbrowser(page) - try: - original_text = page.get(get_redirect=True, force=True) - except pywikibot.NoPage: - pywikibot.output('Page {0} has been deleted.' - .format(page.title())) - break - new_text = original_text - last_text = None - continue - if choice == 'a': - self.options['always'] = True - if choice == 'y': - page.text = new_text - page.save(summary=self.generate_summary(applied), - asynchronous=True, - callback=self._replace_async_callback, - quiet=True) + new_text = original_text + last_text = None + continue + if choice == 'a': + self.options['always'] = True + if choice == 'y': + page.text = new_text + page.save(summary=self.generate_summary(applied), + asynchronous=True, + callback=self._replace_async_callback, + quiet=True) + while not self._pending_processed_titles.empty(): + proc_title, res = self._pending_processed_titles.get() + pywikibot.output('Page {0}{1} saved' + .format(proc_title, + '' if res else ' not')) + # choice must be 'N' + break + + if self.getOption('always') and new_text != original_text: + try: + page.text = new_text + page.save(summary=self.generate_summary(applied), + callback=self._replace_sync_callback, quiet=True) + except pywikibot.EditConflict: + pywikibot.output('Skipping {0} because of edit conflict' + .format(page.title(),)) + except pywikibot.SpamfilterError as e: + pywikibot.output( + 'Cannot change {0} because of blacklist entry {1}' + .format(page.title(), e.url)) + except pywikibot.LockedPage: + pywikibot.output('Skipping {0} (locked page)' + .format(page.title(),)) + except pywikibot.PageNotSaved as error: + pywikibot.output('Error putting page: {0}' + .format(error.args,)) + if self._pending_processed_titles.qsize() > 50: while not self._pending_processed_titles.empty(): proc_title, res = self._pending_processed_titles.get() pywikibot.output('Page {0}{1} saved' .format(proc_title, '' if res else ' not')) - # choice must be 'N' - break - if self.getOption('always') and new_text != original_text: - try: - page.text = new_text - page.save(summary=self.generate_summary(applied), - callback=self._replace_sync_callback, quiet=True) - except pywikibot.EditConflict: - pywikibot.output('Skipping {0} because of edit conflict' - .format(page.title(),)) - except pywikibot.SpamfilterError as e: - pywikibot.output( - 'Cannot change {0} because of blacklist entry {1}' - .format(page.title(), e.url)) - except pywikibot.LockedPage: - pywikibot.output('Skipping {0} (locked page)' - .format(page.title(),)) - except pywikibot.PageNotSaved as error: - pywikibot.output('Error putting page: {0}' - .format(error.args,)) - if self._pending_processed_titles.qsize() > 50: - while not self._pending_processed_titles.empty(): - proc_title, res = self._pending_processed_titles.get() - pywikibot.output('Page {0}{1} saved' - .format(proc_title, - '' if res else ' not')) def prepareRegexForMySQL(pattern): -- To view, visit https://gerrit.wikimedia.org/r/589717 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I414d6ec16662dc1885b109cc947c326f2ab07dd5 Gerrit-Change-Number: 589717 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [bugfix] Do not removeUselessSpaces inside source/syntaxhighlight tags
by jenkins-bot (Code Review) 17 Apr '20

17 Apr '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/589558 ) Change subject: [bugfix] Do not removeUselessSpaces inside source/syntaxhighlight tags ...................................................................... [bugfix] Do not removeUselessSpaces inside source/syntaxhighlight tags Bug: T250469 Change-Id: I86f6fc9794666e38674ed6d155166fc7bead2128 --- M pywikibot/cosmetic_changes.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py index ae993b9..7aad15e 100755 --- a/pywikibot/cosmetic_changes.py +++ b/pywikibot/cosmetic_changes.py @@ -682,7 +682,7 @@ def removeUselessSpaces(self, text): """Cleanup multiple or trailing spaces.""" exceptions = ['comment', 'math', 'nowiki', 'pre', 'startspace', - 'table'] + 'source', 'table'] if self.site.sitename != 'wikipedia:cs': exceptions.append('template') text = textlib.replaceExcept(text, r'(?m)[\t ]+( |$)', r'\1', -- To view, visit https://gerrit.wikimedia.org/r/589558 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I86f6fc9794666e38674ed6d155166fc7bead2128 Gerrit-Change-Number: 589558 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [bugfix] Add missing write actions to write actions tuple
by jenkins-bot (Code Review) 15 Apr '20

15 Apr '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/588956 ) Change subject: [bugfix] Add missing write actions to write actions tuple ...................................................................... [bugfix] Add missing write actions to write actions tuple - Add missing write actions from https://www.mediawiki.org/wiki/API:Changing_wiki_content - sort the write actions tuple Change-Id: Ibadd1456dc8b1525ea1f0465a837e7cfe4634bdc --- M pywikibot/data/api.py 1 file changed, 6 insertions(+), 5 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 116d143..6e0214c 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -1221,11 +1221,12 @@ # things like throttling or skipping actions when we're in simulation # mode self.write = self.action in ( - 'block', 'createaccount', 'delete', 'edit', 'emailuser', - 'filerevert', 'flowthank', 'import', 'move', 'options', 'patrol', - 'protect', 'purge', 'revisiondelete', 'rollback', - 'setnotificationtimestamp', 'setpagelanguage', 'thank', 'unblock', - 'undelete', 'upload', 'userrights', 'watch', + 'block', 'clearhasmsg', 'createaccount', 'delete', 'edit', + 'emailuser', 'filerevert', 'flowthank', 'imagerotate', 'import', + 'managetags', 'mergehistory', 'move', 'options', 'patrol', + 'protect', 'purge', 'resetpassword', 'revisiondelete', 'rollback', + 'setnotificationtimestamp', 'setpagelanguage', 'tag', 'thank', + 'unblock', 'undelete', 'upload', 'userrights', 'watch', 'wbcreateclaim', 'wbcreateredirect', 'wbeditentity', 'wblinktitles', 'wbmergeitems', 'wbremoveclaims', 'wbremovequalifiers', 'wbremovereferences', 'wbsetaliases', -- To view, visit https://gerrit.wikimedia.org/r/588956 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibadd1456dc8b1525ea1f0465a837e7cfe4634bdc Gerrit-Change-Number: 588956 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: jenkins-bot (75)

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits April 2020