Pywikibot-commits January 2022

pywikibot-commits@lists.wikimedia.org

1 participants
115 discussions

[Gerrit] ...core[master]: [doc] Update type hints documentation in pagegenerators.py
by jenkins-bot (Code Review) 05 Jan '22

05 Jan '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/751706 ) Change subject: [doc] Update type hints documentation in pagegenerators.py ...................................................................... [doc] Update type hints documentation in pagegenerators.py Change-Id: Iecdeeecd12460aeca330d4f852b4f19a4fd92f5c --- M pywikibot/pagegenerators.py 1 file changed, 1 insertion(+), 9 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 8178e16..642c3e5 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -13,7 +13,7 @@ &params; """ # -# (C) Pywikibot team, 2008-2021 +# (C) Pywikibot team, 2008-2022 # # Distributed under the terms of the MIT license. # @@ -442,16 +442,8 @@ ITEM_CLAIM_FILTER_CLASS = Type['ItemClaimFilter'] REGEX_FILTER_CLASS = Type['RegexFilter'] -# The following should be... -# PATTERN_STR_OR_SEQ_TYPE = Union[str, Pattern[str], Sequence[str], Sequence[Pattern[str]]] -# -# Doing so fails under Python 3.5.0 with... -# -# TypeError: cannot create weak reference to '_TypeAlias' object - -# PATTERN_STR_OR_SEQ_TYPE = Any # if a bot uses GeneratorFactory, the module should include the line # docuReplacements = {'&params;': pywikibot.pagegenerators.parameterHelp} -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/751706 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Iecdeeecd12460aeca330d4f852b4f19a4fd92f5c Gerrit-Change-Number: 751706 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [Python3] Update super call
by jenkins-bot (Code Review) 04 Jan '22

04 Jan '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/751154 ) Change subject: [Python3] Update super call ...................................................................... [Python3] Update super call Change-Id: I78f28b02177e3446c0aac73fca5fb455167c2008 --- M scripts/commons_information.py M tests/api_tests.py M tests/interwiki_graph_tests.py M tests/l10n_tests.py 4 files changed, 8 insertions(+), 8 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/commons_information.py b/scripts/commons_information.py index 616c704..d9cdda4 100755 --- a/scripts/commons_information.py +++ b/scripts/commons_information.py @@ -1,7 +1,7 @@ #!/usr/bin/python """Insert a language template into the description field.""" # -# (C) Pywikibot team, 2015-2021 +# (C) Pywikibot team, 2015-2022 # # Distributed under the terms of the MIT license. # @@ -38,7 +38,7 @@ def __init__(self, **kwargs): """Initialzer.""" - super(InformationBot, self).__init__(**kwargs) + super().__init__(**kwargs) lang_tmp_cat = pywikibot.Category(self.site, self.lang_tmp_cat) self.lang_tmps = lang_tmp_cat.articles(namespaces=[10]) diff --git a/tests/api_tests.py b/tests/api_tests.py index b703b86..13a81d5 100644 --- a/tests/api_tests.py +++ b/tests/api_tests.py @@ -1,6 +1,6 @@ """API test module.""" # -# (C) Pywikibot team, 2007-2021 +# (C) Pywikibot team, 2007-2022 # # Distributed under the terms of the MIT license. # @@ -842,7 +842,7 @@ @classmethod def setUpClass(cls): """Set up steward Family.""" - super(TestLazyLoginBase, cls).setUpClass() + super().setUpClass() fam = pywikibot.family.AutoFamily( 'steward', 'https://steward.wikimedia.org/w/api.php') cls.site = pywikibot.site.APISite('steward', fam) diff --git a/tests/interwiki_graph_tests.py b/tests/interwiki_graph_tests.py index 406c20d..19321a4 100644 --- a/tests/interwiki_graph_tests.py +++ b/tests/interwiki_graph_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/python """Test Interwiki Graph functionality.""" # -# (C) Pywikibot team, 2015-2021 +# (C) Pywikibot team, 2015-2022 # # Distributed under the terms of the MIT license. # @@ -37,7 +37,7 @@ @classmethod def setUpClass(cls): """Setup test class.""" - super(TestWiktionaryGraph, cls).setUpClass() + super().setUpClass() cls.pages = { 'en': DryPage(cls.enwikt, 'origin'), diff --git a/tests/l10n_tests.py b/tests/l10n_tests.py index 04388de..a7435b5 100644 --- a/tests/l10n_tests.py +++ b/tests/l10n_tests.py @@ -1,6 +1,6 @@ """Test valid templates.""" # -# (C) Pywikibot team, 2015-2021 +# (C) Pywikibot team, 2015-2022 # # Distributed under the terms of the MIT license. # @@ -93,7 +93,7 @@ @classmethod def setUpClass(cls): """Skip test gracefully if i18n package is missing.""" - super(TestValidTemplate, cls).setUpClass() + super().setUpClass() if not i18n.messages_available(): raise unittest.SkipTest("i18n messages package '{}' not available." .format(i18n._messages_package_name)) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/751154 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I78f28b02177e3446c0aac73fca5fb455167c2008 Gerrit-Change-Number: 751154 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] Improve i18n module
by jenkins-bot (Code Review) 04 Jan '22

04 Jan '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/750712 ) Change subject: [IMPR] Improve i18n module ...................................................................... [IMPR] Improve i18n module - add i18n.bundles() function to get all bundle names - add i18n.known_languages() functions to get all languages with translations - add i18n._get_bundle function to get the dict from json text for a language bundle - add Generator to backports.py - add bundle tests Change-Id: I9cb13bb215fadcb340b263748c3c21c115a95e9c --- M pywikibot/i18n.py M tests/l10n_tests.py 2 files changed, 67 insertions(+), 9 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index 2dffea9..6dcdda5 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -26,6 +26,7 @@ from collections import abc, defaultdict from contextlib import suppress +from pathlib import Path from textwrap import fill from typing import Optional, Union @@ -35,6 +36,7 @@ from pywikibot.backports import ( cache, Dict, + Generator, Iterable, Iterator, List, @@ -412,6 +414,24 @@ @cache +def _get_bundle(lang: str, dirname: str) -> Dict[str, str]: + """Return json data of certain bundle if exists. + + For internal use, don't use it directly. + + .. versionadded:: 7.0 + """ + filename = '{}/{}.json'.format(dirname, lang) + try: + data = pkgutil.get_data(_messages_package_name, filename) + assert data is not None + trans_text = data.decode('utf-8') + except OSError: # file open can cause several exceptions + return {} + + return json.loads(trans_text) + + def _get_translation(lang: str, twtitle: str) -> Optional[str]: """ Return message of certain twtitle if exists. @@ -419,15 +439,7 @@ For internal use, don't use it directly. """ message_bundle = twtitle.split('-')[0] - filename = '{}/{}.json'.format(message_bundle, lang) - try: - data = pkgutil.get_data(_messages_package_name, filename) - assert data is not None - trans_text = data.decode('utf-8') - except OSError: # file open can cause several exceptions - return None - - transdict = json.loads(trans_text) + transdict = _get_bundle(lang, message_bundle) return transdict.get(twtitle) @@ -801,6 +813,34 @@ if lang != 'qqq' and _get_translation(lang, twtitle)] +def bundles(stem: bool = False) -> Generator[Union[Path, str], None, None]: + """A generator which yields message bundle names or its path objects. + + :param stem: yield the Path.stem if True and the Path object otherwise + + .. versionadded:: 7.0 + """ + for dirpath in Path(*_messages_package_name.split('.')).iterdir(): + if dirpath.is_dir() and not dirpath.match('*__'): # ignore cache + if stem: + yield dirpath.stem + else: + yield dirpath + + +def known_languages() -> List[str]: + """All languages we have localizations for. + + .. versionadded:: 7.0 + """ + langs = set() + for dirpath in bundles(): + for fname in dirpath.iterdir(): + if fname.suffix == '.json': + langs.add(fname.stem) + return sorted(langs) + + def input(twtitle: str, parameters: Optional[Mapping[str, int]] = None, password: bool = False, diff --git a/tests/l10n_tests.py b/tests/l10n_tests.py index 04388de..61db833 100644 --- a/tests/l10n_tests.py +++ b/tests/l10n_tests.py @@ -114,6 +114,24 @@ self.assertIsNotEmpty(keys) self.assertIn('en', keys) + def test_package_bundles(self): + """Test whether package bundles has valid entries.""" + langs = i18n.known_languages() + self.assertIsInstance(langs, list) + self.assertIsNotEmpty(langs) + for dirname in i18n.bundles(stem=True): + for lang in langs: + with self.subTest(bundle=dirname, lang=lang): + bundle = i18n._get_bundle(lang, dirname) + if lang in ('en', 'qqq'): + self.assertIsNotEmpty(bundle) + for key in bundle.keys(): + if key == '@metadata': + continue + self.assertTrue(key.startswith(dirname), + '{!r} does not start with {!r}' + .format(key, dirname)) + if __name__ == '__main__': # pragma: no cover with suppress(SystemExit): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/750712 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I9cb13bb215fadcb340b263748c3c21c115a95e9c Gerrit-Change-Number: 750712 Gerrit-PatchSet: 6 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Legoktm <legoktm(a)debian.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] raise urllib3 NewConnectionError immediately
by jenkins-bot (Code Review) 04 Jan '22

04 Jan '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/748375 ) Change subject: [IMPR] raise urllib3 NewConnectionError immediately ...................................................................... [IMPR] raise urllib3 NewConnectionError immediately - urllib3 NewConnectionError with Errno -2 and 11001 never retries to establish the connection. - raise ConnectionError instead of requests.ConnectionError in that case Bug: T297994 Change-Id: I43abe3417435489e2d737bbe3aec409a76f12a64 --- M pywikibot/comms/http.py M pywikibot/data/api.py M tests/http_tests.py 3 files changed, 9 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index b248ff7..08099a0 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -291,6 +291,12 @@ if SSL_CERT_VERIFY_FAILED_MSG in str(response): raise FatalServerError(str(response)) + if isinstance(response, requests.ConnectionError): + msg = str(response) + if 'NewConnectionError' in msg \ + and re.search(r'\[Errno (-2|11001)\]', msg): + raise ConnectionError(response) + if isinstance(response, Exception): with suppress(Exception): # request exception may contain response and request attribute diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index acde07e..9e6f8e3 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -1496,7 +1496,7 @@ pywikibot.warning('Caught HTTP 414 error, although not ' 'using GET.') raise - except FatalServerError: + except (ConnectionError, FatalServerError): # This error is not going to be fixed by just waiting pywikibot.error(traceback.format_exc()) raise diff --git a/tests/http_tests.py b/tests/http_tests.py index 246e225..36f07f9 100644 --- a/tests/http_tests.py +++ b/tests/http_tests.py @@ -1,6 +1,6 @@ """Tests for http module.""" # -# (C) Pywikibot team, 2014-2021 +# (C) Pywikibot team, 2014-2022 # # Distributed under the terms of the MIT license. # @@ -143,7 +143,7 @@ def test_server_not_found(self): """Test server not found exception.""" with self.assertRaisesRegex( - requests.exceptions.ConnectionError, + ConnectionError, 'Max retries exceeded with url: /w/api.php'): http.fetch('http://ru-sib.wikipedia.org/w/api.php', default_error_handling=True) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/748375 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I43abe3417435489e2d737bbe3aec409a76f12a64 Gerrit-Change-Number: 748375 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: WolfgangFahl <wf(a)bitplan.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [i18n] Make pywikibot messages available with site package.
by jenkins-bot (Code Review) 04 Jan '22

04 Jan '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/750457 ) Change subject: [i18n] Make pywikibot messages available with site package. ...................................................................... [i18n] Make pywikibot messages available with site package. There are several predefined messages with Pywikibot. Use their translations with Pywikibot's site-package too. - i18n pywikibot messages will be copied to pywikibot/scripts folder when uploading to pypi to ensure this message are available - set include_package_data to True in setup.py to ensure the external i18n files are installed with the package - use MANIFEST.in to copy the i18n files to the distribution - remove fallbacks in bot.py, page/__init__.py and pagegenerators.py - find the package directory with i18n module - add Natural Languages to classifiers - update documentation Bug: T275981 Bug: T57109 Change-Id: I7b36c3d76516e0252b43557b02c70d87954d03d0 --- M CONTENT.rst A MANIFEST.in M docs/api_ref/pywikibot.config.rst M docs/installation.rst M pywikibot/CONTENT.rst M pywikibot/bot.py M pywikibot/i18n.py M pywikibot/page/__init__.py M pywikibot/pagegenerators.py M pywikibot/scripts/__init__.py M setup.py 11 files changed, 105 insertions(+), 17 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/CONTENT.rst b/CONTENT.rst index 9e02e4b..e43f649 100644 --- a/CONTENT.rst +++ b/CONTENT.rst @@ -20,6 +20,8 @@ +---------------------------+-----------------------------------------------------------+ | LICENSE | Reference to the MIT license | +---------------------------+-----------------------------------------------------------+ + | MANIFEST.in | Setup file for package data | + +---------------------------+-----------------------------------------------------------+ | pwb.py | Code entry wrapper script (directory mode only) | +---------------------------+-----------------------------------------------------------+ | README.rst | Short info string used by Pywikibot Nightlies | diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..0952697 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1 @@ +graft pywikibot/scripts/i18n/pywikibot \ No newline at end of file diff --git a/docs/api_ref/pywikibot.config.rst b/docs/api_ref/pywikibot.config.rst index c31852a..f859921 100644 --- a/docs/api_ref/pywikibot.config.rst +++ b/docs/api_ref/pywikibot.config.rst @@ -18,6 +18,9 @@ :start-at: # ############# ACCOUNT SETTINGS :end-before: # ############# + +.. _user-interface-settings: + User Interface Settings +++++++++++++++++++++++ @@ -39,6 +42,7 @@ :start-at: # ############# LOGFILE SETTINGS :end-before: # ############# + .. _external-script-path-settings: External Script Path Settings diff --git a/docs/installation.rst b/docs/installation.rst index b943842..3bff88f 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -17,5 +17,26 @@ the site-package. For more settings use :mod:`generate_user_files` script or refer :mod:`pywikibot.config`. -.. note:: - Please also see the documentation at :manpage:`Installation` +.. seealso:: :manpage:`Installation` Manual + + +Internationalisation (i18n) +--------------------------- + +Some of the framework input interaction is translated. The user interface +language to be used can be set as follows: + +#. set the `userinterface_lang` in your :ref:`user-config.py<user-interface-settings>` to your preferred language +#. set environment variable `PYWIKIBOT_USERINTERFACE_LANG` to your preferred language +#. default is obtained from `locale.getdefaultlocale` +#. fallback is `'en'` for english if all other options fails + +.. note:: The preferred language code must follow ISO 639. +.. versionadded:: 7.0 + Added to site-package distribution +.. seealso:: + * :manpage:`i18n` Manual + * `MediaWiki Language Codes <https://www.mediawiki.org/wiki/Manual:Language#Language_code>`_ + * :ref:`User Interface Settings<user-interface-settings>` + * :py:mod:`pywikibot.i18n` + diff --git a/pywikibot/CONTENT.rst b/pywikibot/CONTENT.rst index 5342f9c..a9eed53 100644 --- a/pywikibot/CONTENT.rst +++ b/pywikibot/CONTENT.rst @@ -127,6 +127,8 @@ | version.py | Outputs Pywikibot's revision number, Python's | | | version and OS used. | +----------------------------+------------------------------------------------------+ + | i18n (folder) | Contains i18n translations (site-package only) | + +----------------------------+------------------------------------------------------+ +----------------------------+------------------------------------------------------+ diff --git a/pywikibot/bot.py b/pywikibot/bot.py index d1e3699..aed6458 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -1104,8 +1104,7 @@ def open_webbrowser(page: 'pywikibot.page.BasePage') -> None: """Open the web browser displaying the page and wait for input.""" webbrowser.open(page.full_url()) - i18n.input('pywikibot-enter-finished-browser', - fallback_prompt='Press Enter when finished in browser.') + i18n.input('pywikibot-enter-finished-browser') class _OptionDict(dict): diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index 2dffea9..a4b738f 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -826,3 +826,7 @@ 'Unable to load messages package {} for bundle {}' .format(_messages_package_name, twtitle)) return pywikibot.input(prompt, password) + + +if not messages_available(): + set_messages_package('pywikibot.scripts.i18n') diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index 0552e50..3d82922 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -1322,8 +1322,7 @@ if self.exists(): # ensure always get the page text and not to change it. del self.text - summary = i18n.twtranslate(self.site, 'pywikibot-touch', - fallback_prompt='Pywikibot touch edit') + summary = i18n.twtranslate(self.site, 'pywikibot-touch') self.save(summary=summary, watch='nochange', minor=False, botflag=botflag, force=True, asynchronous=False, callback=callback, diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 54653cc..8178e16 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -685,9 +685,7 @@ :param category: category name with start parameter """ if not category: - category = i18n.input( - 'pywikibot-enter-category-name', - fallback_prompt='Please enter the category name:') + category = i18n.input('pywikibot-enter-category-name') category = category.replace('#', '|') startfrom = None # type: Optional[str] @@ -800,10 +798,7 @@ def _handle_filelinks(self, value: str) -> HANDLER_RETURN_TYPE: """Handle `-filelinks` argument.""" if not value: - value = i18n.input( - 'pywikibot-enter-file-links-processing', - fallback_prompt='Links to which file page should be ' - 'processed?') + value = i18n.input('pywikibot-enter-file-links-processing') if not value.startswith(self.site.namespace(6) + ':'): value = 'Image:' + value file_page = pywikibot.FilePage(self.site, value) @@ -930,9 +925,7 @@ def _handle_interwiki(self, value: str) -> HANDLER_RETURN_TYPE: """Handle `-interwiki` argument.""" if not value: - value = i18n.input( - 'pywikibot-enter-page-processing', - fallback_prompt='Which page should be processed?') + value = i18n.input('pywikibot-enter-page-processing') page = pywikibot.Page(pywikibot.Link(value, self.site)) return InterwikiPageGenerator(page) diff --git a/pywikibot/scripts/__init__.py b/pywikibot/scripts/__init__.py index 4836696..03090c6 100644 --- a/pywikibot/scripts/__init__.py +++ b/pywikibot/scripts/__init__.py @@ -1,6 +1,7 @@ """Folder which holds framework scripts. -When uploading pywikibot to pypi the pwb.py (wrapper script) is copied here. +When uploading pywikibot to pypi the pwb.py (wrapper script) and +pywikibot i18n package are copied here. .. versionadded:: 7.0 """ diff --git a/setup.py b/setup.py index e9164ee..840534a 100644 --- a/setup.py +++ b/setup.py @@ -6,10 +6,13 @@ - replace the developmental version string in ``pywikibot.__metadata__.py`` by the corresponing final release +- copy pwb.py to pywikibot/scripts folder +- copy scripts/i18n/pywikibot folder to pywikibot/scripts/i18n/pywikibot - create the package with:: python setup.py sdist +- remove copied files - push the change to Gerrit and merge it to the repository - upload the package to PyPy by:: @@ -256,6 +259,7 @@ download_url=metadata.__download_url__, test_suite='tests.collector', tests_require=test_deps, + include_package_data=True, entry_points={ 'console_scripts': [ 'pwb = pywikibot.scripts.pwb:run', @@ -266,7 +270,65 @@ 'Environment :: Console', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', + 'Natural Language :: Afrikaans', + 'Natural Language :: Arabic', + 'Natural Language :: Basque', + 'Natural Language :: Bengali', + 'Natural Language :: Bosnian', + 'Natural Language :: Bulgarian', + 'Natural Language :: Cantonese', + 'Natural Language :: Catalan', + 'Natural Language :: Chinese (Simplified)', + 'Natural Language :: Chinese (Traditional)', + 'Natural Language :: Croatian', + 'Natural Language :: Czech', + 'Natural Language :: Danish', + 'Natural Language :: Dutch', 'Natural Language :: English', + 'Natural Language :: Esperanto', + 'Natural Language :: Finnish', + 'Natural Language :: French', + 'Natural Language :: Galician', + 'Natural Language :: German', + 'Natural Language :: Greek', + 'Natural Language :: Hebrew', + 'Natural Language :: Hindi', + 'Natural Language :: Hungarian', + 'Natural Language :: Icelandic', + 'Natural Language :: Indonesian', + 'Natural Language :: Irish', + 'Natural Language :: Italian', + 'Natural Language :: Japanese', + 'Natural Language :: Javanese', + 'Natural Language :: Korean', + 'Natural Language :: Latin', + 'Natural Language :: Latvian', + 'Natural Language :: Lithuanian', + 'Natural Language :: Macedonian', + 'Natural Language :: Malay', + 'Natural Language :: Marathi', + 'Natural Language :: Nepali', + 'Natural Language :: Norwegian', + 'Natural Language :: Panjabi', + 'Natural Language :: Persian', + 'Natural Language :: Polish', + 'Natural Language :: Portuguese', + 'Natural Language :: Portuguese (Brazilian)', + 'Natural Language :: Romanian', + 'Natural Language :: Russian', + 'Natural Language :: Serbian', + 'Natural Language :: Slovak', + 'Natural Language :: Slovenian', + 'Natural Language :: Spanish', + 'Natural Language :: Swedish', + 'Natural Language :: Tamil', + 'Natural Language :: Telugu', + 'Natural Language :: Thai', + 'Natural Language :: Tibetan', + 'Natural Language :: Turkish', + 'Natural Language :: Ukrainian', + 'Natural Language :: Urdu', + 'Natural Language :: Vietnamese', 'Operating System :: OS Independent', 'Programming Language :: Python', 'Programming Language :: Python :: 3', -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/750457 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I7b36c3d76516e0252b43557b02c70d87954d03d0 Gerrit-Change-Number: 750457 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Euglou <eugbot31(a)gmail.com> Gerrit-Reviewer: Lokal Profil <andre.costa(a)wikimedia.se> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...i18n[master]: Localisation updates from https://translatewiki.net.
by jenkins-bot (Code Review) 03 Jan '22

03 Jan '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/751106 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: Ie84a61d8dcfa6449922e54dccaa7f0c6925e7b4c --- M pywikibot/br.json A thirdparty/sms.json 2 files changed, 10 insertions(+), 1 deletion(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/br.json b/pywikibot/br.json index f0791bc..75c5516 100644 --- a/pywikibot/br.json +++ b/pywikibot/br.json @@ -1,10 +1,11 @@ { "@metadata": { "authors": [ + "Fulup", "Gwenn-Ael" ] }, - "pywikibot-cosmetic-changes": "; Kemm dister", + "pywikibot-cosmetic-changes": "; Kemmoù dister", "pywikibot-enter-category-name": "Ebarzhit anv ar rummad, mar plij", "pywikibot-enter-file-links-processing": "Liammoù war-zu ar bajenn a vefe mat plediñ ganti?", "pywikibot-enter-finished-browser": "Ebarzhit war Kas ur wech m'ho peus echuet er merdeer.", diff --git a/thirdparty/sms.json b/thirdparty/sms.json new file mode 100644 index 0000000..5ef2251 --- /dev/null +++ b/thirdparty/sms.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Yupik" + ] + }, + "thirdparty-drtrigonbot-sum_disc-summary-head": "bott" +} -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/751106 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Change-Id: Ie84a61d8dcfa6449922e54dccaa7f0c6925e7b4c Gerrit-Change-Number: 751106 Gerrit-PatchSet: 1 Gerrit-Owner: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [FEAT] Add support for API:Redirects
by jenkins-bot (Code Review) 02 Jan '22

02 Jan '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/750788 ) Change subject: [FEAT] Add support for API:Redirects ...................................................................... [FEAT] Add support for API:Redirects Change-Id: I282b91d510cf7934be585393535c23d215c09f61 --- M pywikibot/page/__init__.py M pywikibot/site/__init__.py M pywikibot/site/_generators.py M pywikibot/site/_namespace.py M tests/site_tests.py 5 files changed, 119 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index 346698d..903d7c0 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -65,7 +65,7 @@ ) from pywikibot.page._decorators import allow_asynchronous from pywikibot.page._revision import Revision -from pywikibot.site import DataSite, Namespace +from pywikibot.site import DataSite, Namespace, NamespaceArgType from pywikibot.tools import ( ComparableMixin, compute_file_hash, @@ -964,6 +964,34 @@ content=content ) + def redirects( + self, + *, + filter_fragments: Optional[bool] = None, + namespaces: NamespaceArgType = None, + total: Optional[int] = None, + content: bool = False + ) -> 'Iterable[pywikibot.Page]': + """ + Return an iterable of redirects to this page. + + :param filter_fragments: If True, only return redirects with fragments. + If False, only return redirects without fragments. If None, return + both (no filtering). + :param namespaces: only return redirects from these namespaces + :param total: maximum number of redirects to retrieve in total + :param content: load the current content of each redirect + + .. versionadded:: 7.0 + """ + return self.site.page_redirects( + self, + filter_fragments=filter_fragments, + namespaces=namespaces, + total=total, + content=content, + ) + def protection(self) -> dict: """Return a dictionary reflecting page protections.""" return self.site.page_restrictions(self) diff --git a/pywikibot/site/__init__.py b/pywikibot/site/__init__.py index a009065..55ddc66 100644 --- a/pywikibot/site/__init__.py +++ b/pywikibot/site/__init__.py @@ -8,6 +8,7 @@ from pywikibot.site._basesite import BaseSite from pywikibot.site._datasite import DataSite from pywikibot.site._namespace import Namespace, NamespacesDict +from pywikibot.site._namespace import NamespaceArgType # noqa: F401 from pywikibot.site._obsoletesites import ClosedSite, RemovedSite from pywikibot.site._siteinfo import Siteinfo from pywikibot.site._tokenwallet import TokenWallet diff --git a/pywikibot/site/_generators.py b/pywikibot/site/_generators.py index d73e8fa..d40a54c 100644 --- a/pywikibot/site/_generators.py +++ b/pywikibot/site/_generators.py @@ -14,7 +14,7 @@ import pywikibot import pywikibot.family -from pywikibot.backports import Dict, List +from pywikibot.backports import Dict, Iterable, List from pywikibot.data import api from pywikibot.exceptions import ( APIError, @@ -25,6 +25,7 @@ UserRightsError, ) from pywikibot.site._decorators import need_right, need_version +from pywikibot.site._namespace import NamespaceArgType from pywikibot.tools import ( deprecated, filter_unique, @@ -288,6 +289,39 @@ namespaces=namespaces, total=total, g_content=content, **eiargs) + @need_version('1.24') + def page_redirects( + self, + page: 'pywikibot.Page', + *, + filter_fragments: Optional[bool] = None, + namespaces: NamespaceArgType = None, + total: Optional[int] = None, + content: bool = False + ) -> 'Iterable[pywikibot.Page]': + """Iterale all redirects to the given page. + + :see: https://www.mediawiki.org/wiki/API:Redirects + + :param page: The Page to get redirects for. + :param filter_fragments: If True, only return redirects with fragments. + If False, only return redirects without fragments. If None, return + both (no filtering). + :param namespaces: Only return redirects from the namespaces + :param total: maximum number of redirects to retrieve in total + :param content: load the current content of each redirect + + .. versionadded:: 7.0 + """ + rdargs = { + 'titles': page.title(with_section=False).encode(self.encoding()), + } + if filter_fragments is not None: + rdargs['grdshow'] = ('' if filter_fragments else '!') + 'fragment' + return self._generator(api.PageGenerator, type_arg='redirects', + namespaces=namespaces, total=total, + g_content=content, **rdargs) + def pagereferences(self, page, *, follow_redirects=False, filter_redirects=None, with_template_inclusion=True, only_template_inclusion=False, namespaces=None, diff --git a/pywikibot/site/_namespace.py b/pywikibot/site/_namespace.py index 4f7adba..dbc51de 100644 --- a/pywikibot/site/_namespace.py +++ b/pywikibot/site/_namespace.py @@ -12,6 +12,10 @@ from pywikibot.tools import ComparableMixin, SelfCallMixin +NamespaceIDType = 'Union[int, str, Namespace]' +NamespaceArgType = 'Union[NamespaceIDType, Iterable[NamespaceIDType], None]' + + class BuiltinNamespace(IntEnum): """Builtin namespace enum.""" diff --git a/tests/site_tests.py b/tests/site_tests.py index 73eac0b..4ee3dad 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -369,6 +369,56 @@ self.assertLessEqual(no_redirs, embedded_ns_0) self.assertLessEqual(embedded_ns_0, embedded_ns_0_2) + def test_page_redirects(self): + """Test Site.page_redirects.""" + if self.get_site().mw_version < '1.24': + self.skipTest('site.page_redirects() needs mw 1.24') + + redirects_ns_0 = set(self.site.page_redirects( + self.mainpage, + namespaces=0, + )) + redirects_ns_0_4 = set(self.site.page_redirects( + self.mainpage, + namespaces=[0, 4], + )) + redirects_ns_0_frag = set(self.site.page_redirects( + self.mainpage, + filter_fragments=True, + namespaces=0, + )) + redirects_ns_0_nofrag = set(self.site.page_redirects( + self.mainpage, + filter_fragments=False, + namespaces=0, + )) + + self.assertLessEqual(redirects_ns_0, redirects_ns_0_4) + self.assertLessEqual(redirects_ns_0_frag, redirects_ns_0) + self.assertLessEqual(redirects_ns_0_nofrag, redirects_ns_0) + + for redirect in redirects_ns_0_4: + self.assertIsInstance(redirect, pywikibot.Page) + self.assertIn(redirect.namespace(), [0, 4]) + self.assertTrue(redirect.isRedirectPage()) + + for redirect in redirects_ns_0: + self.assertEqual(redirect.namespace(), 0) + + for redirect in redirects_ns_0_frag: + redirect_target = redirect.getRedirectTarget() + self.assertIsNotNone(redirect_target.section()) + redirect_target = pywikibot.Page( + redirect_target.site, + redirect_target.title(with_section=False) + ) + self.assertEqual(redirect_target, self.mainpage) + + for redirect in redirects_ns_0_nofrag: + redirect_target = redirect.getRedirectTarget() + self.assertIsNone(redirect_target.section()) + self.assertEqual(redirect_target, self.mainpage) + def test_pagecategories(self): """Test Site.pagecategories.""" for cat in self.site.pagecategories(self.mainpage): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/750788 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I282b91d510cf7934be585393535c23d215c09f61 Gerrit-Change-Number: 750788 Gerrit-PatchSet: 8 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [bugfix] Fix values to unpack in get_unicode_console()
by jenkins-bot (Code Review) 02 Jan '22

02 Jan '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/750794 ) Change subject: [bugfix] Fix values to unpack in get_unicode_console() ...................................................................... [bugfix] Fix values to unpack in get_unicode_console() Change-Id: I82d3cda4fa40600a3144629ece2738cf475a9743 --- M pywikibot/userinterfaces/win32_unicode.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/userinterfaces/win32_unicode.py b/pywikibot/userinterfaces/win32_unicode.py index 4e12897..668abcd 100755 --- a/pywikibot/userinterfaces/win32_unicode.py +++ b/pywikibot/userinterfaces/win32_unicode.py @@ -326,4 +326,4 @@ _complain('exception {!r} while fixing up sys.stdout and sys.stderr' .format(e)) - return stdin, stdout, stderr + return stdin, stdout, stderr, argv -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/750794 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I82d3cda4fa40600a3144629ece2738cf475a9743 Gerrit-Change-Number: 750794 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [doc] Update license file
by jenkins-bot (Code Review) 01 Jan '22

01 Jan '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/750789 ) Change subject: [doc] Update license file ...................................................................... [doc] Update license file Change-Id: I3bccccfe8f8fccfeea37edc4e898175941422cbf --- M LICENSE 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/LICENSE b/LICENSE index e446535..43dc85e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2003-2021 Pywikibot team +Copyright (c) 2003-2022 Pywikibot team Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/750789 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I3bccccfe8f8fccfeea37edc4e898175941422cbf Gerrit-Change-Number: 750789 Gerrit-PatchSet: 1 Gerrit-Owner: Zabe <alexander.vorwerk(a)stud.uni-goettingen.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [bugfix] Don't create a Site object if pywikibot is not fully imported
by jenkins-bot (Code Review) 01 Jan '22

01 Jan '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/750698 ) Change subject: [bugfix] Don't create a Site object if pywikibot is not fully imported ...................................................................... [bugfix] Don't create a Site object if pywikibot is not fully imported Bug: T298384 Change-Id: I6c703a9f6e37d53bee5782ba8121c02321123f0f --- M pywikibot/bot.py 1 file changed, 17 insertions(+), 11 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index d1e3699..8850c77 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -394,17 +394,23 @@ # if user has enabled file logging, configure file handler if module_name in config.log or '*' in config.log: pid = '' - if pywikibot.Site.__doc__ != 'TEST': # set by aspects.DisableSiteMixin - try: # T286848 - site = pywikibot.Site() - if site is None: # T289427 - raise ValueError('Running script_test with net=False') - except ValueError: - pass - else: # get PID - throttle = site.throttle # initialize a Throttle obj - pid_int = throttle.get_pid(module_name) # get the global PID - pid = str(pid_int) + '-' if pid_int > 1 else '' + + try: # T286848 + site = pywikibot.Site() + if pywikibot.Site.__doc__ == 'TEST': + raise ValueError('Running test with aspects.DisableSiteMixin') + if site is None: # T289427 + raise ValueError('Running script_test with net=False') + except ValueError: + pass + except AttributeError: + # Insufficient import, pywikibot.Site not available (T298384) + pass + else: # get PID + throttle = site.throttle # initialize a Throttle obj + pid_int = throttle.get_pid(module_name) # get the global PID + pid = str(pid_int) + '-' if pid_int > 1 else '' + if config.logfilename: # keep config.logfilename unchanged logfile = config.datafilepath('logs', config.logfilename) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/750698 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I6c703a9f6e37d53bee5782ba8121c02321123f0f Gerrit-Change-Number: 750698 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm(a)debian.org> Gerrit-Reviewer: Majavah <hi(a)taavi.wtf> Gerrit-Reviewer: Multichill <maarten(a)mdammers.nl> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits January 2022