Pywikibot-commits January 2020

pywikibot-commits@lists.wikimedia.org

1 participants
95 discussions

[Gerrit] pywikibot/core[master]: [L10N] Update families files

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/563713 ) Change subject: [L10N] Update families files ...................................................................... [L10N] Update families files Change-Id: I54709666a593e7e31c817dfa318e23427fbd04dd --- M pywikibot/families/wikibooks_family.py M pywikibot/families/wikinews_family.py M pywikibot/families/wikipedia_family.py M pywikibot/families/wikiquote_family.py M pywikibot/families/wikisource_family.py M pywikibot/families/wiktionary_family.py 6 files changed, 28 insertions(+), 28 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikibooks_family.py b/pywikibot/families/wikibooks_family.py index 64a8d9b..2fcc724 100644 --- a/pywikibot/families/wikibooks_family.py +++ b/pywikibot/families/wikibooks_family.py @@ -38,7 +38,7 @@ 'gl', 'sr', 'cs', 'hr', 'ba', 'ar', 'no', 'tr', 'sa', 'ta', 'uk', 'hi', 'eo', 'sk', 'is', 'ro', 'bn', 'si', 'mk', 'bg', 'ka', 'ms', 'tt', 'lt', 'el', 'li', 'ur', 'sl', 'km', 'tl', 'la', 'et', 'kk', 'be', 'ia', 'ml', - 'oc', 'hy', 'eu', 'ne', 'pa', 'tg', 'cv', 'ku', 'fy', 'bs', 'cy', 'af', + 'oc', 'eu', 'hy', 'ne', 'pa', 'tg', 'cv', 'ku', 'fy', 'bs', 'cy', 'af', 'te', 'mr', 'mg', 'ky', ] diff --git a/pywikibot/families/wikinews_family.py b/pywikibot/families/wikinews_family.py index f841497..0c8153c 100644 --- a/pywikibot/families/wikinews_family.py +++ b/pywikibot/families/wikinews_family.py @@ -25,7 +25,7 @@ languages_by_size = [ 'sr', 'en', 'fr', 'ru', 'pl', 'pt', 'de', 'es', 'zh', 'it', 'ar', 'cs', 'ca', 'nl', 'el', 'ta', 'sv', 'uk', 'fa', 'ro', 'fi', 'tr', 'ja', 'li', - 'sq', 'no', 'eo', 'bg', 'ko', 'bs', 'he', + 'sq', 'eo', 'no', 'bg', 'ko', 'bs', 'he', ] category_redirect_templates = { diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index 9362cb7..cc1dd7a 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -34,30 +34,30 @@ 'vi', 'ja', 'zh', 'ar', 'pt', 'uk', 'fa', 'ca', 'sr', 'no', 'id', 'ko', 'fi', 'hu', 'sh', 'cs', 'ro', 'eu', 'tr', 'ms', 'eo', 'hy', 'bg', 'da', 'he', 'ce', 'zh-min-nan', 'sk', 'kk', 'min', 'hr', 'et', 'lt', 'be', - 'el', 'sl', 'gl', 'az', 'simple', 'azb', 'nn', 'ur', 'hi', 'th', 'ka', + 'el', 'azb', 'sl', 'gl', 'az', 'simple', 'nn', 'ur', 'hi', 'th', 'ka', 'uz', 'la', 'ta', 'vo', 'cy', 'mk', 'tg', 'ast', 'lv', 'mg', 'tt', 'af', 'oc', 'bs', 'ky', 'bn', 'sq', 'zh-yue', 'tl', 'new', 'te', - 'be-tarask', 'br', 'ml', 'pms', 'su', 'nds', 'lb', 'ht', 'jv', 'sco', - 'mr', 'sw', 'pnb', 'ga', 'szl', 'ba', 'is', 'my', 'fy', 'cv', 'arz', + 'be-tarask', 'br', 'ml', 'pms', 'arz', 'su', 'nds', 'lb', 'ht', 'jv', + 'sco', 'mr', 'sw', 'pnb', 'ga', 'szl', 'ba', 'is', 'my', 'fy', 'cv', 'lmo', 'an', 'ne', 'pa', 'yo', 'bar', 'io', 'gu', 'als', 'ku', 'scn', 'kn', 'ckb', 'bpy', 'wuu', 'ia', 'qu', 'mn', 'bat-smg', 'si', 'wa', - 'cdo', 'or', 'gd', 'yi', 'am', 'nap', 'bug', 'ilo', 'mai', 'hsb', - 'xmf', 'map-bms', 'fo', 'mzn', 'diq', 'sd', 'li', 'vec', 'eml', 'sah', - 'os', 'sa', 'ps', 'nv', 'ace', 'mrj', 'mhr', 'zh-classical', 'frr', + 'or', 'cdo', 'gd', 'yi', 'am', 'nap', 'bug', 'ilo', 'mai', 'xmf', + 'hsb', 'map-bms', 'fo', 'mzn', 'diq', 'sd', 'li', 'vec', 'eml', 'sah', + 'os', 'sa', 'nv', 'ps', 'ace', 'mrj', 'mhr', 'zh-classical', 'frr', 'hif', 'bcl', 'roa-tara', 'hak', 'pam', 'nso', 'km', 'hyw', 'se', - 'rue', 'mi', 'vls', 'bh', 'nah', 'nds-nl', 'crh', 'gan', 'vep', 'shn', + 'rue', 'mi', 'vls', 'bh', 'nah', 'nds-nl', 'crh', 'gan', 'shn', 'vep', 'sc', 'as', 'ab', 'glk', 'bo', 'myv', 'co', 'so', 'tk', 'fiu-vro', - 'lrc', 'kv', 'csb', 'gv', 'sn', 'udm', 'zea', 'ie', 'ay', 'pcd', 'kab', - 'ha', 'nrm', 'ug', 'lez', 'stq', 'kw', 'mwl', 'haw', 'gn', 'gom', - 'lij', 'rm', 'lfn', 'lad', 'lo', 'frp', 'koi', 'mt', 'fur', 'dsb', - 'dty', 'olo', 'ext', 'ang', 'ln', 'cbk-zam', 'dv', 'bjn', 'ksh', 'gag', - 'pfl', 'pi', 'pag', 'gor', 'av', 'bxr', 'sat', 'xal', 'krc', 'za', - 'tyv', 'pap', 'kaa', 'pdc', 'rw', 'to', 'kl', 'nov', 'jam', 'arc', - 'kbp', 'tpi', 'kbd', 'szy', 'tet', 'ig', 'zu', 'ki', 'wo', 'na', 'jbo', - 'tcy', 'roa-rup', 'bi', 'lbe', 'ty', 'mdf', 'kg', 'lg', 'inh', 'srn', - 'atj', 'xh', 'ban', 'ltg', 'chr', 'got', 'sm', 'pih', 'om', 'ak', 'tn', - 'tw', 'cu', 'ts', 'rmy', 'bm', 'st', 'fj', 'chy', 'rn', 'tum', 'ny', - 'ch', 'nqo', 'ss', 'gcr', 'pnt', 'ady', 'iu', 'mnw', 've', 'ee', 'ks', + 'lrc', 'kv', 'csb', 'gv', 'sn', 'udm', 'zea', 'ie', 'ay', 'pcd', 'ha', + 'kab', 'nrm', 'ug', 'lez', 'stq', 'kw', 'mwl', 'haw', 'gn', 'gom', + 'lfn', 'lij', 'rm', 'lad', 'lo', 'frp', 'koi', 'mt', 'fur', 'dsb', + 'dty', 'olo', 'ang', 'ext', 'ln', 'cbk-zam', 'dv', 'bjn', 'ksh', 'gag', + 'pfl', 'pi', 'pag', 'gor', 'av', 'sat', 'bxr', 'xal', 'krc', 'tyv', + 'za', 'pap', 'kaa', 'pdc', 'rw', 'to', 'nov', 'kl', 'jam', 'arc', + 'tpi', 'kbp', 'kbd', 'szy', 'tet', 'ig', 'zu', 'wo', 'ki', 'na', 'tcy', + 'jbo', 'roa-rup', 'lbe', 'bi', 'ty', 'mdf', 'kg', 'inh', 'lg', 'atj', + 'srn', 'ban', 'xh', 'ltg', 'chr', 'got', 'sm', 'pih', 'om', 'ak', 'tn', + 'tw', 'cu', 'fj', 'ts', 'rmy', 'bm', 'st', 'chy', 'rn', 'tum', 'ny', + 'nqo', 'ch', 'ss', 'pnt', 'gcr', 'mnw', 'ady', 'iu', 've', 'ee', 'ks', 'ik', 'sg', 'ff', 'dz', 'ti', 'din', 'cr', ] diff --git a/pywikibot/families/wikiquote_family.py b/pywikibot/families/wikiquote_family.py index f607e9f..f84c9e7 100644 --- a/pywikibot/families/wikiquote_family.py +++ b/pywikibot/families/wikiquote_family.py @@ -34,7 +34,7 @@ 'he', 'bs', 'ca', 'fi', 'tr', 'sl', 'lt', 'az', 'bg', 'zh', 'eo', 'hr', 'hy', 'el', 'su', 'nn', 'id', 'ar', 'sv', 'li', 'hu', 'ko', 'th', 'nl', 'et', 'ja', 'la', 'sah', 'sr', 'ta', 'gu', 'gl', 'ur', 'te', 'cy', - 'be', 'no', 'ml', 'kn', 'ro', 'ku', 'eu', 'hi', 'sq', 'ka', 'da', 'sa', + 'be', 'no', 'ml', 'kn', 'ro', 'ku', 'sq', 'eu', 'hi', 'ka', 'da', 'sa', 'is', 'vi', 'br', 'mr', 'af', 'uz', 'ky', 'wo', ] diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index 8e05c4e..11e3e53 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -29,11 +29,11 @@ languages_by_size = [ 'en', 'pl', 'ru', 'de', 'fr', 'zh', 'he', 'it', 'es', 'ar', 'cs', 'pt', - 'www', 'gu', 'fa', 'hu', 'ml', 'sv', 'uk', 'ko', 'sr', 'bn', 'sa', + 'www', 'gu', 'fa', 'hu', 'uk', 'ml', 'sv', 'ko', 'sr', 'bn', 'sa', 'hy', 'sl', 'te', 'el', 'ro', 'fi', 'ja', 'vi', 'nap', 'ta', 'az', 'th', 'ca', 'br', 'nl', 'kn', 'hr', 'la', 'no', 'is', 'eo', 'vec', - 'tr', 'pms', 'be', 'et', 'da', 'mk', 'id', 'yi', 'bg', 'li', 'as', - 'mr', 'hi', 'or', 'pa', 'gl', 'eu', 'lt', 'bs', 'sah', 'sk', 'cy', + 'tr', 'pms', 'et', 'be', 'da', 'mk', 'id', 'yi', 'bg', 'li', 'mr', + 'as', 'hi', 'or', 'pa', 'gl', 'eu', 'lt', 'bs', 'sah', 'sk', 'cy', 'zh-min-nan', 'fo', ] diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index c103d53..69946ca 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -39,11 +39,11 @@ 'simple', 'is', 'bg', 'sk', 'ast', 'ps', 'ur', 'wa', 'cy', 'vo', 'zh-min-nan', 'af', 'he', 'scn', 'tl', 'pa', 'sw', 'fy', 'nn', 'bn', 'lv', 'sq', 'ka', 'co', 'mn', 'pnb', 'nds', 'lb', 'sl', 'bs', 'nah', - 'sa', 'kk', 'tk', 'vec', 'sm', 'km', 'ms', 'mk', 'hsb', 'be', 'yue', + 'sa', 'kk', 'tk', 'vec', 'ms', 'sm', 'km', 'mk', 'hsb', 'be', 'yue', 'ga', 'an', 'wo', 'ang', 'tt', 'shy', 'mt', 'sd', 'gn', 'mr', 'ie', - 'so', 'csb', 'ug', 'gd', 'ia', 'st', 'fo', 'roa-rup', 'si', 'hif', - 'kl', 'mi', 'ay', 'su', 'jbo', 'zu', 'ln', 'yi', 'na', 'gu', 'gv', - 'kw', 'min', 'rw', 'ts', 'ne', 'om', 'qu', 'ss', 'ha', 'iu', 'am', + 'so', 'gd', 'csb', 'ug', 'ia', 'st', 'fo', 'roa-rup', 'si', 'hif', + 'kl', 'mi', 'ay', 'su', 'jbo', 'zu', 'ln', 'yi', 'min', 'na', 'gu', + 'gv', 'kw', 'rw', 'ts', 'ne', 'om', 'qu', 'ss', 'ha', 'iu', 'am', 'tpi', 'dv', 'ti', 'sg', 'tn', 'ks', ] -- To view, visit https://gerrit.wikimedia.org/r/563713 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: I54709666a593e7e31c817dfa318e23427fbd04dd Gerrit-Change-Number: 563713 Gerrit-PatchSet: 1 Gerrit-Owner: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

4 years, 3 months

[Gerrit] pywikibot/core[master]: [cleanup] Remove deprecated botirc.py lib as announced in HISTORY.rst

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/563664 ) Change subject: [cleanup] Remove deprecated botirc.py lib as announced in HISTORY.rst ...................................................................... [cleanup] Remove deprecated botirc.py lib as announced in HISTORY.rst - Also remove script_wui.py which depends on it - update doc files - update tests settings Bug: T212632 Change-Id: Ib6cd1e5b7127a2a7f76e3a7cfe75cdc4f8f1d67a --- M .codecov.yml M HISTORY.rst M pywikibot/CONTENT.rst D pywikibot/botirc.py M scripts/README.rst D scripts/archive/script_wui.py M tox.ini 7 files changed, 3 insertions(+), 509 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/.codecov.yml b/.codecov.yml index a3af5ff..b454e15 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -16,7 +16,6 @@ ignore: - pywikibot/compat - pywikibot/backports.py - - pywikibot/botirc.py - pywikibot/data/mysql.py - pywikibot/families/__init__.py - scripts/archive diff --git a/HISTORY.rst b/HISTORY.rst index 81868a0..dd4a38b 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -4,6 +4,7 @@ Current release --------------- +* botirc module has been removed (T212632) * Bugfixes and improvements * Localisation updates diff --git a/pywikibot/CONTENT.rst b/pywikibot/CONTENT.rst index b5ccadd..2115533 100644 --- a/pywikibot/CONTENT.rst +++ b/pywikibot/CONTENT.rst @@ -16,9 +16,6 @@ +----------------------------+------------------------------------------------------+ | bot_choice.py | Classes for input_choice | +----------------------------+------------------------------------------------------+ - | botirc.py | Deprecated user-interface related functions for | - | | building irc bot | - +----------------------------+------------------------------------------------------+ | config2.py | Module to define and load pywikibot configuration | +----------------------------+------------------------------------------------------+ | cosmetic_changes.py | Slight modifications to a wiki page's source code | diff --git a/pywikibot/botirc.py b/pywikibot/botirc.py deleted file mode 100644 index c7abf71..0000000 --- a/pywikibot/botirc.py +++ /dev/null @@ -1,137 +0,0 @@ -# -*- coding: utf-8 -*- -""" -WARNING: THIS MODULE EXISTS SOLELY TO PROVIDE BACKWARDS-COMPATIBILITY. - -IT MAY BE REMOVED SOON. - -Deprecated user-interface related functions for building bots. - -@note: the script requires the irc library -""" -# -# (C) Balasyum, 2008 -# (C) Pywikibot team, 2008-2019 -# -# Distributed under the terms of the MIT license. -# -from __future__ import absolute_import, division, unicode_literals - -import re - -import pywikibot -from pywikibot.tools import ModuleDeprecationWrapper - -try: - from irc.bot import SingleServerIRCBot -except ImportError as e: - ircbot_import_error = e - - class SingleServerIRCBot(object): - - """Fake SingleServerIRCBot.""" - - def __init__(*args, **kwargs): - """Report import exception.""" - raise ircbot_import_error - - -_logger = 'botirc' -__all__ = ('IRCBot',) - - -class IRCBot(pywikibot.Bot, SingleServerIRCBot): - - """ - A generic IRC Bot to be subclassed. - - A Bot that displays the ordinal number of the new articles being created - visible on the Recent Changes list. The Bot doesn't make any edits, no - account needed. - """ - - # Bot configuration. - # Only the keys of the dict can be passed as keyword arguments - # The values are the default values - availableOptions = {} # noqa: N815 - - def __init__(self, site, channel, nickname, server, port=6667, **kwargs): - """Initializer.""" - pywikibot.Bot.__init__(self, **kwargs) - SingleServerIRCBot.__init__(self, [(server, port)], nickname, nickname) - self.channel = channel - self.site = site - self.other_ns = re.compile( - '\x0314\\[\\[\x0307(%s)' - % '|'.join(item.custom_name for item in site.namespaces.values() - if item != 0)) - self.api_url = ( - self.site.apipath() - + '?action=query&meta=siteinfo&siprop=statistics&format=xml') - self.api_found = re.compile(r'articles="(.*?)"') - self.re_edit = re.compile( - r'^C14\[\[^C07(?P<page>.+?)^C14\]\]^C4 (?P<flags>.*?)^C10 ^C02' - r'(?P<url>.+?)^C ^C5\*^C ^C03(?P<user>.+?)^C ^C5\*^C \(?^B?' - r'(?P<bytes>[+-]?\d+?)^B?\) ^C10(?P<summary>.*)^C' - .replace('^B', '\002').replace('^C', '\003').replace('^U', '\037')) - - def on_nicknameinuse(self, c, e): - """Provide an alternative nickname.""" - c.nick(c.get_nickname() + '_') - - def on_welcome(self, c, e): - """Join channel.""" - c.join(self.channel) - - def on_privmsg(self, c, e): - """Ignore private message.""" - pass - - def on_pubmsg(self, c, e): - """Respond to public message.""" - match = self.re_edit.match(e.arguments()[0]) - if not match: - return - if not ('N' in match.group('flags')): - return - try: - msg = e.arguments()[0].decode('utf-8') - except UnicodeDecodeError: - return - if self.other_ns.match(msg): - return - name = msg[8:msg.find('14', 9)] - text = pywikibot.comms.http.request(self.site, self.api_url) - entry = self.api_found.findall(text) - page = pywikibot.Page(self.site, name) - try: - page.get() - except pywikibot.NoPage: - return - except pywikibot.IsRedirectPage: - return - pywikibot.output(str((entry[0], name))) - - def on_dccmsg(self, c, e): - """Ignore DCC message.""" - pass - - def on_dccchat(self, c, e): - """Ignore DCC chat.""" - pass - - def do_command(self, e, cmd): - """Ignore command request.""" - pass - - def on_quit(self, e, cmd): - """Ignore quit request.""" - pass - - -wrapper = ModuleDeprecationWrapper(__name__) -wrapper._add_deprecated_attr( - 'IRCBot', - replacement_name=('irc.bot.SingleServerIRCBot from irc library ' - 'or EventStreams'), - since='20190509', - future_warning=True) diff --git a/scripts/README.rst b/scripts/README.rst index a5a09ff..b51e4fb 100644 --- a/scripts/README.rst +++ b/scripts/README.rst @@ -13,7 +13,7 @@ `Manual:Pywikibot <https://www.mediawiki.org/wiki/Manual:Pywikibot>`_ NOTE : Script names with # at start are not yet present in Core rather are - expected to be merged based on reviews and need from Compat version. + expected to be merged based on reviews and need from compat version. The contents of the package --------------------------- @@ -264,8 +264,6 @@ +========================+=========================================================+ | featured.py | A robot to check feature articles. | +------------------------+---------------------------------------------------------+ - | script_wui.py | Run scripts as sub-bot | - +------------------------+---------------------------------------------------------+ +----------------------------------------------------------------------------------+ diff --git a/scripts/archive/script_wui.py b/scripts/archive/script_wui.py deleted file mode 100755 index bc997d6..0000000 --- a/scripts/archive/script_wui.py +++ /dev/null @@ -1,364 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -""" -A script to run Pywikibot shell with Lua support from wiki page. - -@deprecated: This method is not supported anymore. Use - U{PAWS<https://www.mediawiki.org/wiki/Manual:Pywikibot/PAWS>} - instead. - -This script runs in the background and tracks changes in the predefined -wiki page for shell – WikiUserInterface (WUI). When a change -is recorded, the contents of the page is interpreted as Pywikibot shell -commands and executed. - -The predefined wiki page for crontab sets the shell page contents to -a specified revision in the specified interval. - -USAGE - -It needs Lua or LuaJIT installed and also external PyPI packages -crontab, irc and lupa in order to run properly. Some code might -get compiled on-the-fly, so a GNU compiler along with library -header files is needed too. - -You will need to create the following pages on your wiki. - -- User:{username}/script_wui-crontab.css - This page specifies the commands to execute, one command per line. - See [[de:Benutzer:DrTrigon/DrTrigonBot/script_wui-shell.css]] - for example. -- User:{username}/script_wui-shell.css - This page specifies the schedule to execute specific page revision. - The following format can be used: revision, timestamp - See [[de:Benutzer:DrTrigon/DrTrigonBot/script_wui-crontab.css]] - for example. - -Tips for writing code in Wikipedia: - - # patches to keep code running - builtin_raw_input = __builtin__.raw_input - # overwrite 'raw_input' to run bot non-blocking and simulation mode - __builtin__.raw_input = lambda: 'n' - - # backup sys.argv; not recommended, if possible manipulate - # pywikibot.config instead - sys_argv = copy.deepcopy( sys.argv ) - -@todo: Simulationen werden ausgeführt und das Resultat mit eindeutiger - Id (rev-id) auf Ausgabeseite geschrieben, damit kann der Befehl - (durch Angabe der Sim-Id) ausgeführt werden -> crontab (!) - [ shell (rev-id) -> output mit shell rev-id ] - [ shell rev-id (eindeutige job/task-config bzw. script) -> crontab ] -@todo: Bei jeder Botbearbeitung wird der Name des Auftraggebers vermerkt -""" -# -# (C) Dr. Trigon, 2012-2014 -# (C) Pywikibot team, 2013-2019 -# -# Distributed under the terms of the MIT license. -# -from __future__ import absolute_import, division, unicode_literals - -import datetime -import gc -import logging -import re -import sys -import threading -import traceback - -from io import StringIO - -try: - from lupa import LuaRuntime - lua = LuaRuntime(unpack_returned_tuples=True) -except ImportError: - lua = None - -# The 'crontab' PyPI package versions 0.20 and 0.20.1 installs -# a package called 'tests' which conflicts with our test suite. -# The patch to fix this has been released in version 0.20.2. -try: - import crontab -except ImportError: - crontab = None - -import pywikibot -# pywikibot.botirc depends on 'irc' PyPI package -import pywikibot.botirc -from pywikibot.tools.formatter import color_format -from pywikibot.tools import PY2 - -if not PY2: - import _thread as thread -else: - import thread - -try: - import resource -except ImportError: - resource = None - -bot_config = { - 'BotName': '{username}', - - 'ConfCSSshell': 'User:{username}/script_wui-shell.css', - 'ConfCSScrontab': 'User:{username}/script_wui-crontab.css', - 'ConfCSSoutput': 'User:{username}/Simulation', - - 'CRONMaxDelay': 5 * 60.0, # check all ~5 minutes - - # forbidden parameters - # (at the moment none, but consider e.g. '-always' or allow it with - # '-simulate' only!) -} - -__simulate = True -__sys_argv = [] - - -class ScriptWUIBot(pywikibot.botirc.IRCBot): - - """WikiUserInterface bot.""" - - def __init__(self, *arg): - """Initializer.""" - pywikibot.output(color_format( - '{lightgreen}* Initialization of bot{default}')) - - pywikibot.botirc.IRCBot.__init__(self, *arg) - - # init environment with minimal changes (try to do as less as possible) - # - Lua - - if lua: - pywikibot.output('** Redirecting Lua print in order to catch it') - lua.execute('__print = print') - lua.execute('print = python.eval("pywikibot.output")') - # It may be useful in debugging to install the 'print' builtin - # as the 'print' function in lua. To do this: - # lua.execute('print = python.builtins.print') - - # init constants - templ = pywikibot.Page(self.site, bot_config['ConfCSSshell']) - cron = pywikibot.Page(self.site, bot_config['ConfCSScrontab']) - - self.templ = templ.title() - self.cron = cron.title() - self.refs = {self.templ: templ, - self.cron: cron, - } - pywikibot.output('** Pre-loading all relevant page contents') - for item in self.refs: - # First check if page is protected, reject any data if not - parts = self.refs[item].title().lower().rsplit('.') - if len(parts) == 1 or parts[1] not in ['css', 'js']: - raise ValueError('{0} config {1} = {2} is not a secure page; ' - 'it should be a css or js userpage which are ' - 'automatically semi-protected.' - .format(self.__class__.__name__, item, - self.refs[item])) - try: - self.refs[item].get(force=True) # load all page contents - except pywikibot.NoPage: - pywikibot.error("The configuration page {0} doesn't exists" - .format(self.refs[item].title(as_link=True))) - raise - # init background timer - pywikibot.output('** Starting crontab background timer thread') - self.on_timer() - - def on_pubmsg(self, c, e): - match = self.re_edit.match(e.arguments[0]) - if not match: - return - user = match.group('user') - if user == bot_config['BotName']: - return - # test actual page against (template incl.) list - page = match.group('page') - if page in self.refs: - pywikibot.output('RELOAD: ' + page) - self.refs[page].get(force=True) # re-load (refresh) page content - if page == self.templ: - pywikibot.output('SHELL: ' + page) - self.do_check(page) - - def on_timer(self): - self.t = threading.Timer(bot_config['CRONMaxDelay'], self.on_timer) - self.t.start() - - self.do_check_CronJobs() - - def do_check_CronJobs(self): - # check cron/date (changes of self.refs are tracked (and reload) in - # on_pubmsg) - page = self.refs[self.templ] - ctab = self.refs[self.cron].get() - # extract 'rev' and 'timestmp' from 'crontab' page text ... - - # hacky/ugly/cheap - for line in ctab.splitlines(): - (rev, timestmp) = [item.strip() for item in line[1:].split(',')] - - # [min] [hour] [day of month] [month] [day of week] - # (date supported only, thus [min] and [hour] dropped) - if not crontab: - pywikibot.error( - '"crontab" library is needed to run the script properly.') - return None - entry = crontab.CronTab(timestmp) - # find the delay from current minute - # (does not return 0.0 - but next) - now = datetime.datetime.now().replace(second=0, microsecond=0) - delay = entry.next( - now - datetime.timedelta(microseconds=1)) - - if (delay <= bot_config['CRONMaxDelay']): - pywikibot.output('CRONTAB: %s / %s / %s' % - (page, rev, timestmp)) - self.do_check(page.title(), int(rev)) - - def do_check(self, page_title, rev=None, params=None): - # Create two threads as follows - # (simple 'thread' for more sophisticated code use 'threading') - try: - thread.start_new_thread(main_script, (self.refs[page_title], rev, - params)) - except Exception: - # (done according to subster.py from compat and submitted in - # pywikibot/data/api.py) - # TODO: is this error handling here needed at all??!? - - # secure traceback print (from api.py submit) - pywikibot.exception(tb=True) - pywikibot.warning('Unable to start thread') - - wiki_logger(traceback.format_exc(), self.refs[page_title], rev) - - -# Define a function for the thread - -def main_script(page, rev=None, params=NotImplemented): - """Main thread.""" - # http://opensourcehacker.com/2011/02/23/temporarily-capturing-python-logging… - - # safety; default mode is safe (no writing) - pywikibot.config.simulate = True - - pywikibot.output('--- ' * 20) - - buffer = StringIO() - rootLogger = logging.getLogger() - - logHandler = logging.StreamHandler(buffer) - formatter = logging.Formatter( - '%(asctime)s - %(name)s - %(levelname)s - %(message)s') - logHandler.setFormatter(formatter) - rootLogger.addHandler(logHandler) - - sys.stdout = buffer - sys.stderr = buffer - - # all output to logging and stdout/stderr is caught BUT NOT lua output (!) - if rev is None: - code = page.get() # shell; "on demand" - else: - code = page.getOldVersion(rev) # crontab; scheduled - try: - exec(code) - except Exception: - # (done according to subster.py from compat and submitted in - # pywikibot/data/api.py) - - # secure traceback print (from api.py submit) - pywikibot.exception(tb=True) - - sys.stdout = sys.__stdout__ - sys.stderr = sys.__stderr__ - - # Remove our handler - rootLogger.removeHandler(logHandler) - - logHandler.flush() - buffer.flush() - - pywikibot.output('--- ' * 20) - - # safety; restore settings - pywikibot.config.simulate = __simulate - sys.argv = __sys_argv - if resource: - pywikibot.output( - 'environment: garbage; %s / memory; %s / members; %s' % ( - gc.collect(), - resource.getrusage(resource.RUSAGE_SELF).ru_maxrss - * resource.getpagesize(), - len(dir()))) - else: - pywikibot.output( - 'environment: garbage; %s / members; %s' % ( - gc.collect(), len(dir()))) - # 'len(dir())' is equivalent to 'len(inspect.getmembers(__main__))' - - # append result to output page - if rev is None: - wiki_logger(buffer.getvalue(), page, rev) - - -def wiki_logger(buffer, page, rev=None): - """Log to wiki.""" - buffer = re.sub(r'\03\{(.*?)\}(.*?)\03\{default\}', r'\g<2>', buffer) - if rev is None: - rev = page.latestRevision() - link = page.permalink(oldid=rev) - # append to page - outpage = pywikibot.Page(pywikibot.Site(), bot_config['ConfCSSoutput']) - text = outpage.text - outpage.put( - text + ('\n== Simulation vom %s mit [%s code:%s] ==' - '\n<pre>\n%s</pre>\n\n') - % (pywikibot.Timestamp.now().isoformat(' '), link, rev, buffer)) -# summary=pywikibot.translate(self.site.lang, bot_config['msg'])) - - -def main(*args): - """ - Process command line arguments and invoke bot. - - If args is an empty list, sys.argv is used. - - @param args: command line arguments - @type args: str - """ - global __simulate, __sys_argv - - unknown_args = pywikibot.handle_args(args) - if unknown_args: - pywikibot.bot.suggest_help(unknown_parameters=unknown_args) - return False - - __simulate = pywikibot.config.simulate - __sys_argv = sys.argv - - site = pywikibot.Site() - site.login() - chan = '#' + site.code + '.' + site.family.name - - bot_user_name = pywikibot.config.usernames[pywikibot.config.family][ - pywikibot.config.mylang] - for key, value in bot_config.items(): - if hasattr(value, 'format'): - bot_config[key] = value.format(username=bot_user_name) - - bot = ScriptWUIBot(site, chan, site.user() + '_WUI', 'irc.wikimedia.org') - try: - bot.start() - except BaseException: - bot.t.cancel() - raise - return True - - -if __name__ == '__main__': - main() diff --git a/tox.ini b/tox.ini index cf8965c..ceed4e8 100644 --- a/tox.ini +++ b/tox.ini @@ -17,7 +17,7 @@ flake8-{py27,py3,pypy} [params] -doctest_skip = --ignore-files=(gui\.py|botirc\.py|eventstreams\.py) +doctest_skip = --ignore-files=(gui\.py|eventstreams\.py) [testenv] setenv = -- To view, visit https://gerrit.wikimedia.org/r/563664 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: Ib6cd1e5b7127a2a7f76e3a7cfe75cdc4f8f1d67a Gerrit-Change-Number: 563664 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

4 years, 4 months

[Gerrit] pywikibot/core[master]: [doc] Prepare next release

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/563660 ) Change subject: [doc] Prepare next release ...................................................................... [doc] Prepare next release Change-Id: Idbb33ce2db06e3aedff548f664007f048f09644f --- M HISTORY.rst M docs/conf.py 2 files changed, 7 insertions(+), 1 deletion(-) Approvals: Dvorapa: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/HISTORY.rst b/HISTORY.rst index 2b34323..81868a0 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -4,6 +4,12 @@ Current release --------------- +* Bugfixes and improvements +* Localisation updates + +3.0.20200111 +------------ + * Fix broken get_version() in setup.py (T198374) * Rewrite site.log_page/site.unlock_page implementation * Require requests 2.20.1 (T241934) diff --git a/docs/conf.py b/docs/conf.py index 57f1351..1a1cb04 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -71,7 +71,7 @@ # The short X.Y version. version = '3.0' # The full version, including alpha/beta/rc tags. -release = '3.0.20190722' +release = '3.0.20200111' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. -- To view, visit https://gerrit.wikimedia.org/r/563660 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: Idbb33ce2db06e3aedff548f664007f048f09644f Gerrit-Change-Number: 563660 Gerrit-PatchSet: 1 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)

4 years, 4 months

[Gerrit] pywikibot/core[master]: [doc] Udate HISTORY.rst

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/563657 ) Change subject: [doc] Udate HISTORY.rst ...................................................................... [doc] Udate HISTORY.rst Change-Id: I5e74180537bf0a0e0ceafe2e1880ad0ec9712503 --- M HISTORY.rst 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/HISTORY.rst b/HISTORY.rst index 0e50b88..2b34323 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -4,6 +4,7 @@ Current release --------------- +* Fix broken get_version() in setup.py (T198374) * Rewrite site.log_page/site.unlock_page implementation * Require requests 2.20.1 (T241934) * Make bot.suggest_help a function -- To view, visit https://gerrit.wikimedia.org/r/563657 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: I5e74180537bf0a0e0ceafe2e1880ad0ec9712503 Gerrit-Change-Number: 563657 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

4 years, 4 months

[Gerrit] pywikibot/core[master]: [bugfix] Fix broken get_version() in setup.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/563431 ) Change subject: [bugfix] Fix broken get_version() in setup.py ...................................................................... [bugfix] Fix broken get_version() in setup.py `python setup.py sdist` does not include .git folder, which get_version() from setup.py relies on. Therefore `python setup.py install` from sdist package (also called when running `pip install pywikibot`) identifies itself with a fallback version 3.0.dev0. This breaks pip when running tasks like `pip freeze` or `pip install --upgrade`. This patch adds a possibility to get version from pkg_resources module of setuptools in such case. Bug: T198374 Change-Id: Id833db9cf38158afc96d4b5e6e4822c14b6bb485 --- M setup.py 1 file changed, 9 insertions(+), 4 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/setup.py b/setup.py index 56bf1c2..69e12d7 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Installer script for Pywikibot 3.0 framework.""" # -# (C) Pywikibot team, 2009-2019 +# (C) Pywikibot team, 2009-2020 # # Distributed under the terms of the MIT license. # @@ -164,7 +164,7 @@ test_deps += ['six;python_version>="3"'] -def get_version(): +def get_version(name): """Get a valid pywikibot module version string.""" version = '3.0' try: @@ -177,7 +177,12 @@ version += '.dev0' except Exception as e: print(e) - version += '.dev0' + from pkg_resources import get_distribution, DistributionNotFound + try: + version = get_distribution(name).version + except DistributionNotFound as e: + print(e) + version += '.dev0' return version @@ -205,7 +210,7 @@ name = 'pywikibot' setup( name=name, - version=get_version(), + version=get_version(name), description='Python MediaWiki Bot Framework', long_description=read_desc('README.rst'), keywords=['API', 'bot', 'framework', 'mediawiki', 'pwb', 'python', -- To view, visit https://gerrit.wikimedia.org/r/563431 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: Id833db9cf38158afc96d4b5e6e4822c14b6bb485 Gerrit-Change-Number: 563431 Gerrit-PatchSet: 6 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

4 years, 4 months

[Gerrit] pywikibot/core[master]: [doc] Update copyright string to 2020

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/563386 ) Change subject: [doc] Update copyright string to 2020 ...................................................................... [doc] Update copyright string to 2020 Change-Id: Ibe23d3992c052191133e733669ceab6266943694 --- M docs/conf.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/conf.py b/docs/conf.py index 0772222..57f1351 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Configuration file for Sphinx.""" # -# (C) Pywikibot team, 2014-2019 +# (C) Pywikibot team, 2014-2020 # # Distributed under the terms of the MIT license. # @@ -62,7 +62,7 @@ # General information about the project. project = 'Pywikibot' -copyright = '2003-2019, Pywikibot team' +copyright = '2003-2020, Pywikibot team' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the -- To view, visit https://gerrit.wikimedia.org/r/563386 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: Ibe23d3992c052191133e733669ceab6266943694 Gerrit-Change-Number: 563386 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: jenkins-bot (75)

4 years, 4 months

[Gerrit] pywikibot/core[master]: [doc] Remove pwb version from CONTENT.rst

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/563383 ) Change subject: [doc] Remove pwb version from CONTENT.rst ...................................................................... [doc] Remove pwb version from CONTENT.rst Probably we have other release numbers in future. This prevents to change this doc with every version. Change-Id: I0f01849fd635302b5f5a08f9737d8aed3cc71b65 --- M CONTENT.rst 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/CONTENT.rst b/CONTENT.rst index c3ef855..3bc22d8 100644 --- a/CONTENT.rst +++ b/CONTENT.rst @@ -33,7 +33,7 @@ +---------------------------+------------------------------------------------------+ | requirements.txt | General PIP requirements file | +---------------------------+------------------------------------------------------+ - | setup.py | Installer script for Pywikibot 3.0 framework | + | setup.py | Installer script for Pywikibot framework | +---------------------------+------------------------------------------------------+ | tox.ini | Tests config file | +---------------------------+------------------------------------------------------+ -- To view, visit https://gerrit.wikimedia.org/r/563383 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: I0f01849fd635302b5f5a08f9737d8aed3cc71b65 Gerrit-Change-Number: 563383 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: jenkins-bot (75)

4 years, 4 months

[Gerrit] pywikibot/core[master]: [doc] Note that pywikibot/compat is deprecated for 5 years

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/563223 ) Change subject: [doc] Note that pywikibot/compat is deprecated for 5 years ...................................................................... [doc] Note that pywikibot/compat is deprecated for 5 years - catlib is deprecated since December 2014 - query is deprecated since June 2012 - userlib is deprecated since December 2014 This should be noted in the DIRECTORIES.rst Change-Id: Iaa484b2df387d2b359b756777f6cb3bf81ec5c19 --- M pywikibot/DIRECTORIES.rst 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/DIRECTORIES.rst b/pywikibot/DIRECTORIES.rst index 0e5a733..d12b54d 100644 --- a/pywikibot/DIRECTORIES.rst +++ b/pywikibot/DIRECTORIES.rst @@ -8,7 +8,7 @@ +---------------------------+------------------------------------------------------+ | pywikibot/comms | Communication layer | +---------------------------+------------------------------------------------------+ - | pywikibot/compat | Package to provide compatibility with compat scripts | + | pywikibot/compat | Deprecated package for use with compat scripts | +---------------------------+------------------------------------------------------+ | pywikibot/data | Module with several layers for data access to wiki | +---------------------------+------------------------------------------------------+ -- To view, visit https://gerrit.wikimedia.org/r/563223 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: Iaa484b2df387d2b359b756777f6cb3bf81ec5c19 Gerrit-Change-Number: 563223 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: jenkins-bot (75)

4 years, 4 months

[Gerrit] pywikibot/core[master]: [doc] Update HISTORY.rst

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/562529 ) Change subject: [doc] Update HISTORY.rst ...................................................................... [doc] Update HISTORY.rst Change-Id: I98667b2ea13dcf38f3c69785f2d6d2716a9f8eef --- M HISTORY.rst 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/HISTORY.rst b/HISTORY.rst index 8c82a40..0e50b88 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -4,6 +4,13 @@ Current release --------------- +* Rewrite site.log_page/site.unlock_page implementation +* Require requests 2.20.1 (T241934) +* Make bot.suggest_help a function +* Fix gui settings for Python 3.7.4+ (T241216) +* Better api error message handling (T235500) +* Ensure that required props exists as Page attribute (T237497) +* Refactor data loading for WikibaseEntities (T233406) * replaceCategoryInPlace: Allow LRM and RLM at the end of the old_cat title (T240084) * Support for Python 3.4 will be dropped (T239542) * Derive LoginStatus from IntEnum (T213287, T239533) -- To view, visit https://gerrit.wikimedia.org/r/562529 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: I98667b2ea13dcf38f3c69785f2d6d2716a9f8eef Gerrit-Change-Number: 562529 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: jenkins-bot (75)

4 years, 4 months

[Gerrit] pywikibot/core[master]: [IMPR] Rewrite log_page/unlock_page implementation

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/541089 ) Change subject: [IMPR] Rewrite log_page/unlock_page implementation ...................................................................... [IMPR] Rewrite log_page/unlock_page implementation - Use threading.Condition context manager instead of try/finally - move test_lock_page from TestSiteGenerators to TestLockingPage class because this test is not related to a generator Change-Id: I1ff2c39d43b78d7e71d27720e8ec83e3a48a6925 --- M pywikibot/site.py M tests/site_tests.py 2 files changed, 24 insertions(+), 43 deletions(-) Approvals: Zhuyifei1999: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index fac1d66..f8950f6 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -6,7 +6,7 @@ groups of wikis on the same topic in different languages. """ # -# (C) Pywikibot team, 2008-2019 +# (C) Pywikibot team, 2008-2020 # # Distributed under the terms of the MIT license. # @@ -780,7 +780,7 @@ self.code in self.family.use_hard_category_redirects) # following are for use with lock_page and unlock_page methods - self._pagemutex = threading.Lock() + self._pagemutex = threading.Condition() self._locked_pages = set() @deprecated(since='20141225') @@ -880,7 +880,7 @@ def __setstate__(self, attrs): """Restore things removed in __getstate__.""" self.__dict__.update(attrs) - self._pagemutex = threading.Lock() + self._pagemutex = threading.Condition() def user(self): """Return the currently-logged in bot username, or None.""" @@ -1065,29 +1065,12 @@ """ title = page.title(with_section=False) - - self._pagemutex.acquire() - try: + with self._pagemutex: while title in self._locked_pages: if not block: raise PageInUse(title) - - # The mutex must be released so that page can be unlocked - self._pagemutex.release() - time.sleep(.25) - self._pagemutex.acquire() - + self._pagemutex.wait() self._locked_pages.add(title) - finally: - # time.sleep may raise an exception from signal handler (eg: - # KeyboardInterrupt) while the lock is released, and there is no - # reason to acquire the lock again given that our caller will - # receive the exception. The state of the lock is therefore - # undefined at the point of this finally block. - try: - self._pagemutex.release() - except RuntimeError: - pass def unlock_page(self, page): """ @@ -1097,11 +1080,9 @@ @type page: pywikibot.Page """ - self._pagemutex.acquire() - try: + with self._pagemutex: self._locked_pages.discard(page.title(with_section=False)) - finally: - self._pagemutex.release() + self._pagemutex.notify_all() def disambcategory(self): """Return Category in which disambig pages are listed.""" diff --git a/tests/site_tests.py b/tests/site_tests.py index d700c51..afa9a02 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Tests for the site module.""" # -# (C) Pywikibot team, 2008-2019 +# (C) Pywikibot team, 2008-2020 # # Distributed under the terms of the MIT license. # @@ -974,19 +974,6 @@ self.assertIsInstance(link, pywikibot.Page) self.assertIn(link.namespace(), (2, 3)) - def test_lock_page(self): - """Test the site.lock_page() and site.unlock_page() method.""" - site = self.get_site() - p1 = pywikibot.Page(site, 'Foo') - - site.lock_page(page=p1, block=True) - self.assertRaises(pywikibot.site.PageInUse, site.lock_page, page=p1, - block=False) - site.unlock_page(page=p1) - # verify it's unlocked - site.lock_page(page=p1, block=False) - site.unlock_page(page=p1) - def test_protectedpages_create(self): """Test that protectedpages returns protected page titles.""" if self.site.mw_version < '1.15': @@ -1089,7 +1076,7 @@ self.assertRaises(AssertionError, func, 'm', 2, 1, True, True) -class TestThreadsLockingPage(DefaultSiteTestCase): +class TestLockingPage(DefaultSiteTestCase): """Test cases for lock/unlock a page within threads.""" cached = True @@ -1102,8 +1089,8 @@ time.sleep(wait) page.site.unlock_page(page=page) - def test_lock_page(self): - """Test the site.lock_page() and site.unlock_page() method.""" + def test_threads_locking_page(self): + """Test lock_page and unlock_page methods for multiple threads.""" # Start few threads threads = [] for i in range(5): @@ -1121,6 +1108,19 @@ self.assertFalse(thread.is_alive(), 'test page is still locked') + def test_lock_page(self): + """Test the site.lock_page() and site.unlock_page() method.""" + site = self.get_site() + p1 = pywikibot.Page(site, 'Foo') + + site.lock_page(page=p1, block=True) + self.assertRaises(pywikibot.site.PageInUse, site.lock_page, page=p1, + block=False) + site.unlock_page(page=p1) + # verify it's unlocked + site.lock_page(page=p1, block=False) + site.unlock_page(page=p1) + class TestSiteGeneratorsUsers(DefaultSiteTestCase): """Test cases for Site methods with users.""" -- To view, visit https://gerrit.wikimedia.org/r/541089 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: I1ff2c39d43b78d7e71d27720e8ec83e3a48a6925 Gerrit-Change-Number: 541089 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Count Count <countvoncount123456(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Mineo <themineo(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

4 years, 4 months

← 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 January 2020