Pywikibot-commits

pywikibot-commits@lists.wikimedia.org

1 participants
13500 discussions

[Gerrit] ...core[master]: [IMPR]: pagefromfile.py: compute regex only once
by jenkins-bot (Code Review) 01 Oct '22

01 Oct '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/837207 ) Change subject: [IMPR]: pagefromfile.py: compute regex only once ...................................................................... [IMPR]: pagefromfile.py: compute regex only once Do not compute regexes for each page. Change-Id: If97d7ce2a52572066909474f75ac4cb6e576811a --- M scripts/pagefromfile.py 1 file changed, 22 insertions(+), 15 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/pagefromfile.py b/scripts/pagefromfile.py index 8705099..6b506f8 100755 --- a/scripts/pagefromfile.py +++ b/scripts/pagefromfile.py @@ -195,10 +195,26 @@ super().__init__(**kwargs) self.filename = filename self.site = site or pywikibot.Site() + self.page_regex, self.title_regex = self._make_regexes() + + def _make_regexes(self): + """Make regex from options.""" + if self.opt.textonly: + pattern = '^(.*)$' + else: + pattern = (re.escape(self.opt.begin) + '(.*?)' + + re.escape(self.opt.end)) + page_regex = re.compile(pattern, re.DOTALL) + title_regex = re.compile( + re.escape(self.opt.titlestart) + '(.*?)' + + re.escape(self.opt.titleend)) + return page_regex, title_regex @property def generator(self) -> Iterator[pywikibot.Page]: - """Read file and yield a tuple of page title and content. + """Read file and yield a page with content from file. + + content is stored as a page attribute defined by CTX_ATTR. .. versionchanged:: 7.6 changed from iterator method to generator property @@ -216,7 +232,7 @@ length = 0 while text: try: - length, title, contents = self.findpage(text) + length, title, contents = self.find_page(text) except TypeError: if not length: pywikibot.info('\nStart or end marker not found.') @@ -233,18 +249,9 @@ yield page text = text[length:] - def findpage(self, text) -> Tuple[int, str, str]: + def find_page(self, text) -> Tuple[int, str, str]: """Find page to work on.""" - if self.opt.textonly: - pattern = '^(.*)$' - else: - pattern = (re.escape(self.opt.begin) + '(.*?)' - + re.escape(self.opt.end)) - page_regex = re.compile(pattern, re.DOTALL) - title_regex = re.compile( - re.escape(self.opt.titlestart) + '(.*?)' - + re.escape(self.opt.titleend)) - location = page_regex.search(text) + location = self.page_regex.search(text) if self.opt.include: contents = location[0] else: @@ -253,10 +260,10 @@ title = self.opt.title if not title: try: - title = title_regex.search(contents)[1] + title = self.title_regex.search(contents)[1] if self.opt.notitle: # Remove title (to allow creation of redirects) - contents = title_regex.sub('', contents, count=1) + contents = self.title_regex.sub('', contents, count=1) except TypeError: raise NoTitleError(location.end()) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/837207 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: If97d7ce2a52572066909474f75ac4cb6e576811a Gerrit-Change-Number: 837207 Gerrit-PatchSet: 1 Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> 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]: [bugfix]: Catch TypeError instead of AttributeError
by jenkins-bot (Code Review) 01 Oct '22

01 Oct '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/837203 ) Change subject: [bugfix]: Catch TypeError instead of AttributeError ...................................................................... [bugfix]: Catch TypeError instead of AttributeError Catch the correct exception when match object is None. Regression after I2e3e4073d317eb23b7ba040642e82edfbe471cdd Bug: T319132 Change-Id: I02e8358ee4694f90dc0d1400fbca93e92829b4d5 --- M scripts/pagefromfile.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/pagefromfile.py b/scripts/pagefromfile.py index 4a564d5..8705099 100755 --- a/scripts/pagefromfile.py +++ b/scripts/pagefromfile.py @@ -217,7 +217,7 @@ while text: try: length, title, contents = self.findpage(text) - except AttributeError: + except TypeError: if not length: pywikibot.info('\nStart or end marker not found.') else: @@ -246,7 +246,7 @@ + re.escape(self.opt.titleend)) location = page_regex.search(text) if self.opt.include: - contents = location.group() + contents = location[0] else: contents = location[1] @@ -257,7 +257,7 @@ if self.opt.notitle: # Remove title (to allow creation of redirects) contents = title_regex.sub('', contents, count=1) - except AttributeError: + except TypeError: raise NoTitleError(location.end()) return location.end(), title, contents -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/837203 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: I02e8358ee4694f90dc0d1400fbca93e92829b4d5 Gerrit-Change-Number: 837203 Gerrit-PatchSet: 1 Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> 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]: [tests] Add make_dist_tests.py to the framework
by Xqt (Code Review) 01 Oct '22

01 Oct '22

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/832746 ) Change subject: [tests] Add make_dist_tests.py to the framework ...................................................................... [tests] Add make_dist_tests.py to the framework Change-Id: I6d61fd113b77e039ed5ee17cee7c6991cd7f82f2 --- M .codecov.yml M docs/tests_ref/index.rst A docs/tests_ref/make_dist_tests.rst M make_dist.py M tests/__init__.py A tests/make_dist_tests.py M tox.ini 7 files changed, 74 insertions(+), 7 deletions(-) Approvals: jenkins-bot: Verified Xqt: Verified; Looks good to me, approved diff --git a/.codecov.yml b/.codecov.yml index af8ecaf..22f8396 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -18,7 +18,6 @@ enabled: yes ignore: - - make_dist.py - pywikibot/backports.py - pywikibot/daemonize.py - pywikibot/families/__init__.py diff --git a/docs/tests_ref/index.rst b/docs/tests_ref/index.rst index 9f92532..c1eac79 100644 --- a/docs/tests_ref/index.rst +++ b/docs/tests_ref/index.rst @@ -106,6 +106,7 @@ generate_user_files<./generate_user_files_tests> harvest_template<./harvest_template_tests> interwikidata<./interwikidata_tests> + make_dist<./make_dist_tests> noreferences<./noreferences_tests> patrolbot<./patrolbot_tests> protectbot<./protectbot_tests> diff --git a/docs/tests_ref/make_dist_tests.rst b/docs/tests_ref/make_dist_tests.rst new file mode 100644 index 0000000..1cff28c --- /dev/null +++ b/docs/tests_ref/make_dist_tests.rst @@ -0,0 +1,7 @@ +tests.make\_dist\_tests module +============================== + +.. automodule:: tests.make_dist_tests + :members: + :undoc-members: + :show-inheritance: diff --git a/make_dist.py b/make_dist.py index 5b8af77..116e656 100644 --- a/make_dist.py +++ b/make_dist.py @@ -51,7 +51,7 @@ import setup -def clear_old_dist() -> None: +def clear_old_dist() -> None: # pragma: no cover """Delete old dist folders. .. versionadded:: 7.5 @@ -64,7 +64,7 @@ info('done') -def copy_files() -> None: +def copy_files() -> None: # pragma: no cover """Copy code entry point and i18n files to pywikibot.scripts folder. pwb.py wrapper script is a console script entry point for the @@ -92,7 +92,7 @@ info('done') -def cleanup() -> None: +def cleanup() -> None: # pragma: no cover """Remove all files which were copied to the pywikibot scripts folder.""" info('Remove copied files... ', newline=False) folder = Path().resolve() @@ -103,7 +103,7 @@ info('done') -def handle_args() -> Tuple[bool, bool]: +def handle_args() -> Tuple[bool, bool, bool, bool, bool]: """Handle arguments and print documentation if requested. Read arguments from `sys.argv` and adjust it passing `sdist` to @@ -134,7 +134,7 @@ return local, remote, clear, upgrade, nodist -def main() -> None: +def main() -> None: # pragma: no cover """Script entry point.""" local, remote, clear, upgrade, nodist = handle_args() @@ -167,5 +167,5 @@ check_call('twine upload dist/*', shell=True) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover main() diff --git a/tests/__init__.py b/tests/__init__.py index 87b0452..987ba55 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -153,6 +153,7 @@ 'harvest_template', 'interwikidata', 'l10n', + 'make_dist', 'patrolbot', 'protectbot', 'pwb', diff --git a/tests/make_dist_tests.py b/tests/make_dist_tests.py new file mode 100644 index 0000000..430cb9d --- /dev/null +++ b/tests/make_dist_tests.py @@ -0,0 +1,58 @@ +#!/usr/bin/python3 +"""Tests for fixes module.""" +# +# (C) Pywikibot team, 2022 +# +# Distributed under the terms of the MIT license. +# +import os +import sys +import unittest + +from pywikibot import __version__ +from make_dist import handle_args + +from tests.aspects import TestCase + + +class TestMakeDist(TestCase): + + """Test the make_dist script.""" + + net = False + + def _test_argv(self): + """Test argv.""" + if os.environ.get('PYWIKIBOT_TEST_RUNNING', '0') != '1': + self.assertEqual(__file__, sys.argv[0]) + self.assertIn('sdist', sys.argv) + self.assertIn('bdist_wheel', sys.argv) + + def test_handle_args_empty(self): + """Test make_dist handle_args function.""" + args = handle_args() + self.assertEqual(args, (False, ) * 5) + self._test_argv() + + def test_handle_args_nodist(self): + """Test make_dist handle_args function.""" + sys.argv += ['-local', '-nodist', '-remote'] + *args, nodist = handle_args() + self.assertEqual(args, [False] * 4) + self.assertTrue(nodist) + self._test_argv() + + def test_handle_args(self): + """Test make_dist handle_args function.""" + sys.argv += ['-clear', '-local', '-remote', '-upgrade'] + local, remote, clear, upgrade, nodist = handle_args() + self.assertTrue(local) + self.assertEqual(remote, 'dev' not in __version__) + self.assertTrue(clear) + self.assertTrue(upgrade) + self.assertFalse(nodist) + self._test_argv() + + +if __name__ == '__main__': # pragma: no cover + unittest.main() diff --git a/tox.ini b/tox.ini index bd09bf3..f852f3e 100644 --- a/tox.ini +++ b/tox.ini @@ -21,6 +21,7 @@ setenv = VIRTUAL_ENV={envdir} PYWIKIBOT_NO_USER_CONFIG=2 + PYWIKIBOT_TEST_RUNNING=1 usedevelop = True commands = flake8: flake8 --version -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/832746 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: I6d61fd113b77e039ed5ee17cee7c6991cd7f82f2 Gerrit-Change-Number: 832746 Gerrit-PatchSet: 7 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]: [tests] Adjust timeouts for doctests
by Xqt (Code Review) 30 Sep '22

30 Sep '22

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/837130 ) Change subject: [tests] Adjust timeouts for doctests ...................................................................... [tests] Adjust timeouts for doctests Change-Id: Idbfd3b39aa0f55e1b4968f91983e179be676de81 --- M .github/workflows/doctest.yml 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml index 045fc7e..738d1bb 100644 --- a/.github/workflows/doctest.yml +++ b/.github/workflows/doctest.yml @@ -16,7 +16,7 @@ jobs: build: runs-on: ${{ matrix.os }} - timeout-minutes: 2 + timeout-minutes: 5 strategy: fail-fast: false @@ -57,7 +57,7 @@ python -Werror::UserWarning -m pwb generate_user_files -site:wikipedia:test -user:${{ env.PYWIKIBOT_USERNAME }} -v -debug; - name: doctest with nose - timeout-minutes: 1 + timeout-minutes: 3 run: | python pwb.py version nosetests --version -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/837130 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: Idbfd3b39aa0f55e1b4968f91983e179be676de81 Gerrit-Change-Number: 837130 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [tests] Add doctests to gh action and add results to coverage
by Xqt (Code Review) 30 Sep '22

30 Sep '22

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/837127 ) Change subject: [tests] Add doctests to gh action and add results to coverage ...................................................................... [tests] Add doctests to gh action and add results to coverage Note: - doctests does not work on windows-latest - doctests does not work with pypy3 except for ubuntu-latest - nose does not work with Python 3.10 Change-Id: Iad75d87af7a3e09a038c4e29c0757c393873345e --- A .github/workflows/doctest.yml M tox.ini 2 files changed, 66 insertions(+), 1 deletion(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml new file mode 100644 index 0000000..045fc7e --- /dev/null +++ b/.github/workflows/doctest.yml @@ -0,0 +1,66 @@ +# This workflow will install Python dependencies, run Pywikibot tests +# with a variety of Python versions. For more information see: +# https://docs.github.com/en/actions/automating-builds-and-tests/building-and… + +name: Doctest CI + +on: + push: + branches: [ master ] + + +env: + PYWIKIBOT_TEST_RUNNING: 1 + PYWIKIBOT_USERNAME: Pywikibot-test + +jobs: + build: + runs-on: ${{ matrix.os }} + timeout-minutes: 2 + + strategy: + fail-fast: false + max-parallel: 3 + + matrix: + python-version: ["3.6", "3.9"] + os: [ "ubuntu-latest", "macOS-latest" ] + include: + - python-version: "pypy3" + os: "ubuntu-latest" + + steps: + - uses: actions/checkout@v2 + with: + submodules: true + + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip --version + pip install -U setuptools + pip install nose + pip install "sseclient<0.0.23,>=0.0.18" + pip install "mwparserfromhell>=0.5.0" + pip install "PyMySQL >= 0.9.3" + pip install codecov + pip install "coverage>=5.2.1" + python -c "import setuptools; print('setuptools:', setuptools.__version__)" + + - name: Generate user files + run: | + python -Werror::UserWarning -m pwb generate_user_files -site:wikipedia:test -user:${{ env.PYWIKIBOT_USERNAME }} -v -debug; + + - name: doctest with nose + timeout-minutes: 1 + run: | + python pwb.py version + nosetests --version + nosetests -v --with-doctest --with-coverage pywikibot --ignore-files="(gui|memento)\.py" + - name: Upload coverage to Codecov + run: codecov diff --git a/tox.ini b/tox.ini index 270352e..bd09bf3 100644 --- a/tox.ini +++ b/tox.ini @@ -69,7 +69,6 @@ deps = nose .[eventstreams] - .[memento] .[mwparserfromhell] .[mysql] -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/837127 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: Iad75d87af7a3e09a038c4e29c0757c393873345e Gerrit-Change-Number: 837127 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] Short site value can be given
by jenkins-bot (Code Review) 30 Sep '22

30 Sep '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/832965 ) Change subject: [IMPR] Short site value can be given ...................................................................... [IMPR] Short site value can be given Short site value can be given if site code is equal to family like ``-site:meta`` or ``-site:commons``. This is similar than to create a site with the Site creator: site = Site('commons'). Change-Id: I951773b6509ddd18f04f63844a7ac21bad4e059c --- M pywikibot/bot.py 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 6aaa9f0..e1bf683 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -876,6 +876,9 @@ toggling the value. Refer :func:`tools.strtobool` for valid values. .. versionchanged:: 7.7 *-config* global option was added. + .. versionchanged:: 8.0 + Short site value can be given if site code is equal to family + like ``-site:meta``. :param args: Command line arguments. If None, :meth:`pywikibot.argvu<userinterfaces._interface_base.ABUIC.argvu>` @@ -909,7 +912,10 @@ elif option in ('-config', '-dir'): pass elif option == '-site': - config.family, config.mylang = value.split(':') + if ':' in value: + config.family, config.mylang = value.split(':') + else: + config.family = config.mylang = value elif option == '-family': config.family = value elif option == '-lang': -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/832965 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: I951773b6509ddd18f04f63844a7ac21bad4e059c Gerrit-Change-Number: 832965 Gerrit-PatchSet: 3 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]: [tests] Skip doctests for memento.py
by Xqt (Code Review) 29 Sep '22

29 Sep '22

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/836863 ) Change subject: [tests] Skip doctests for memento.py ...................................................................... [tests] Skip doctests for memento.py There are too many timeouts which lead Jenkins doctest to fail Change-Id: I0650add00982c0e599a6699d979462050ccf2ef7 --- M pywikibot/data/memento.py M tox.ini 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/data/memento.py b/pywikibot/data/memento.py index 93bc2ca..cf7ed11 100644 --- a/pywikibot/data/memento.py +++ b/pywikibot/data/memento.py @@ -53,7 +53,7 @@ >>> sorted(mi['mementos']) ['closest', 'first', 'last', 'next', 'prev'] >>> from pprint import pprint - >>> pprint(mi['mementos']) # doctest: +SKIP + >>> pprint(mi['mementos']) {'closest': {'datetime': datetime.datetime(2010, 5, 23, 10, 19, 6), 'http_status_code': 200, 'uri': ['https://web.archive.org/web/20100523101906/http://www.bbc.co.uk/']}, diff --git a/tox.ini b/tox.ini index 19f308f..270352e 100644 --- a/tox.ini +++ b/tox.ini @@ -9,7 +9,7 @@ hacking-py37 [params] -doctest_skip = --ignore-files=gui\.py +doctest_skip = --ignore-files=(gui|memento)\.py exclude = --exclude make_dist.py,.tox,.git,./*.egg,build,./scripts/i18n/* generate_user_files = -W error::UserWarning -m pwb generate_user_files -family:wikipedia -lang:test -v -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/836863 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: I0650add00982c0e599a6699d979462050ccf2ef7 Gerrit-Change-Number: 836863 Gerrit-PatchSet: 2 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]: [8.0] Require Python 3.6.1+ with Pywikibot and drop support for Pytho...
by Xqt (Code Review) 29 Sep '22

29 Sep '22

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/836737 ) Change subject: [8.0] Require Python 3.6.1+ with Pywikibot and drop support for Python 3.6.0 ...................................................................... [8.0] Require Python 3.6.1+ with Pywikibot and drop support for Python 3.6.0 Bug: T318912 Change-Id: If66d4869d8bb30bec55aaee76786d3ef2b9f9314 --- M .appveyor.yml M appveyor_install.ps1 M dev-requirements.txt M docs/index.rst M make_dist.py M pywikibot/README.rst M pywikibot/userinterfaces/gui.py M setup.py 8 files changed, 25 insertions(+), 31 deletions(-) Approvals: JJMC89: Looks good to me, approved Xqt: Verified; Looks good to me, approved diff --git a/.appveyor.yml b/.appveyor.yml index 48e05d7..12e44c4 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -16,32 +16,32 @@ # Test the lowest supported release of each major Python version - - PYTHON: "C:\\Python360-x64" - PYTHON_VERSION: "3.6.0" - PYTHON_ARCH: "32" + - PYTHON: "C:\\Python361-x64" + PYTHON_VERSION: "3.6.1" + PYTHON_ARCH: "64" # Appveyor pre-installs these versions onto build machines - - PYTHON: "C:\\Python36-x64" + - PYTHON: "C:\\Python36" PYTHON_VERSION: "3.6.x" - PYTHON_ARCH: "64" + PYTHON_ARCH: "32" - - PYTHON: "C:\\Python37" + - PYTHON: "C:\\Python37-x64" PYTHON_VERSION: "3.7.x" - PYTHON_ARCH: "32" + PYTHON_ARCH: "64" - - PYTHON: "C:\\Python38-x64" + - PYTHON: "C:\\Python38" PYTHON_VERSION: "3.8.x" - PYTHON_ARCH: "64" - - - PYTHON: "C:\\Python39" - PYTHON_VERSION: "3.9.x" PYTHON_ARCH: "32" - - PYTHON: "C:\\Python310-x64" - PYTHON_VERSION: "3.10.x" + - PYTHON: "C:\\Python39-x64" + PYTHON_VERSION: "3.9.x" PYTHON_ARCH: "64" + - PYTHON: "C:\\Python310" + PYTHON_VERSION: "3.10.x" + PYTHON_ARCH: "32" + matrix: fast_finish: false @@ -53,7 +53,7 @@ - git submodule update --init # Download the Appveyor Python build accessories into subdirectory .\appveyor - mkdir appveyor - # Download Python 3.6.0 which isn't pre-installed + # Download Python 3.6.1 which isn't pre-installed - ps: ./appveyor_install.ps1 - python --version - python -c "import struct; print('PYTHON_ARCH' + chr(58), struct.calcsize('P') << 3)" diff --git a/appveyor_install.ps1 b/appveyor_install.ps1 index 2cf579e..b86e63d 100644 --- a/appveyor_install.ps1 +++ b/appveyor_install.ps1 @@ -60,7 +60,7 @@ function DownloadPython ($python_version, $platform_suffix) { $major, $minor, $micro, $prerelease = ParsePythonVersion $python_version - # Only Python 3.6.0+ is supported + # Only Python 3.6.1+ is supported $dir = "$major.$minor.$micro" $ext = "exe" if ($platform_suffix) { @@ -125,7 +125,7 @@ function main () { - if ($env:PYTHON_VERSION -eq "3.6.0") { + if ($env:PYTHON_VERSION -eq "3.6.1") { InstallPython $env:PYTHON_VERSION $env:PYTHON_ARCH $env:PYTHON } } diff --git a/dev-requirements.txt b/dev-requirements.txt index 922ee40..48d6783 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -16,10 +16,9 @@ pytest-httpbin pydocstyle>=4.0.0 -flake8==3.9.2; python_version < "3.6.1" -flake8>=5.0.2; python_version >= "3.6.1" +flake8>=5.0.2 flake8-docstrings>=0.2.6 -flake8-isort;python_version>="3.6" +flake8-isort verve-flake8-mock>=0.4 codecov coverage>=5.2.1 diff --git a/docs/index.rst b/docs/index.rst index 3a84893..b460247 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -19,7 +19,7 @@ whether you have Python installed and to find its version, just type ``python`` at the CMD or shell prompt. -Python 3.6.0 or higher is currently required to run the bot, but Python 3.7 +Python 3.6.1 or higher is currently required to run the bot, but Python 3.7 or higher is recommended. Python 3.6 support will be dropped with Pywikibot 9. Pywikibot and this documentation are licensed under the diff --git a/make_dist.py b/make_dist.py index a285a7f..5b8af77 100644 --- a/make_dist.py +++ b/make_dist.py @@ -23,7 +23,6 @@ [pwb] make_dist [options] -.. note:: Requires Python 3.6+. .. versionadded:: 7.3 .. versionchanged:: 7.4 diff --git a/pywikibot/README.rst b/pywikibot/README.rst index 21f1f54..acf480b 100644 --- a/pywikibot/README.rst +++ b/pywikibot/README.rst @@ -27,7 +27,7 @@ * python-tkinter (optional, used by some experimental GUI stuff) -You need to have at least Python version `3.6.0 <https://www.python.org/downloads/>`_ +You need to have at least Python version `3.6.1 <https://www.python.org/downloads/>`_ or newer installed on your computer to be able to run any of the code in this package. Please refer the manual at mediawiki for further details and restrictions. diff --git a/pywikibot/userinterfaces/gui.py b/pywikibot/userinterfaces/gui.py index 1e29c12..0173c20 100644 --- a/pywikibot/userinterfaces/gui.py +++ b/pywikibot/userinterfaces/gui.py @@ -2,9 +2,6 @@ A window with a textfield where the user can edit. Useful for editing the contents of an article. - -.. versionchanged:: 6.1 - Python 3.6 or highter is required. """ # # (C) Pywikibot team, 2003-2022 diff --git a/setup.py b/setup.py index d276576..87efff2 100755 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ Pywikibot is not available on: {version} -This version of Pywikibot only supports Python 3.6+. +This version of Pywikibot only supports Python 3.6.1+. """ try: @@ -49,7 +49,7 @@ def python_is_supported() -> bool: """Check that Python is supported.""" - return sys.version_info[:3] >= (3, 6) + return sys.version_info[:3] >= (3, 6, 1) if not python_is_supported(): # pragma: no cover @@ -73,8 +73,7 @@ 'html': ['BeautifulSoup4'], 'http': ['fake_useragent'], 'flake8': [ # Due to incompatibilities between packages the order matters. - 'flake8==3.9.2; python_version < "3.6.1"', - 'flake8>=5.0.2; python_version >= "3.6.1"', + 'flake8>=5.0.2', 'darglint', 'pydocstyle>=4.0.0', 'flake8-bugbear!=21.4.1,!=21.11.28', @@ -270,7 +269,7 @@ # zip_safe install_requires=dependencies, extras_require=extra_deps, - python_requires='>=3.6', + python_requires='>=3.6.1', # namespace_packages test_suite='tests.collector', tests_require=test_deps, -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/836737 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: If66d4869d8bb30bec55aaee76786d3ef2b9f9314 Gerrit-Change-Number: 836737 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> 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) 29 Sep '22

29 Sep '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/836754 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: Iac8458a5a07110d57bc0fbe1882f38a295b0911c --- M cosmetic_changes/af.json M cosmetic_changes/an.json M cosmetic_changes/ar.json M cosmetic_changes/arc.json M cosmetic_changes/ast.json M cosmetic_changes/awa.json M cosmetic_changes/az.json M cosmetic_changes/azb.json M cosmetic_changes/ba.json M cosmetic_changes/bar.json M cosmetic_changes/bcc.json M cosmetic_changes/be-tarask.json M cosmetic_changes/be.json M cosmetic_changes/bg.json M cosmetic_changes/bjn.json M cosmetic_changes/bn.json M cosmetic_changes/bo.json M cosmetic_changes/br.json M cosmetic_changes/bs.json M cosmetic_changes/ca.json M cosmetic_changes/ce.json M cosmetic_changes/ckb.json M cosmetic_changes/cs.json M cosmetic_changes/csb.json M cosmetic_changes/cy.json M cosmetic_changes/da.json M cosmetic_changes/de.json M cosmetic_changes/diq.json M cosmetic_changes/el.json M cosmetic_changes/eo.json M cosmetic_changes/es.json M cosmetic_changes/et.json M cosmetic_changes/eu.json M cosmetic_changes/fa.json M cosmetic_changes/fi.json M cosmetic_changes/fo.json M cosmetic_changes/fr.json M cosmetic_changes/frp.json M cosmetic_changes/frr.json M cosmetic_changes/fy.json M cosmetic_changes/ga.json M cosmetic_changes/gl.json M cosmetic_changes/gsw.json M cosmetic_changes/hak.json M cosmetic_changes/haw.json M cosmetic_changes/he.json M cosmetic_changes/hi.json M cosmetic_changes/hr.json M cosmetic_changes/hsb.json M cosmetic_changes/hu.json M cosmetic_changes/hy.json M cosmetic_changes/ia.json M cosmetic_changes/id.json M cosmetic_changes/ie.json M cosmetic_changes/ig.json M cosmetic_changes/ilo.json M cosmetic_changes/io.json M cosmetic_changes/is.json M cosmetic_changes/it.json M cosmetic_changes/ja.json M cosmetic_changes/jv.json M cosmetic_changes/kk.json M cosmetic_changes/kn.json M cosmetic_changes/ko.json M cosmetic_changes/ksh.json M cosmetic_changes/ky.json M cosmetic_changes/la.json M cosmetic_changes/lb.json M cosmetic_changes/li.json M cosmetic_changes/lt.json M cosmetic_changes/lv.json M cosmetic_changes/map-bms.json M cosmetic_changes/mg.json M cosmetic_changes/min.json M cosmetic_changes/mk.json M cosmetic_changes/ml.json M cosmetic_changes/mr.json M cosmetic_changes/ms.json M cosmetic_changes/mt.json M cosmetic_changes/nan.json M cosmetic_changes/nb.json M cosmetic_changes/nds-nl.json M cosmetic_changes/nds.json M cosmetic_changes/ne.json M cosmetic_changes/nl.json M cosmetic_changes/nn.json M cosmetic_changes/nqo.json M cosmetic_changes/oc.json M cosmetic_changes/or.json M cosmetic_changes/pdc.json M cosmetic_changes/pfl.json M cosmetic_changes/pl.json M cosmetic_changes/pms.json M cosmetic_changes/pt-br.json M cosmetic_changes/pt.json M cosmetic_changes/ro.json M cosmetic_changes/ru.json M cosmetic_changes/sco.json M cosmetic_changes/sd.json M cosmetic_changes/sh.json M cosmetic_changes/si.json M cosmetic_changes/sk.json M cosmetic_changes/sl.json M cosmetic_changes/so.json M cosmetic_changes/sq.json M cosmetic_changes/sr.json M cosmetic_changes/su.json M cosmetic_changes/sv.json M cosmetic_changes/szl.json M cosmetic_changes/ta.json M cosmetic_changes/te.json M cosmetic_changes/th.json M cosmetic_changes/tk.json M cosmetic_changes/tl.json M cosmetic_changes/tly.json M cosmetic_changes/tr.json M cosmetic_changes/tt.json M cosmetic_changes/uk.json M cosmetic_changes/ur.json M cosmetic_changes/uz.json M cosmetic_changes/vec.json M cosmetic_changes/vep.json M cosmetic_changes/vi.json M cosmetic_changes/vo.json M cosmetic_changes/war.json M cosmetic_changes/yi.json M cosmetic_changes/zh.json 127 files changed, 0 insertions(+), 127 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/cosmetic_changes/af.json b/cosmetic_changes/af.json index 6ea55bc..3040c17 100644 --- a/cosmetic_changes/af.json +++ b/cosmetic_changes/af.json @@ -4,6 +4,5 @@ "Naudefj" ] }, - "cosmetic_changes-append": "; kosmetiese veranderinge", "cosmetic_changes-standalone": "Robot: Kosmetiese veranderinge" } diff --git a/cosmetic_changes/an.json b/cosmetic_changes/an.json index 16ca1ae..14ef11b 100644 --- a/cosmetic_changes/an.json +++ b/cosmetic_changes/an.json @@ -4,6 +4,5 @@ "MarcoAurelio" ] }, - "cosmetic_changes-append": "; cambeos trivials", "cosmetic_changes-standalone": "Bot: cambeos trivials" } diff --git a/cosmetic_changes/ar.json b/cosmetic_changes/ar.json index 2e04a02..9e50f9a 100644 --- a/cosmetic_changes/ar.json +++ b/cosmetic_changes/ar.json @@ -6,6 +6,5 @@ "ديفيد" ] }, - "cosmetic_changes-append": "، تغييرات تجميلية", "cosmetic_changes-standalone": "بوت: تغييرات تجميلية" } diff --git a/cosmetic_changes/arc.json b/cosmetic_changes/arc.json index 75d7995..c06add1 100644 --- a/cosmetic_changes/arc.json +++ b/cosmetic_changes/arc.json @@ -4,6 +4,5 @@ "Basharh" ] }, - "cosmetic_changes-append": "; ܫܘܚܠܦ̈ܐ ܫܘܦܪ̈ܢܝܐ", "cosmetic_changes-standalone": "ܪܘܒܘܛ: ܫܘܚܠܦ̈ܐ ܫܘܦܪ̈ܢܝܐ" } diff --git a/cosmetic_changes/ast.json b/cosmetic_changes/ast.json index 5adfac1..71152ed 100644 --- a/cosmetic_changes/ast.json +++ b/cosmetic_changes/ast.json @@ -5,6 +5,5 @@ "Xuacu" ] }, - "cosmetic_changes-append": "; cambios cosméticos", "cosmetic_changes-standalone": "Bot: Cambios cosméticos" } diff --git a/cosmetic_changes/awa.json b/cosmetic_changes/awa.json index 04e9304..b55a8c3 100644 --- a/cosmetic_changes/awa.json +++ b/cosmetic_changes/awa.json @@ -4,6 +4,5 @@ "1AnuraagPandey" ] }, - "cosmetic_changes-append": "; अंगराग परिवर्तन", "cosmetic_changes-standalone": "रोबॉट: अंगराग परिवर्तन" } diff --git a/cosmetic_changes/az.json b/cosmetic_changes/az.json index d79c6fb..9825bdc 100644 --- a/cosmetic_changes/az.json +++ b/cosmetic_changes/az.json @@ -5,6 +5,5 @@ "Vago" ] }, - "cosmetic_changes-append": "; kosmetik dəyişmələr", "cosmetic_changes-standalone": "Bot: Kosmetik dəyişmələr" } diff --git a/cosmetic_changes/azb.json b/cosmetic_changes/azb.json index 5ce183e..098c5c0 100644 --- a/cosmetic_changes/azb.json +++ b/cosmetic_changes/azb.json @@ -4,6 +4,5 @@ "E THP" ] }, - "cosmetic_changes-append": "؛ زنگینلشدیرمه", "cosmetic_changes-standalone": "روبات:گوزلتمک" } diff --git a/cosmetic_changes/ba.json b/cosmetic_changes/ba.json index 82ad65e..818bf82 100644 --- a/cosmetic_changes/ba.json +++ b/cosmetic_changes/ba.json @@ -4,6 +4,5 @@ "Sagan" ] }, - "cosmetic_changes-append": "; косметик үҙгәртеүҙәр", "cosmetic_changes-standalone": "Робот: косметик үҙгәртеүҙәр" } diff --git a/cosmetic_changes/bar.json b/cosmetic_changes/bar.json index 1ac45ef..f76aee4 100644 --- a/cosmetic_changes/bar.json +++ b/cosmetic_changes/bar.json @@ -4,6 +4,5 @@ "Mucalexx" ] }, - "cosmetic_changes-append": "; kósmeetische Änderrungen", "cosmetic_changes-standalone": "Bot: Kósmeetische Änderrungen" } diff --git a/cosmetic_changes/bcc.json b/cosmetic_changes/bcc.json index 798ccb6..a99e85f 100644 --- a/cosmetic_changes/bcc.json +++ b/cosmetic_changes/bcc.json @@ -4,6 +4,5 @@ "Baloch Afghanistan" ] }, - "cosmetic_changes-append": "؛ زیباسازی", "cosmetic_changes-standalone": "ربات: زیباسازی" } diff --git a/cosmetic_changes/be-tarask.json b/cosmetic_changes/be-tarask.json index 3aab80d..ae723ed 100644 --- a/cosmetic_changes/be-tarask.json +++ b/cosmetic_changes/be-tarask.json @@ -5,6 +5,5 @@ "Jim-by" ] }, - "cosmetic_changes-append": "; касмэтычныя зьмены", "cosmetic_changes-standalone": "Робат: касмэтычныя зьмены" } diff --git a/cosmetic_changes/be.json b/cosmetic_changes/be.json index 1ba3829..1adcfd6 100644 --- a/cosmetic_changes/be.json +++ b/cosmetic_changes/be.json @@ -5,6 +5,5 @@ "Mechanizatar" ] }, - "cosmetic_changes-append": "; дробныя змены", "cosmetic_changes-standalone": "робат дадаў: дробныя змены" } diff --git a/cosmetic_changes/bg.json b/cosmetic_changes/bg.json index 4745a94..d79ed5d 100644 --- a/cosmetic_changes/bg.json +++ b/cosmetic_changes/bg.json @@ -4,6 +4,5 @@ "Vodnokon4e" ] }, - "cosmetic_changes-append": "; козметични промени", "cosmetic_changes-standalone": "Бот: Козметични промени" } diff --git a/cosmetic_changes/bjn.json b/cosmetic_changes/bjn.json index 0513e5e..35f7213 100644 --- a/cosmetic_changes/bjn.json +++ b/cosmetic_changes/bjn.json @@ -4,6 +4,5 @@ "Riemogerz" ] }, - "cosmetic_changes-append": "; kusmitik parubahan", "cosmetic_changes-standalone": "Robot: Parubahan kusmitik" } diff --git a/cosmetic_changes/bn.json b/cosmetic_changes/bn.json index c5133d8..1db2a8d 100644 --- a/cosmetic_changes/bn.json +++ b/cosmetic_changes/bn.json @@ -6,6 +6,5 @@ "Wikitanvir" ] }, - "cosmetic_changes-append": "; সজ্জা পরিবর্তন", "cosmetic_changes-standalone": "বট: সজ্জা পরিবর্তন" } diff --git a/cosmetic_changes/bo.json b/cosmetic_changes/bo.json index bfbbbf0..1f81276 100644 --- a/cosmetic_changes/bo.json +++ b/cosmetic_changes/bo.json @@ -4,6 +4,5 @@ "Phurbutsering" ] }, - "cosmetic_changes-append": "；བཟོ་འཀོད་ཀྱི་འགྱུར་ལྡོག།", "cosmetic_changes-standalone": "མི་གཟུགས་འཕྲུལ་ཆས་ ：བཟོ་བཀོད་ཀྱི་འགྱུར་ལྡོག།" } diff --git a/cosmetic_changes/br.json b/cosmetic_changes/br.json index 1c5cafa..e15ad3b 100644 --- a/cosmetic_changes/br.json +++ b/cosmetic_changes/br.json @@ -2,6 +2,5 @@ "@metadata": { "authors": [] }, - "cosmetic_changes-append": "; Kemm dister", "cosmetic_changes-standalone": "Bot: Kemm dister" } diff --git a/cosmetic_changes/bs.json b/cosmetic_changes/bs.json index 2d777ca..be88d69 100644 --- a/cosmetic_changes/bs.json +++ b/cosmetic_changes/bs.json @@ -5,6 +5,5 @@ "Edinwiki" ] }, - "cosmetic_changes-append": "; kozmetičke promjene", "cosmetic_changes-standalone": "Bot: kozmetičke promjene" } diff --git a/cosmetic_changes/ca.json b/cosmetic_changes/ca.json index 545163a..f3df4f3 100644 --- a/cosmetic_changes/ca.json +++ b/cosmetic_changes/ca.json @@ -6,6 +6,5 @@ "Mguix" ] }, - "cosmetic_changes-append": "; canvis superficials", "cosmetic_changes-standalone": "Bot: canvis superficials" } diff --git a/cosmetic_changes/ce.json b/cosmetic_changes/ce.json index 723d215..d713748 100644 --- a/cosmetic_changes/ce.json +++ b/cosmetic_changes/ce.json @@ -4,6 +4,5 @@ "Умар" ] }, - "cosmetic_changes-append": "; косметикийн хийцам", "cosmetic_changes-standalone": "бот: косметикийн хийцам" } diff --git a/cosmetic_changes/ckb.json b/cosmetic_changes/ckb.json index 1f8f288..03e4d57 100644 --- a/cosmetic_changes/ckb.json +++ b/cosmetic_changes/ckb.json @@ -6,6 +6,5 @@ "ئارام بکر" ] }, - "cosmetic_changes-append": "؛ دەستکاریی جوانکاری", "cosmetic_changes-standalone": "بۆت: دەستکاریی جوانکاری" } diff --git a/cosmetic_changes/cs.json b/cosmetic_changes/cs.json index d221b86..093a356 100644 --- a/cosmetic_changes/cs.json +++ b/cosmetic_changes/cs.json @@ -6,6 +6,5 @@ "Patrik L." ] }, - "cosmetic_changes-append": "; kosmetické úpravy", "cosmetic_changes-standalone": "robot: kosmetické úpravy" } diff --git a/cosmetic_changes/csb.json b/cosmetic_changes/csb.json index 734858c..0782e8f 100644 --- a/cosmetic_changes/csb.json +++ b/cosmetic_changes/csb.json @@ -4,6 +4,5 @@ "Kaszeba" ] }, - "cosmetic_changes-append": "; kòsmeticzné zmianë", "cosmetic_changes-standalone": "Bòt: Kòsmeticzné zmianë" } diff --git a/cosmetic_changes/cy.json b/cosmetic_changes/cy.json index 1dbaa99..6b014d8 100644 --- a/cosmetic_changes/cy.json +++ b/cosmetic_changes/cy.json @@ -4,6 +4,5 @@ "Lloffiwr" ] }, - "cosmetic_changes-append": "; Newidiadau i ymddangosiad y dudalen", "cosmetic_changes-standalone": "Robot: Newidiadau i ymddangosiad y dudalen" } diff --git a/cosmetic_changes/da.json b/cosmetic_changes/da.json index 45128d5..3721949 100644 --- a/cosmetic_changes/da.json +++ b/cosmetic_changes/da.json @@ -4,6 +4,5 @@ "Christian List" ] }, - "cosmetic_changes-append": "; kosmetiske ændringer", "cosmetic_changes-standalone": "Robot: Kosmetiske ændringer" } diff --git a/cosmetic_changes/de.json b/cosmetic_changes/de.json index 1e49fdc..47a938b 100644 --- a/cosmetic_changes/de.json +++ b/cosmetic_changes/de.json @@ -2,6 +2,5 @@ "@metadata": { "authors": [] }, - "cosmetic_changes-append": "; kosmetische Änderungen", "cosmetic_changes-standalone": "Bot: Kosmetische Änderungen" } diff --git a/cosmetic_changes/diq.json b/cosmetic_changes/diq.json index 7455953..acf8897 100644 --- a/cosmetic_changes/diq.json +++ b/cosmetic_changes/diq.json @@ -4,6 +4,5 @@ "Erdemaslancan" ] }, - "cosmetic_changes-append": "; kozmetik vurnayışi", "cosmetic_changes-standalone": "Boti vurnayışo kozmetik keno" } diff --git a/cosmetic_changes/el.json b/cosmetic_changes/el.json index 1c4c37e..e8e24c5 100644 --- a/cosmetic_changes/el.json +++ b/cosmetic_changes/el.json @@ -6,6 +6,5 @@ "Protnet" ] }, - "cosmetic_changes-append": ".", "cosmetic_changes-standalone": "Ρομπότ: Αισθητικές αλλαγές" } diff --git a/cosmetic_changes/eo.json b/cosmetic_changes/eo.json index 846bec3..91a0330 100644 --- a/cosmetic_changes/eo.json +++ b/cosmetic_changes/eo.json @@ -4,6 +4,5 @@ "Remux" ] }, - "cosmetic_changes-append": "; kosmetikaj ŝanĝoj", "cosmetic_changes-standalone": "Roboto: Kosmetikaj ŝanĝoj" } diff --git a/cosmetic_changes/es.json b/cosmetic_changes/es.json index fe418a5..c16a2be 100644 --- a/cosmetic_changes/es.json +++ b/cosmetic_changes/es.json @@ -5,6 +5,5 @@ "Xqt" ] }, - "cosmetic_changes-append": "; cambios superficiales", "cosmetic_changes-standalone": "Robot: cambios superficiales" } diff --git a/cosmetic_changes/et.json b/cosmetic_changes/et.json index 7281124..5b914cf 100644 --- a/cosmetic_changes/et.json +++ b/cosmetic_changes/et.json @@ -4,6 +4,5 @@ "Pikne" ] }, - "cosmetic_changes-append": "; kosmeetilised muudatused", "cosmetic_changes-standalone": "Robot: kosmeetilised muudatused" } diff --git a/cosmetic_changes/eu.json b/cosmetic_changes/eu.json index 0df6ff4..3a2c171 100644 --- a/cosmetic_changes/eu.json +++ b/cosmetic_changes/eu.json @@ -4,6 +4,5 @@ "An13sa" ] }, - "cosmetic_changes-append": "; aldaketa kosmetikoak", "cosmetic_changes-standalone": "Robota: Aldaketa kosmetikoak" } diff --git a/cosmetic_changes/fa.json b/cosmetic_changes/fa.json index f7d95fd..31b1bd6 100644 --- a/cosmetic_changes/fa.json +++ b/cosmetic_changes/fa.json @@ -4,6 +4,5 @@ "Mjbmr" ] }, - "cosmetic_changes-append": "؛ زیباسازی", "cosmetic_changes-standalone": "ربات: زیباسازی" } diff --git a/cosmetic_changes/fi.json b/cosmetic_changes/fi.json index 30bf840..a1b30b6 100644 --- a/cosmetic_changes/fi.json +++ b/cosmetic_changes/fi.json @@ -4,6 +4,5 @@ "Crt" ] }, - "cosmetic_changes-append": "; kosmeettisia muutoksia", "cosmetic_changes-standalone": "Botti teki kosmeettisia muutoksia" } diff --git a/cosmetic_changes/fo.json b/cosmetic_changes/fo.json index b666557..7943578 100644 --- a/cosmetic_changes/fo.json +++ b/cosmetic_changes/fo.json @@ -4,6 +4,5 @@ "EileenSanda" ] }, - "cosmetic_changes-append": "; broytingar av útsjónd", "cosmetic_changes-standalone": "Bottur: Kosmetiskar broytingar" } diff --git a/cosmetic_changes/fr.json b/cosmetic_changes/fr.json index 906f099..2ab6def 100644 --- a/cosmetic_changes/fr.json +++ b/cosmetic_changes/fr.json @@ -5,6 +5,5 @@ "Verdy p" ] }, - "cosmetic_changes-append": "; changements cosmétiques", "cosmetic_changes-standalone": "Robot : changements cosmétiques" } diff --git a/cosmetic_changes/frp.json b/cosmetic_changes/frp.json index 8456856..aac409d 100644 --- a/cosmetic_changes/frp.json +++ b/cosmetic_changes/frp.json @@ -4,6 +4,5 @@ "ChrisPtDe" ] }, - "cosmetic_changes-append": "; changement de tipo cosmètico", "cosmetic_changes-standalone": "Robot : changement de tipo cosmètico" } diff --git a/cosmetic_changes/frr.json b/cosmetic_changes/frr.json index fe79324..ec2bd6b 100644 --- a/cosmetic_changes/frr.json +++ b/cosmetic_changes/frr.json @@ -4,6 +4,5 @@ "Murma174" ] }, - "cosmetic_changes-append": "; kosmeetisk feranrangen", "cosmetic_changes-standalone": "Bot: Kosmeetisk feranrangen" } diff --git a/cosmetic_changes/fy.json b/cosmetic_changes/fy.json index d2c728c..caad943 100644 --- a/cosmetic_changes/fy.json +++ b/cosmetic_changes/fy.json @@ -2,6 +2,5 @@ "@metadata": { "authors": [] }, - "cosmetic_changes-append": "; tekstwiziging", "cosmetic_changes-standalone": "bot tekstwiziging" } diff --git a/cosmetic_changes/ga.json b/cosmetic_changes/ga.json index 628a64e..203e963 100644 --- a/cosmetic_changes/ga.json +++ b/cosmetic_changes/ga.json @@ -2,6 +2,5 @@ "@metadata": { "authors": [] }, - "cosmetic_changes-append": "; athruithe cosmaideacha", "cosmetic_changes-standalone": "Róbat: Athruithe cosmaideacha" } diff --git a/cosmetic_changes/gl.json b/cosmetic_changes/gl.json index fd12dbd..c7bb148 100644 --- a/cosmetic_changes/gl.json +++ b/cosmetic_changes/gl.json @@ -4,6 +4,5 @@ "Banjo" ] }, - "cosmetic_changes-append": "; cambios estética", "cosmetic_changes-standalone": "Bot: Cambios estética" } diff --git a/cosmetic_changes/gsw.json b/cosmetic_changes/gsw.json index c1dd06b..8ad86ea 100644 --- a/cosmetic_changes/gsw.json +++ b/cosmetic_changes/gsw.json @@ -4,6 +4,5 @@ "Als-Chlämens" ] }, - "cosmetic_changes-append": "; oberflächlichi Änderige", "cosmetic_changes-standalone": "Bötli: Oberflächlichi Änderige" } diff --git a/cosmetic_changes/hak.json b/cosmetic_changes/hak.json index 9638f85..24ab7c6 100644 --- a/cosmetic_changes/hak.json +++ b/cosmetic_changes/hak.json @@ -4,6 +4,5 @@ "Jetlag" ] }, - "cosmetic_changes-append": ";整潔化更改", "cosmetic_changes-standalone": "機械人：整潔化" } diff --git a/cosmetic_changes/haw.json b/cosmetic_changes/haw.json index afccfad..a112ccc 100644 --- a/cosmetic_changes/haw.json +++ b/cosmetic_changes/haw.json @@ -4,6 +4,5 @@ "Kolonahe" ] }, - "cosmetic_changes-append": "; nā hoʻololi helehelena", "cosmetic_changes-standalone": "Lopako: Nā hoʻololi helehelena" } diff --git a/cosmetic_changes/he.json b/cosmetic_changes/he.json index 6de27d3..081b060 100644 --- a/cosmetic_changes/he.json +++ b/cosmetic_changes/he.json @@ -2,6 +2,5 @@ "@metadata": { "authors": [] }, - "cosmetic_changes-append": "; שינויים קוסמטיים", "cosmetic_changes-standalone": "בוט: שינויים קוסמטיים" } diff --git a/cosmetic_changes/hi.json b/cosmetic_changes/hi.json index 639e039..fa4bfbc 100644 --- a/cosmetic_changes/hi.json +++ b/cosmetic_changes/hi.json @@ -4,6 +4,5 @@ "Siddhartha Ghai" ] }, - "cosmetic_changes-append": "; ऊपरी परिवर्तन", "cosmetic_changes-standalone": "बॉट: ऊपरी परिवर्तन" } diff --git a/cosmetic_changes/hr.json b/cosmetic_changes/hr.json index 8b3ecea..6db0daa 100644 --- a/cosmetic_changes/hr.json +++ b/cosmetic_changes/hr.json @@ -2,6 +2,5 @@ "@metadata": { "authors": [] }, - "cosmetic_changes-append": "; kozmetičke promjene", "cosmetic_changes-standalone": "robot kozmetičke promjene" } diff --git a/cosmetic_changes/hsb.json b/cosmetic_changes/hsb.json index 38c8f32..537004f 100644 --- a/cosmetic_changes/hsb.json +++ b/cosmetic_changes/hsb.json @@ -4,6 +4,5 @@ "Michawiki" ] }, - "cosmetic_changes-append": "; kosmetiske změny", "cosmetic_changes-standalone": "Bot: Kosmetiske změny" } diff --git a/cosmetic_changes/hu.json b/cosmetic_changes/hu.json index c7565e5..c347b85 100644 --- a/cosmetic_changes/hu.json +++ b/cosmetic_changes/hu.json @@ -2,6 +2,5 @@ "@metadata": { "authors": [] }, - "cosmetic_changes-append": "; kozmetikai változtatások", "cosmetic_changes-standalone": "Bot: kozmetikai változtatások" } diff --git a/cosmetic_changes/hy.json b/cosmetic_changes/hy.json index da63766..e32ec35 100644 --- a/cosmetic_changes/hy.json +++ b/cosmetic_changes/hy.json @@ -5,6 +5,5 @@ "Աշոտ1997" ] }, - "cosmetic_changes-append": "; կոսմետիկ փոփոխություններ", "cosmetic_changes-standalone": "Բոտ: կոսմետիկ փոփոխություններ" } diff --git a/cosmetic_changes/ia.json b/cosmetic_changes/ia.json index 5717223..6fd5c9b 100644 --- a/cosmetic_changes/ia.json +++ b/cosmetic_changes/ia.json @@ -2,6 +2,5 @@ "@metadata": { "authors": [] }, - "cosmetic_changes-append": "; cambios cosmetic", "cosmetic_changes-standalone": "Robot: Cambios cosmetic" } diff --git a/cosmetic_changes/id.json b/cosmetic_changes/id.json index 9752a2c..564f657 100644 --- a/cosmetic_changes/id.json +++ b/cosmetic_changes/id.json @@ -8,6 +8,5 @@ "Totosunarto" ] }, - "cosmetic_changes-append": "; perubahan kosmetika", "cosmetic_changes-standalone": "Bot: Perubahan kosmetika" } diff --git a/cosmetic_changes/ie.json b/cosmetic_changes/ie.json index f8fa1da..964407a 100644 --- a/cosmetic_changes/ie.json +++ b/cosmetic_changes/ie.json @@ -4,6 +4,5 @@ "Renan" ] }, - "cosmetic_changes-append": "; changes cosmetic", "cosmetic_changes-standalone": "Machine: Changes cosmetic" } diff --git a/cosmetic_changes/ig.json b/cosmetic_changes/ig.json index a2faed7..36c10b6 100644 --- a/cosmetic_changes/ig.json +++ b/cosmetic_changes/ig.json @@ -4,6 +4,5 @@ "Ukabia" ] }, - "cosmetic_changes-append": "; mgbanwe na ihü", "cosmetic_changes-standalone": "Rọbọt: Mgbanwe na ihü" } diff --git a/cosmetic_changes/ilo.json b/cosmetic_changes/ilo.json index d8ae992..d2d8c3c 100644 --- a/cosmetic_changes/ilo.json +++ b/cosmetic_changes/ilo.json @@ -4,6 +4,5 @@ "Lam-ang" ] }, - "cosmetic_changes-append": "; babassit laeng a panagsukat", "cosmetic_changes-standalone": "Robot: Babassit laeng a panagsukat" } diff --git a/cosmetic_changes/io.json b/cosmetic_changes/io.json index 5fa0974..c1d061d 100644 --- a/cosmetic_changes/io.json +++ b/cosmetic_changes/io.json @@ -4,6 +4,5 @@ "Joao Xavier" ] }, - "cosmetic_changes-append": "; modifikuri por plubeligar", "cosmetic_changes-standalone": "Bot: Modifikuri por plubeligar" } diff --git a/cosmetic_changes/is.json b/cosmetic_changes/is.json index 7ff0bd8..219028a 100644 --- a/cosmetic_changes/is.json +++ b/cosmetic_changes/is.json @@ -4,6 +4,5 @@ "Snævar" ] }, - "cosmetic_changes-append": "; útlitsbreytingar", "cosmetic_changes-standalone": "Vélmenni: Útlitsbreytingar" } diff --git a/cosmetic_changes/it.json b/cosmetic_changes/it.json index 8965ef3..090ceac 100644 --- a/cosmetic_changes/it.json +++ b/cosmetic_changes/it.json @@ -2,6 +2,5 @@ "@metadata": { "authors": [] }, - "cosmetic_changes-append": "; modifiche estetiche", "cosmetic_changes-standalone": "Bot: Modifiche estetiche" } diff --git a/cosmetic_changes/ja.json b/cosmetic_changes/ja.json index 4805480..8845990 100644 --- a/cosmetic_changes/ja.json +++ b/cosmetic_changes/ja.json @@ -4,6 +4,5 @@ "Otokoume" ] }, - "cosmetic_changes-append": "; 細部の編集", "cosmetic_changes-standalone": "ボットによる: 細部の編集" } diff --git a/cosmetic_changes/jv.json b/cosmetic_changes/jv.json index ba06ab3..f6d2a25 100644 --- a/cosmetic_changes/jv.json +++ b/cosmetic_changes/jv.json @@ -4,6 +4,5 @@ "NoiX180" ] }, - "cosmetic_changes-append": "; owahan kosmètik", "cosmetic_changes-standalone": "Bot: Owahan kosmètik" } diff --git a/cosmetic_changes/kk.json b/cosmetic_changes/kk.json index 445fe34..926818b 100644 --- a/cosmetic_changes/kk.json +++ b/cosmetic_changes/kk.json @@ -4,6 +4,5 @@ "Arystanbek" ] }, - "cosmetic_changes-append": "; безендіру өзгерістері", "cosmetic_changes-standalone": "Бот: Безендіру өзгерістері" } diff --git a/cosmetic_changes/kn.json b/cosmetic_changes/kn.json index ccce585..1c5cf87 100644 --- a/cosmetic_changes/kn.json +++ b/cosmetic_changes/kn.json @@ -4,6 +4,5 @@ "Akoppad" ] }, - "cosmetic_changes-append": "ಅಂದಗೊಳಿಸುವ ಬದಲಾವಣೆಗಳು", "cosmetic_changes-standalone": "ರೋಬೋಟ್: ಕಾಂತಿವರ್ಧಕ ಬದಲಾವಣೆಗಳು" } diff --git a/cosmetic_changes/ko.json b/cosmetic_changes/ko.json index fcff883..2c38589 100644 --- a/cosmetic_changes/ko.json +++ b/cosmetic_changes/ko.json @@ -4,6 +4,5 @@ "IRTC1015" ] }, - "cosmetic_changes-append": "; 예쁘게 바꿈", "cosmetic_changes-standalone": "봇: 예쁘게 바꿈" } diff --git a/cosmetic_changes/ksh.json b/cosmetic_changes/ksh.json index d6186f0..894dfec 100644 --- a/cosmetic_changes/ksh.json +++ b/cosmetic_changes/ksh.json @@ -4,6 +4,5 @@ "Purodha" ] }, - "cosmetic_changes-append": "; Änderonge för de Schönheit", "cosmetic_changes-standalone": "Bot: Änderonge för de Schönheit" } diff --git a/cosmetic_changes/ky.json b/cosmetic_changes/ky.json index 8017c19..4b04202 100644 --- a/cosmetic_changes/ky.json +++ b/cosmetic_changes/ky.json @@ -4,6 +4,5 @@ "Growingup" ] }, - "cosmetic_changes-append": "; косметикалык өзгөртүүлөр", "cosmetic_changes-standalone": "бот: косметикалык өзгөртүүлөр" } diff --git a/cosmetic_changes/la.json b/cosmetic_changes/la.json index b74dfba..942fee9 100644 --- a/cosmetic_changes/la.json +++ b/cosmetic_changes/la.json @@ -2,6 +2,5 @@ "@metadata": { "authors": [] }, - "cosmetic_changes-append": "; mutationes minores", "cosmetic_changes-standalone": "automaton: mutationes minores" } diff --git a/cosmetic_changes/lb.json b/cosmetic_changes/lb.json index 1e4c14a..a6cb43f 100644 --- a/cosmetic_changes/lb.json +++ b/cosmetic_changes/lb.json @@ -4,6 +4,5 @@ "Robby" ] }, - "cosmetic_changes-append": "; kosmetesch Ännerungen", "cosmetic_changes-standalone": "Bot: Kosmetesch Ännerungen" } diff --git a/cosmetic_changes/li.json b/cosmetic_changes/li.json index 2de84cc..eeb035c 100644 --- a/cosmetic_changes/li.json +++ b/cosmetic_changes/li.json @@ -4,6 +4,5 @@ "Pahles" ] }, - "cosmetic_changes-append": "; cosmetische verangeringe", "cosmetic_changes-standalone": "Robot: cosmetische verangeringe" } diff --git a/cosmetic_changes/lt.json b/cosmetic_changes/lt.json index 3ccfeb4..2ec25e4 100644 --- a/cosmetic_changes/lt.json +++ b/cosmetic_changes/lt.json @@ -2,6 +2,5 @@ "@metadata": { "authors": [] }, - "cosmetic_changes-append": "; smulkūs taisymai", "cosmetic_changes-standalone": "robotas: smulkūs taisymai" } diff --git a/cosmetic_changes/lv.json b/cosmetic_changes/lv.json index fd82477..f25613c 100644 --- a/cosmetic_changes/lv.json +++ b/cosmetic_changes/lv.json @@ -2,6 +2,5 @@ "@metadata": { "authors": [] }, - "cosmetic_changes-append": "; kosmētiskās izmaiņas", "cosmetic_changes-standalone": "robots kosmētiskās izmaiņas" } diff --git a/cosmetic_changes/map-bms.json b/cosmetic_changes/map-bms.json index 0f97e82..4338f67 100644 --- a/cosmetic_changes/map-bms.json +++ b/cosmetic_changes/map-bms.json @@ -4,6 +4,5 @@ "StefanusRA" ] }, - "cosmetic_changes-append": "; owahan kosmetika", "cosmetic_changes-standalone": "Bot: Owahan kosmetika" } diff --git a/cosmetic_changes/mg.json b/cosmetic_changes/mg.json index 2726351..d3d7c0b 100644 --- a/cosmetic_changes/mg.json +++ b/cosmetic_changes/mg.json @@ -4,6 +4,5 @@ "Jagwar" ] }, - "cosmetic_changes-append": "; fanovana arak'endrika.", "cosmetic_changes-standalone": "Rôbô : Fanovana arak'endrika" } diff --git a/cosmetic_changes/min.json b/cosmetic_changes/min.json index 9e8f868..ee76075 100644 --- a/cosmetic_changes/min.json +++ b/cosmetic_changes/min.json @@ -5,6 +5,5 @@ "Luthfi94" ] }, - "cosmetic_changes-append": "; parubahan kosmetik", "cosmetic_changes-standalone": "Robot: Parubahan kosmetika" } diff --git a/cosmetic_changes/mk.json b/cosmetic_changes/mk.json index 9e3b2bb..013e7be 100644 --- a/cosmetic_changes/mk.json +++ b/cosmetic_changes/mk.json @@ -2,6 +2,5 @@ "@metadata": { "authors": [] }, - "cosmetic_changes-append": "; козметички промени", "cosmetic_changes-standalone": "Бот: козметички промени" } diff --git a/cosmetic_changes/ml.json b/cosmetic_changes/ml.json index afd063b..6122044 100644 --- a/cosmetic_changes/ml.json +++ b/cosmetic_changes/ml.json @@ -4,6 +4,5 @@ "Praveenp" ] }, - "cosmetic_changes-append": "; സൗന്ദര്യമാറ്റങ്ങൾ", "cosmetic_changes-standalone": "യന്ത്രം: സൗന്ദര്യമാറ്റങ്ങൾ" } diff --git a/cosmetic_changes/mr.json b/cosmetic_changes/mr.json index eb6708c..2d808aa 100644 --- a/cosmetic_changes/mr.json +++ b/cosmetic_changes/mr.json @@ -4,6 +4,5 @@ "V.narsikar" ] }, - "cosmetic_changes-append": ";सौंदर्यवर्धक बदल", "cosmetic_changes-standalone": "यंत्रमानव:सौंदर्यवर्धक बदल" } diff --git a/cosmetic_changes/ms.json b/cosmetic_changes/ms.json index c2bf6b0..c654246 100644 --- a/cosmetic_changes/ms.json +++ b/cosmetic_changes/ms.json @@ -2,6 +2,5 @@ "@metadata": { "authors": [] }, - "cosmetic_changes-append": "; perubahan kosmetik", "cosmetic_changes-standalone": "Bot: perubahan kosmetik" } diff --git a/cosmetic_changes/mt.json b/cosmetic_changes/mt.json index 5ebf805..9dd44d2 100644 --- a/cosmetic_changes/mt.json +++ b/cosmetic_changes/mt.json @@ -2,6 +2,5 @@ "@metadata": { "authors": [] }, - "cosmetic_changes-append": "; kosmetiċi bidliet", "cosmetic_changes-standalone": "Bot: kosmetiċi bidliet" } diff --git a/cosmetic_changes/nan.json b/cosmetic_changes/nan.json index b2cb2a9..a9bd691 100644 --- a/cosmetic_changes/nan.json +++ b/cosmetic_changes/nan.json @@ -5,6 +5,5 @@ "Luuva" ] }, - "cosmetic_changes-append": "; sió hāng siu-kái", "cosmetic_changes-standalone": "Bot: Sió hāng siu-kái" } diff --git a/cosmetic_changes/nb.json b/cosmetic_changes/nb.json index 3040890..a9614d8 100644 --- a/cosmetic_changes/nb.json +++ b/cosmetic_changes/nb.json @@ -4,6 +4,5 @@ "SuperPotato" ] }, - "cosmetic_changes-append": "; kosmetiske endringer", "cosmetic_changes-standalone": "Robot: Kosmetiske endringer" } diff --git a/cosmetic_changes/nds-nl.json b/cosmetic_changes/nds-nl.json index 22f86e2..503e727 100644 --- a/cosmetic_changes/nds-nl.json +++ b/cosmetic_changes/nds-nl.json @@ -4,6 +4,5 @@ "Servien" ] }, - "cosmetic_changes-append": "; kosmetiske wysigingen", "cosmetic_changes-standalone": "Bot: kosmetiske wysigingen" } diff --git a/cosmetic_changes/nds.json b/cosmetic_changes/nds.json index 67966d4..4d1c7e7 100644 --- a/cosmetic_changes/nds.json +++ b/cosmetic_changes/nds.json @@ -4,6 +4,5 @@ "Slomox" ] }, - "cosmetic_changes-append": "; kosmeetsch Ännern", "cosmetic_changes-standalone": "Bot: kosmeetsch Ännern" } diff --git a/cosmetic_changes/ne.json b/cosmetic_changes/ne.json index d1787c9..f9a484a 100644 --- a/cosmetic_changes/ne.json +++ b/cosmetic_changes/ne.json @@ -4,6 +4,5 @@ "सरोज कुमार ढकाल" ] }, - "cosmetic_changes-append": "; कस्मेटिक परिवर्तनहरू", "cosmetic_changes-standalone": "रोबोट: कस्मेटिक परिवर्तनहरू" } diff --git a/cosmetic_changes/nl.json b/cosmetic_changes/nl.json index 49710d9..0bb47d1 100644 --- a/cosmetic_changes/nl.json +++ b/cosmetic_changes/nl.json @@ -4,6 +4,5 @@ "Siebrand" ] }, - "cosmetic_changes-append": "; cosmetische wijzigingen", "cosmetic_changes-standalone": "Robot: cosmetische wijzigingen" } diff --git a/cosmetic_changes/nn.json b/cosmetic_changes/nn.json index 947f641..2d18fe8 100644 --- a/cosmetic_changes/nn.json +++ b/cosmetic_changes/nn.json @@ -5,6 +5,5 @@ "Njardarlogar" ] }, - "cosmetic_changes-append": "; kosmetiske endringar", "cosmetic_changes-standalone": "robot: kosmetiske endringar" } diff --git a/cosmetic_changes/nqo.json b/cosmetic_changes/nqo.json index 750e1a1..02fcd35 100644 --- a/cosmetic_changes/nqo.json +++ b/cosmetic_changes/nqo.json @@ -4,6 +4,5 @@ "Lancine.kounfantoh.fofana" ] }, - "cosmetic_changes-append": "; ߡߊ߬ߞߋ߲߰ߧߊ߬ߟߌ ߡߝߊ߬ߟߋ߲߬ߠߌ߲ ߠߎ߬", "cosmetic_changes-standalone": "ߡߐ߰ߡߐ߮: ߡߊ߬ߞߋ߲߰ߧߊ߬ߟߌ ߡߝߊ߬ߟߋ߲߬ߠߌ߲" } diff --git a/cosmetic_changes/oc.json b/cosmetic_changes/oc.json index 3540abc..216f205 100644 --- a/cosmetic_changes/oc.json +++ b/cosmetic_changes/oc.json @@ -4,6 +4,5 @@ "Cedric31" ] }, - "cosmetic_changes-append": "; cambiaments de tipe cosmetic", "cosmetic_changes-standalone": "Robòt : Modificacions de tipe cosmetic" } diff --git a/cosmetic_changes/or.json b/cosmetic_changes/or.json index 58af024..42f178a 100644 --- a/cosmetic_changes/or.json +++ b/cosmetic_changes/or.json @@ -5,6 +5,5 @@ "Shisir 1945" ] }, - "cosmetic_changes-append": "; କସମେଟିକ ବଦଳ", "cosmetic_changes-standalone": "ରୋବଟ୍‌: ପ୍ରସାଧନ ବଦଳ" } diff --git a/cosmetic_changes/pdc.json b/cosmetic_changes/pdc.json index c8bd296..0017cf6 100644 --- a/cosmetic_changes/pdc.json +++ b/cosmetic_changes/pdc.json @@ -2,6 +2,5 @@ "@metadata": { "authors": [] }, - "cosmetic_changes-append": "; gleenere Enneringe", "cosmetic_changes-standalone": "Waddefresser: gleenere Enneringe" } diff --git a/cosmetic_changes/pfl.json b/cosmetic_changes/pfl.json index fe088d3..5e067e0 100644 --- a/cosmetic_changes/pfl.json +++ b/cosmetic_changes/pfl.json @@ -2,6 +2,5 @@ "@metadata": { "authors": [] }, - "cosmetic_changes-append": "; klännere Ännerunge", "cosmetic_changes-standalone": "Bot: Klännere Ännerunge" } diff --git a/cosmetic_changes/pl.json b/cosmetic_changes/pl.json index 22ef8ca..99e1199 100644 --- a/cosmetic_changes/pl.json +++ b/cosmetic_changes/pl.json @@ -4,6 +4,5 @@ "Sp5uhe" ] }, - "cosmetic_changes-append": "; zmiany kosmetyczne", "cosmetic_changes-standalone": "Robot wykonał kosmetyczne poprawki" } diff --git a/cosmetic_changes/pms.json b/cosmetic_changes/pms.json index b1d11ac..e83d40e 100644 --- a/cosmetic_changes/pms.json +++ b/cosmetic_changes/pms.json @@ -4,6 +4,5 @@ "Borichèt" ] }, - "cosmetic_changes-append": "; cangiament cosmétich", "cosmetic_changes-standalone": "Trigomiro: Cangiament cosmétich" } diff --git a/cosmetic_changes/pt-br.json b/cosmetic_changes/pt-br.json index 8794634..3ba322a 100644 --- a/cosmetic_changes/pt-br.json +++ b/cosmetic_changes/pt-br.json @@ -5,6 +5,5 @@ 555 ] }, - "cosmetic_changes-append": "; mudanças triviais", "cosmetic_changes-standalone": "Bot: Mudanças triviais" } diff --git a/cosmetic_changes/pt.json b/cosmetic_changes/pt.json index 24f1c67..d0521ea 100644 --- a/cosmetic_changes/pt.json +++ b/cosmetic_changes/pt.json @@ -4,6 +4,5 @@ "Hamilton Abreu" ] }, - "cosmetic_changes-append": "; mudanças triviais", "cosmetic_changes-standalone": "Robô: Mudanças triviais" } diff --git a/cosmetic_changes/ro.json b/cosmetic_changes/ro.json index c47edaf..02f6596 100644 --- a/cosmetic_changes/ro.json +++ b/cosmetic_changes/ro.json @@ -4,6 +4,5 @@ "Minisarm" ] }, - "cosmetic_changes-append": "; modificări cosmetice", "cosmetic_changes-standalone": "Robot: Modificări cosmetice" } diff --git a/cosmetic_changes/ru.json b/cosmetic_changes/ru.json index 6fa2dbe..d5c861f 100644 --- a/cosmetic_changes/ru.json +++ b/cosmetic_changes/ru.json @@ -5,6 +5,5 @@ "Volkov" ] }, - "cosmetic_changes-append": "; косметические изменения", "cosmetic_changes-standalone": "Бот: косметические изменения" } diff --git a/cosmetic_changes/sco.json b/cosmetic_changes/sco.json index 288e95b..13efec0 100644 --- a/cosmetic_changes/sco.json +++ b/cosmetic_changes/sco.json @@ -4,6 +4,5 @@ "Avicennasis" ] }, - "cosmetic_changes-append": "; cosmetic chynges", "cosmetic_changes-standalone": "Robot: Cosmetic chynges" } diff --git a/cosmetic_changes/sd.json b/cosmetic_changes/sd.json index ae5e95d..4911b13 100644 --- a/cosmetic_changes/sd.json +++ b/cosmetic_changes/sd.json @@ -4,6 +4,5 @@ "Mehtab ahmed" ] }, - "cosmetic_changes-append": "ڪاسميٽڪ تبديليون", "cosmetic_changes-standalone": "بوٽ: ڪاسميٽڪ تبديليون" } diff --git a/cosmetic_changes/sh.json b/cosmetic_changes/sh.json index 8685994..39256d9 100644 --- a/cosmetic_changes/sh.json +++ b/cosmetic_changes/sh.json @@ -4,6 +4,5 @@ "Kolega2357" ] }, - "cosmetic_changes-append": "; kozmetičke izmjene", "cosmetic_changes-standalone": "Bot: kozmetičke izmjene" } diff --git a/cosmetic_changes/si.json b/cosmetic_changes/si.json index 0184172..c6655e0 100644 --- a/cosmetic_changes/si.json +++ b/cosmetic_changes/si.json @@ -4,6 +4,5 @@ "පසිඳු කාවින්ද" ] }, - "cosmetic_changes-append": "; අංගරාග වෙනස්කම්", "cosmetic_changes-standalone": "රොබෝ: අංගරාග වෙනස්කම්" } diff --git a/cosmetic_changes/sk.json b/cosmetic_changes/sk.json index cc7325d..501d058 100644 --- a/cosmetic_changes/sk.json +++ b/cosmetic_changes/sk.json @@ -4,6 +4,5 @@ "Yardom78" ] }, - "cosmetic_changes-append": "; kozmetické zmeny", "cosmetic_changes-standalone": "Bot: Kozmetické úpravy" } diff --git a/cosmetic_changes/sl.json b/cosmetic_changes/sl.json index 38b23d0..46661ce 100644 --- a/cosmetic_changes/sl.json +++ b/cosmetic_changes/sl.json @@ -4,6 +4,5 @@ "Mateju" ] }, - "cosmetic_changes-append": "; oblikovne spremembe", "cosmetic_changes-standalone": "Robot: oblikovne spremembe" } diff --git a/cosmetic_changes/so.json b/cosmetic_changes/so.json index fd56766..6e2a5cf 100644 --- a/cosmetic_changes/so.json +++ b/cosmetic_changes/so.json @@ -4,6 +4,5 @@ "Abshirdheere" ] }, - "cosmetic_changes-append": "; Badal qurxin ah", "cosmetic_changes-standalone": "Bot: Badal qurxin ah" } diff --git a/cosmetic_changes/sq.json b/cosmetic_changes/sq.json index 8c5c966..7fdf189 100644 --- a/cosmetic_changes/sq.json +++ b/cosmetic_changes/sq.json @@ -4,6 +4,5 @@ "Vinie007" ] }, - "cosmetic_changes-append": "; Ndryshime kozmetike", "cosmetic_changes-standalone": "Robot: ndryshime kozmetike" } diff --git a/cosmetic_changes/sr.json b/cosmetic_changes/sr.json index 652ad0a..092f916 100644 --- a/cosmetic_changes/sr.json +++ b/cosmetic_changes/sr.json @@ -7,6 +7,5 @@ "Zoranzoki21" ] }, - "cosmetic_changes-append": "; козметичке измене", "cosmetic_changes-standalone": "Бот: козметичке измене." } diff --git a/cosmetic_changes/su.json b/cosmetic_changes/su.json index bc29d9d..c5d841f 100644 --- a/cosmetic_changes/su.json +++ b/cosmetic_changes/su.json @@ -4,6 +4,5 @@ "Uchup19" ] }, - "cosmetic_changes-append": "; parobahan kosmétik", "cosmetic_changes-standalone": "Bot: Parobahan kosmétik" } diff --git a/cosmetic_changes/sv.json b/cosmetic_changes/sv.json index d6cfd87..77b673f 100644 --- a/cosmetic_changes/sv.json +++ b/cosmetic_changes/sv.json @@ -2,6 +2,5 @@ "@metadata": { "authors": [] }, - "cosmetic_changes-append": "; kosmetiska ändringar", "cosmetic_changes-standalone": "Bot: Kosmetiska ändringar" } diff --git a/cosmetic_changes/szl.json b/cosmetic_changes/szl.json index b904e6f..bab1a66 100644 --- a/cosmetic_changes/szl.json +++ b/cosmetic_changes/szl.json @@ -5,6 +5,5 @@ "Przemub" ] }, - "cosmetic_changes-append": "; kůsmetyko", "cosmetic_changes-standalone": "Robot bajstluje kůsmetyczne sprowjyńa" } diff --git a/cosmetic_changes/ta.json b/cosmetic_changes/ta.json index 002120f..b374b7b 100644 --- a/cosmetic_changes/ta.json +++ b/cosmetic_changes/ta.json @@ -4,6 +4,5 @@ "செல்வா" ] }, - "cosmetic_changes-append": "; மேலோட்டமான மாற்றங்கள்", "cosmetic_changes-standalone": "தானியங்கி: மேலோட்டமான மாற்றங்கள்" } diff --git a/cosmetic_changes/te.json b/cosmetic_changes/te.json index 52278d3..a71db1f 100644 --- a/cosmetic_changes/te.json +++ b/cosmetic_changes/te.json @@ -4,6 +4,5 @@ "Veeven" ] }, - "cosmetic_changes-append": "; పైపై మార్పులు", "cosmetic_changes-standalone": "బాటు: పైపై మార్పులు" } diff --git a/cosmetic_changes/th.json b/cosmetic_changes/th.json index bb66c14..3800972 100644 --- a/cosmetic_changes/th.json +++ b/cosmetic_changes/th.json @@ -5,6 +5,5 @@ "Octahedron80" ] }, - "cosmetic_changes-append": "; ปรับแต่งให้อ่านง่าย", "cosmetic_changes-standalone": "บอต: ปรับแต่งให้อ่านง่าย" } diff --git a/cosmetic_changes/tk.json b/cosmetic_changes/tk.json index c654f52..c3e891c 100644 --- a/cosmetic_changes/tk.json +++ b/cosmetic_changes/tk.json @@ -2,6 +2,5 @@ "@metadata": { "authors": [] }, - "cosmetic_changes-append": "; kosmetik üýtgeşme", "cosmetic_changes-standalone": "Bot: kosmetik üýtgeşme" } diff --git a/cosmetic_changes/tl.json b/cosmetic_changes/tl.json index 3e11efc..306af64 100644 --- a/cosmetic_changes/tl.json +++ b/cosmetic_changes/tl.json @@ -2,6 +2,5 @@ "@metadata": { "authors": [] }, - "cosmetic_changes-append": "; Kosmetiko pagbabago", "cosmetic_changes-standalone": "robot Kosmetiko pagbabago" } diff --git a/cosmetic_changes/tly.json b/cosmetic_changes/tly.json index 6ca45e5..a1b80c0 100644 --- a/cosmetic_changes/tly.json +++ b/cosmetic_changes/tly.json @@ -4,6 +4,5 @@ "Гусейн" ] }, - "cosmetic_changes-append": "; косметикә дәгишон", "cosmetic_changes-standalone": "Робот: Косметикә дәгишон" } diff --git a/cosmetic_changes/tr.json b/cosmetic_changes/tr.json index ef524c7..109538e 100644 --- a/cosmetic_changes/tr.json +++ b/cosmetic_changes/tr.json @@ -5,6 +5,5 @@ "Stultiwikia" ] }, - "cosmetic_changes-append": "; kozmetik değişiklikler", "cosmetic_changes-standalone": "Bot: Kozmetik değişiklikler" } diff --git a/cosmetic_changes/tt.json b/cosmetic_changes/tt.json index d334c53..32b4d87 100644 --- a/cosmetic_changes/tt.json +++ b/cosmetic_changes/tt.json @@ -5,6 +5,5 @@ "Ерней" ] }, - "cosmetic_changes-append": "; бизәнү үзгәрешләре", "cosmetic_changes-standalone": "Бот: бизәнү үзгәрешләре" } diff --git a/cosmetic_changes/uk.json b/cosmetic_changes/uk.json index f70863b..fe28639 100644 --- a/cosmetic_changes/uk.json +++ b/cosmetic_changes/uk.json @@ -4,6 +4,5 @@ "Ата" ] }, - "cosmetic_changes-append": "; косметичні зміни", "cosmetic_changes-standalone": "Бот: Косметичні зміни" } diff --git a/cosmetic_changes/ur.json b/cosmetic_changes/ur.json index f0521bf..d06fdee 100644 --- a/cosmetic_changes/ur.json +++ b/cosmetic_changes/ur.json @@ -5,6 +5,5 @@ "Muhammad Shuaib" ] }, - "cosmetic_changes-append": "؛ تزئینی تبدیلیاں", "cosmetic_changes-standalone": "خودکار: تزئینی تبدیلیاں" } diff --git a/cosmetic_changes/uz.json b/cosmetic_changes/uz.json index 10a8e3d..53972a7 100644 --- a/cosmetic_changes/uz.json +++ b/cosmetic_changes/uz.json @@ -4,6 +4,5 @@ "CoderSI" ] }, - "cosmetic_changes-append": "; kosmetik oʻzgarishlar", "cosmetic_changes-standalone": "Bot: Kosmetik oʻzgarishlar" } diff --git a/cosmetic_changes/vec.json b/cosmetic_changes/vec.json index 0ec1fdf..c9797a1 100644 --- a/cosmetic_changes/vec.json +++ b/cosmetic_changes/vec.json @@ -6,6 +6,5 @@ "GatoSelvadego" ] }, - "cosmetic_changes-append": "; modifeghe esteteghe", "cosmetic_changes-standalone": "Robot: Modifeghe esteteghe" } diff --git a/cosmetic_changes/vep.json b/cosmetic_changes/vep.json index 2bd34a1..4b28d4b 100644 --- a/cosmetic_changes/vep.json +++ b/cosmetic_changes/vep.json @@ -4,6 +4,5 @@ "Emaus" ] }, - "cosmetic_changes-append": "; kosmetižed toižetused", "cosmetic_changes-standalone": "Bot: kosmetižed toižetused" } diff --git a/cosmetic_changes/vi.json b/cosmetic_changes/vi.json index 5707a35..bbd76f8 100644 --- a/cosmetic_changes/vi.json +++ b/cosmetic_changes/vi.json @@ -4,6 +4,5 @@ "Minh Nguyen" ] }, - "cosmetic_changes-append": "; sửa cách trình bày", "cosmetic_changes-standalone": "Bot: Sửa cách trình bày" } diff --git a/cosmetic_changes/vo.json b/cosmetic_changes/vo.json index a123588..a83af36 100644 --- a/cosmetic_changes/vo.json +++ b/cosmetic_changes/vo.json @@ -4,6 +4,5 @@ "Malafaya" ] }, - "cosmetic_changes-append": "; votükams dekik", "cosmetic_changes-standalone": "Bot: Votükams dekik" } diff --git a/cosmetic_changes/war.json b/cosmetic_changes/war.json index 340912c..3f959cb 100644 --- a/cosmetic_changes/war.json +++ b/cosmetic_changes/war.json @@ -2,6 +2,5 @@ "@metadata": { "authors": [] }, - "cosmetic_changes-append": "; kosmetiko nga mga pagbag-o", "cosmetic_changes-standalone": "Robot: Kosmetiko nga mga pagbag-o" } diff --git a/cosmetic_changes/yi.json b/cosmetic_changes/yi.json index 7c5cd2b..b36be5b 100644 --- a/cosmetic_changes/yi.json +++ b/cosmetic_changes/yi.json @@ -2,6 +2,5 @@ "@metadata": { "authors": [] }, - "cosmetic_changes-append": "; קאסמעטישע ענדערונגען", "cosmetic_changes-standalone": "באט: קאסמעטישע ענדערונגען" } diff --git a/cosmetic_changes/zh.json b/cosmetic_changes/zh.json index de9d164..8f8e299 100644 --- a/cosmetic_changes/zh.json +++ b/cosmetic_changes/zh.json @@ -5,6 +5,5 @@ "Yfdyh000" ] }, - "cosmetic_changes-append": "；整理源码", "cosmetic_changes-standalone": "机器人：整理源码" } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/836754 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: Iac8458a5a07110d57bc0fbe1882f38a295b0911c Gerrit-Change-Number: 836754 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]: [IMPR] Simplify access to Match object
by jenkins-bot (Code Review) 28 Sep '22

28 Sep '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/836138 ) Change subject: [IMPR] Simplify access to Match object ...................................................................... [IMPR] Simplify access to Match object With Python 3.6 Match object has a __getitem__ method. Change-Id: I2e3e4073d317eb23b7ba040642e82edfbe471cdd --- M docs/conf.py M docs/recipes.rst M pywikibot/comms/http.py M pywikibot/cosmetic_changes.py M pywikibot/data/api/_login.py M pywikibot/data/api/_requests.py M pywikibot/date.py M pywikibot/i18n.py M pywikibot/page/_links.py M pywikibot/page/_pages.py M pywikibot/pagegenerators/_generators.py M pywikibot/proofreadpage.py M pywikibot/site/_apisite.py M pywikibot/site/_siteinfo.py M pywikibot/textlib.py M pywikibot/time.py M pywikibot/tools/__init__.py M pywikibot/tools/_deprecate.py M pywikibot/tools/djvu.py M pywikibot/tools/threading.py M pywikibot/xmlreader.py M scripts/archivebot.py M scripts/category.py M scripts/checkimages.py M scripts/commonscat.py M scripts/dataextend.py M scripts/fixing_redirects.py M scripts/harvest_template.py M scripts/misspelling.py M scripts/noreferences.py M scripts/pagefromfile.py M scripts/redirect.py M scripts/reflinks.py M scripts/solve_disambiguation.py M scripts/upload.py M scripts/weblinkchecker.py M tests/api_tests.py M tests/aspects.py M tests/textlib_tests.py M tests/timestripper_tests.py 40 files changed, 218 insertions(+), 225 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/conf.py b/docs/conf.py index 3aabf0c..55fdafc 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -447,7 +447,7 @@ # Indent options match = re.match(r'-[^ ]+? +', line) if match: - length = len(match.group(0)) + length = len(match[0]) lines[index] = ' ' + line elif length and line.startswith(' ' * length): # Indent descriptions of options (as options are indented) diff --git a/docs/recipes.rst b/docs/recipes.rst index 76e5b84..5e335ed 100644 --- a/docs/recipes.rst +++ b/docs/recipes.rst @@ -17,7 +17,7 @@ >>> site = pywikibot.Site('wikipedia:en') # create a Site object >>> page = pywikibot.Page(site, 'Deep learning') # create a Page object >>> sect = textlib.extract_sections(page.text, site) # divide content into sections - >>> links = sorted(link.group('title') for link in pywikibot.link_regex.finditer(sect.head)) + >>> links = sorted(link['title'] for link in pywikibot.link_regex.finditer(sect.header)) >>> pages = [pywikibot.Page(site, title) for title in links] ``links`` is a list containing all link titles in alphabethical order. diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index 8b492f6..48f74c8 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -410,7 +410,7 @@ m = CHARSET_RE.search(content_type) if not m: return None - charset = m.group('charset').strip('"\' ').lower() + charset = m['charset'].strip('"\' ').lower() # Convert to python correct encoding names if re.sub(r'[ _\-]', '', charset) == 'xeucjp': charset = 'euc_jp' @@ -443,7 +443,7 @@ m = re.search( br'encoding=(["\'])(?P<encoding>.+?)\1', header) if m: - header_encoding = m.group('encoding').decode('utf-8') + header_encoding = m['encoding'].decode('utf-8') else: header_encoding = 'utf-8' else: diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py index 484e784..569f081 100644 --- a/pywikibot/cosmetic_changes.py +++ b/pywikibot/cosmetic_changes.py @@ -194,7 +194,7 @@ raise NotImplementedError( 'ISBN functionality not available. Install stdnum package.') - isbn = match.group('code') + isbn = match['code'] try: stdnum_isbn.validate(isbn) except stdnum_isbn.ValidationError as e: @@ -519,10 +519,10 @@ # helper function which works on one link and either returns it # unmodified, or returns a replacement. def handleOneLink(match: Match[str]) -> str: - titleWithSection = match.group('titleWithSection') - label = match.group('label') - trailingChars = match.group('linktrail') - newline = match.group('newline') + titleWithSection = match['titleWithSection'] + label = match['label'] + trailingChars = match['linktrail'] + newline = match['newline'] is_interwiki = self.site.isInterwikiLink(titleWithSection) if is_interwiki: @@ -819,11 +819,13 @@ if re.match(r'(?:{}):' .format('|'.join((*self.site.namespaces[6], *self.site.namespaces[14]))), - match.group('link')): + match['link']): replacement += ':' - replacement += match.group('link') - if match.group('title'): - replacement += '|' + match.group('title') + + replacement += match['link'] + if match['title']: + replacement += '|' + match['title'] + return replacement + ']]' exceptions = ['comment', 'math', 'nowiki', 'pre', 'startspace', @@ -898,8 +900,8 @@ """Relace html markups with wikitext markups.""" def replace_header(match: Match[str]) -> str: """Create a header string for replacing.""" - depth = int(match.group(1)) - return r'{0} {1} {0}'.format('=' * depth, match.group(2)) + depth = int(match[1]) + return r'{0} {1} {0}'.format('=' * depth, match[2]) # Everything case-insensitive (?i) # Keep in mind that MediaWiki automatically converts <br> to <br /> diff --git a/pywikibot/data/api/_login.py b/pywikibot/data/api/_login.py index cedc9a7..11de1ae 100644 --- a/pywikibot/data/api/_login.py +++ b/pywikibot/data/api/_login.py @@ -143,8 +143,7 @@ else: match = re.search(r'(\d+) (seconds|minutes)', fail_reason) if match: - delta = datetime.timedelta( - **{match.group(2): int(match.group(1))}) + delta = datetime.timedelta(**{match[2]: int(match[1])}) else: delta = datetime.timedelta() self._waituntil = datetime.datetime.now() + delta diff --git a/pywikibot/data/api/_requests.py b/pywikibot/data/api/_requests.py index 6e930da..70d1207 100644 --- a/pywikibot/data/api/_requests.py +++ b/pywikibot/data/api/_requests.py @@ -1028,7 +1028,7 @@ lag = error['lag'] except KeyError: lag = lagpattern.search(info) - lag = float(lag.group('lag')) if lag else 0.0 + lag = float(lag['lag']) if lag else 0.0 self.site.throttle.lag(lag * retries) continue diff --git a/pywikibot/date.py b/pywikibot/date.py index 5e167f2..3f35e63 100644 --- a/pywikibot/date.py +++ b/pywikibot/date.py @@ -515,8 +515,7 @@ m = compPattern.match(value) if m: # decode each found value using provided decoder - values = [decoder[2](m.group(i + 1)) - for i, decoder in enumerate(decoders)] + values = [decoder[2](m[i + 1]) for i, decoder in enumerate(decoders)] decValue = decf(values) assert not isinstance(decValue, str), \ diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index 079b67f..f94a176 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -456,8 +456,8 @@ return plural_rule def replace_plural(match: Match[str]) -> str: - selector = match.group(1) - variants = match.group(2) + selector = match[1] + variants = match[2] num = parameters[selector] if not isinstance(num, int): raise ValueError("'{}' must be a number, not a {} ({})" diff --git a/pywikibot/page/_links.py b/pywikibot/page/_links.py index 6b6a806..1dd4e3f 100644 --- a/pywikibot/page/_links.py +++ b/pywikibot/page/_links.py @@ -826,14 +826,14 @@ if textlib.isDisabled(match.string, match.start(), tags=exceptions): # match.string stores original text so we do not need # to pass it to handle_entity, ♥ Python - return match.group(0) + return match[0] - if match.group('decimal'): - unicode_codepoint = int(match.group('decimal')) - elif match.group('hex'): - unicode_codepoint = int(match.group('hex'), 16) - elif match.group('name'): - name = match.group('name') + if match['decimal']: + unicode_codepoint = int(match['decimal']) + elif match['hex']: + unicode_codepoint = int(match['hex'], 16) + elif match['name']: + name = match['name'] unicode_codepoint = name2codepoint.get(name, False) unicode_codepoint = _ILLEGAL_HTML_ENTITIES_MAPPING.get( @@ -843,6 +843,6 @@ return chr(unicode_codepoint) # Leave the entity unchanged - return match.group(0) + return match[0] return _ENTITY_SUB(handle_entity, text) diff --git a/pywikibot/page/_pages.py b/pywikibot/page/_pages.py index 506243a..cb28f5e 100644 --- a/pywikibot/page/_pages.py +++ b/pywikibot/page/_pages.py @@ -1465,7 +1465,7 @@ text = self.text for linkmatch in pywikibot.link_regex.finditer( textlib.removeDisabledParts(text)): - linktitle = linkmatch.group('title') + linktitle = linkmatch['title'] link = Link(linktitle, self.site) # only yield links that are to a different site and that # are not language links @@ -2279,7 +2279,7 @@ old_text = '' result = redirect_regex.search(old_text) if result: - oldlink = result.group(1) + oldlink = result[1] if (keep_section and '#' in oldlink and target_page.section() is None): sectionlink = oldlink[oldlink.index('#'):] diff --git a/pywikibot/pagegenerators/_generators.py b/pywikibot/pagegenerators/_generators.py index 2f30bba..3d781a9 100644 --- a/pywikibot/pagegenerators/_generators.py +++ b/pywikibot/pagegenerators/_generators.py @@ -333,8 +333,8 @@ # This makes it possible to work on different wikis using a single # text file, but also could be dangerous because you might # inadvertently change pages on another wiki! - yield pywikibot.Page(pywikibot.Link(linkmatch.group('title'), - site)) + yield pywikibot.Page(pywikibot.Link(linkmatch['title'], site)) + if linkmatch is not None: return @@ -855,7 +855,7 @@ for url in self.queryGoogle(local_query): m = re.search(pattern, url) if m: - page = pywikibot.Page(pywikibot.Link(m.group(1), self.site)) + page = pywikibot.Page(pywikibot.Link(m[1], self.site)) if page.site == self.site: yield page diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py index 5cdeedd..35ff2dd 100644 --- a/pywikibot/proofreadpage.py +++ b/pywikibot/proofreadpage.py @@ -121,10 +121,10 @@ m = self.p_header.search(self._text) if m: - self.ql = int(m.group('ql')) - self.user = m.group('user') - self.header = m.group('header') - if not m.group('has_div'): + self.ql = int(m['ql']) + self.user = m['user'] + self.header = m['header'] + if not m['has_div']: self._has_div = False else: self.ql = ProofreadPage.NOT_PROOFREAD @@ -867,7 +867,7 @@ r'/w/index\.php\?title=(.+?)&action=edit&redlink=1') title = p_href.search(href) if title: - return title.group(1).replace('_', ' ') + return title[1].replace('_', ' ') return None def save(self, *args: Any, **kwargs: Any) -> None: # See Page.save(). diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index 7e53bbf..2050db3 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -703,12 +703,12 @@ '"{}": No linktrail pattern extracted from "{}"' .format(self.code, linktrail)) - pattern = match.group('pattern') - letters = match.group('letters') + pattern = match['pattern'] + letters = match['letters'] if r'x{' in pattern: pattern = re.sub(r'\\x\{([A-F0-9]{4})\}', - lambda match: chr(int(match.group(1), 16)), + lambda match: chr(int(match[1], 16)), pattern) if letters: pattern += ''.join(letters.split('|')) diff --git a/pywikibot/site/_siteinfo.py b/pywikibot/site/_siteinfo.py index c5d0a0a..4c1ab93 100644 --- a/pywikibot/site/_siteinfo.py +++ b/pywikibot/site/_siteinfo.py @@ -142,7 +142,7 @@ matched = Siteinfo.WARNING_REGEX.match(message) if mod == 'siteinfo' and matched: invalid_properties.extend( - prop.strip() for prop in matched.group(1).split(',')) + prop.strip() for prop in matched[1].split(',')) return True return False diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index d67b09f..ccc45b8 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -440,13 +440,13 @@ group_regex = re.compile(r'\\(\d+)|\\g<(.+?)>') last = 0 for group_match in group_regex.finditer(new): - group_id = group_match.group(1) or group_match.group(2) + group_id = group_match[1] or group_match[2] with suppress(ValueError): group_id = int(group_id) try: replacement += new[last:group_match.start()] - replacement += match.group(group_id) or '' + replacement += match[group_id] or '' except IndexError: raise IndexError('Invalid group reference: {}\n' 'Groups found: {}' @@ -732,14 +732,15 @@ if not m: break + m_title = m['title'].strip() + # Ignore links to sections of the same page - if not m.group('title').strip(): + if not m_title: curpos = m.end() continue # Ignore interwiki links - if (site.isInterwikiLink(m.group('title').strip()) - and not m.group('title').strip().startswith(':')): + if site.isInterwikiLink(m_title) and not m_title.startswith(':'): curpos = m.end() continue @@ -752,8 +753,8 @@ # TODO: Unclosed link label, what happens there? curpos = m.end() continue - groups['label'] += groups['linktrail'] + extended_match.group(1) - groups['linktrail'] = extended_match.group(2) + groups['label'] += groups['linktrail'] + extended_match[1] + groups['linktrail'] = extended_match[2] end = extended_match.end() else: end = m.end() @@ -1338,19 +1339,18 @@ R = re.compile(r'\[\[\s*(?P<namespace>{})\s*:\s*(?P<rest>.+?)\]\]' .format(catNamespace), re.I) for match in R.finditer(text): - if expand_text and '{{' in match.group('rest'): - rest = site.expand_text(match.group('rest')) + match_rest = match['rest'] + if expand_text and '{{' in match_rest: + rest = site.expand_text(match_rest) else: - rest = match.group('rest') + rest = match_rest if '|' in rest: title, sortKey = rest.split('|', 1) else: title, sortKey = rest, None try: - cat = pywikibot.Category(pywikibot.Link( - '%s:%s' % - (match.group('namespace'), title), - site), + cat = pywikibot.Category(site, + '{}:{}'.format(match['namespace'], title), sort_key=sortKey) except InvalidTitleError: # Category title extracted contains invalid characters @@ -1749,7 +1749,7 @@ result = [] for match in NESTED_TEMPLATE_REGEX.finditer(text): - name, params = match.group(1), match.group(2) + name, params = match[1], match[2] # Special case for {{a}} if params is None: @@ -1992,7 +1992,7 @@ # Recursion levels can be maximum two. If a comment is found, it # will not for sure be found in the next level. # Nested comments are excluded by design. - timestamp = self.timestripper(comment.group(1)) + timestamp = self.timestripper(comment[1]) most_recent.append(timestamp) # Censor comments. @@ -2005,7 +2005,7 @@ # Recursion levels can be maximum two. If a link is found, it will # not for sure be found in the next level. # Nested links are excluded by design. - link, anchor = wikilink.group('link'), wikilink.group('anchor') + link, anchor = wikilink['link'], wikilink['anchor'] timestamp = self.timestripper(link) most_recent.append(timestamp) if anchor: diff --git a/pywikibot/time.py b/pywikibot/time.py index c129990..c9bfc57 100644 --- a/pywikibot/time.py +++ b/pywikibot/time.py @@ -143,18 +143,18 @@ strpfmt = '%Y-%m-%d{sep}%H:%M:%S'.format(sep=m.group('sep')) strpstr = timestr[:19] - if m.group('u'): + if m['u']: strpfmt += '.%f' - strpstr += m.group('u').replace(',', '.') # .ljust(7, '0') + strpstr += m['u'].replace(',', '.') # .ljust(7, '0') - if m.group('tz'): - if m.group('tz') == 'Z': + if m['tz']: + if m['tz'] == 'Z': strpfmt += 'Z' strpstr += 'Z' else: strpfmt += '%z' # strptime wants HHMM, without ':' - strpstr += (m.group('tz').replace(':', '')).ljust(5, '0') + strpstr += (m['tz'].replace(':', '')).ljust(5, '0') ts = cls.strptime(strpstr, strpfmt) if ts.tzinfo is not None: @@ -179,15 +179,15 @@ msg = "time data '{timestr}' does not match POSIX format." raise ValueError(msg.format(timestr=timestr)) - sec = int(m.group('S')) - usec = m.group('u') + sec = int(m['S']) + usec = m['u'] usec = int(usec.ljust(6, '0')) if usec else 0 if sec < 0 < usec: sec = sec - 1 - usec = 1000000 - usec + usec = 1_000_000 - usec - ts = (cls(1970, 1, 1) - + datetime.timedelta(seconds=sec, microseconds=usec)) + ts = cls(1970, 1, 1) + datetime.timedelta(seconds=sec, + microseconds=usec) return ts @classmethod diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index 7aae16d..536d34f 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -406,32 +406,31 @@ if not version_match: raise ValueError(f'Invalid version number "{version_str}"') - components = [int(n) for n in version_match.group(1).split('.')] + components = [int(n) for n in version_match[1].split('.')] # The _dev_version numbering scheme might change. E.g. if a stage # between 'alpha' and 'beta' is added, 'beta', 'rc' and stable releases # are reassigned (beta=3, rc=4, stable=5). - if version_match.group(3): # wmf version - self._dev_version = (0, int(version_match.group(3))) - elif version_match.group(4): - self._dev_version = (2, int(version_match.group(4))) - elif version_match.group(5): - self._dev_version = (3, int(version_match.group(5))) - elif version_match.group(2) in ('alpha', '-alpha'): + if version_match[3]: # wmf version + self._dev_version = (0, int(version_match[3])) + elif version_match[4]: + self._dev_version = (2, int(version_match[4])) + elif version_match[5]: + self._dev_version = (3, int(version_match[5])) + elif version_match[2] in ('alpha', '-alpha'): self._dev_version = (1, ) else: for handled in ('wmf', 'alpha', 'beta', 'rc'): # if any of those pops up here our parser has failed - assert handled not in version_match.group(2), \ - 'Found "{}" in "{}"'.format(handled, - version_match.group(2)) - if version_match.group(2): - pywikibot.logging.debug('Additional unused version part ' - '"{}"'.format(version_match.group(2))) + assert handled not in version_match[2], \ + f'Found "{handled}" in "{version_match[2]}"' + if version_match[2]: + pywikibot.logging.debug( + 'Additional unused version part {version_match[2]!r}') self._dev_version = (4, ) - self.suffix = version_match.group(2) or '' + self.suffix = version_match[2] or '' self.version = tuple(components) @staticmethod diff --git a/pywikibot/tools/_deprecate.py b/pywikibot/tools/_deprecate.py index 4feb1c2..691c8a8 100644 --- a/pywikibot/tools/_deprecate.py +++ b/pywikibot/tools/_deprecate.py @@ -273,7 +273,7 @@ # Get docstring up to :params so deprecation notices for # parameters don't disrupt it trim_params = re.compile(r'^.*?((?=:param)|$)', re.DOTALL) - trimmed_doc = trim_params.match(wrapper.__doc__).group(0) + trimmed_doc = trim_params.match(wrapper.__doc__)[0] if not deprecated_notice.search(trimmed_doc): # No notice add_docstring(wrapper) diff --git a/pywikibot/tools/djvu.py b/pywikibot/tools/djvu.py index 39e4ae7..3da4eda 100644 --- a/pywikibot/tools/djvu.py +++ b/pywikibot/tools/djvu.py @@ -160,7 +160,7 @@ if 'FORM:DJVU' in line: m = self._pat_form.search(line) if m: - key, id = int(m.group('n')), m.group('id') + key, id = int(m['n']), m['id'] else: # If djvu doc has only one page, # FORM:DJVU line in djvudump has no id @@ -169,7 +169,7 @@ if 'INFO' in line: m = self._pat_info.search(line) if m: - size, dpi = m.group('size'), int(m.group('dpi')) + size, dpi = m['size'], int(m['dpi']) else: size, dpi = None, None else: diff --git a/pywikibot/tools/threading.py b/pywikibot/tools/threading.py index 6d13cbe..b076a5f 100644 --- a/pywikibot/tools/threading.py +++ b/pywikibot/tools/threading.py @@ -70,7 +70,7 @@ """Return number of acquired locks.""" with self._block: counter = re.search(r'count=(\d+) ', repr(self)) - return int(counter.group(1)) + return int(counter[1]) def locked(self): """Return true if the lock is acquired.""" diff --git a/pywikibot/xmlreader.py b/pywikibot/xmlreader.py index 69712c1..d619d9f 100644 --- a/pywikibot/xmlreader.py +++ b/pywikibot/xmlreader.py @@ -40,10 +40,10 @@ moveRestriction = None editLockMatch = re.search('edit=([^:]*)', restrictions) if editLockMatch: - editRestriction = editLockMatch.group(1) + editRestriction = editLockMatch[1] moveLockMatch = re.search('move=([^:]*)', restrictions) if moveLockMatch: - moveRestriction = moveLockMatch.group(1) + moveRestriction = moveLockMatch[1] if restrictions == 'sysop': editRestriction = 'sysop' moveRestriction = 'sysop' diff --git a/scripts/archivebot.py b/scripts/archivebot.py index 668903d..2f69fcc 100755 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -215,7 +215,7 @@ match = re.fullmatch(r'(\d{1,3}(?: \d{3})+|\d+) *([BkKMT]?)', string) if not match: raise MalformedConfigError(f"Couldn't parse size: {string}") - val, unit = (int(match.group(1).replace(' ', '')), match.group(2)) + val, unit = (int(match[1].replace(' ', '')), match[2]) if unit == 'M': val *= 1024 unit = 'K' @@ -588,11 +588,11 @@ return None # TODO: handle unsigned try: - maxage = str2timedelta(re_t.group(1), thread.timestamp) + maxage = str2timedelta(re_t[1], thread.timestamp) except ValueError as e: raise MalformedConfigError(e) from None if self.now - thread.timestamp > maxage: - duration = str2localized_duration(self.site, re_t.group(1)) + duration = str2localized_duration(self.site, re_t[1]) return ('duration', duration) # TODO: handle marked with template return None diff --git a/scripts/category.py b/scripts/category.py index fa64fb0..7c22710 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -465,7 +465,7 @@ brackets_regex = re.compile(r'(.*) $.+?$') match_object = brackets_regex.match(page_name) if match_object: - page_name = match_object.group(1) + page_name = match_object[1] split_string = page_name.rsplit(' ', 1) if len(split_string) > 1: # pull last part of the name to the beginning, and append the diff --git a/scripts/checkimages.py b/scripts/checkimages.py index 372b60e..d0fc38b 100755 --- a/scripts/checkimages.py +++ b/scripts/checkimages.py @@ -1089,14 +1089,14 @@ for number, m in enumerate(SETTINGS_REGEX.finditer(testo), start=1): - name = str(m.group(1)) - find_tipe = str(m.group(2)) - find = str(m.group(3)) - imagechanges = str(m.group(4)) - summary = str(m.group(5)) - head = str(m.group(6)) - text = str(m.group(7)) - mexcatched = str(m.group(8)) + name = str(m[1]) + find_tipe = str(m[2]) + find = str(m[3]) + imagechanges = str(m[4]) + summary = str(m[5]) + head = str(m[6]) + text = str(m[7]) + mexcatched = str(m[8]) tupla = [number, name, find_tipe, find, imagechanges, summary, head, text, mexcatched] self.settings_data += [tupla] @@ -1312,7 +1312,7 @@ regl = r"(\"|\')(.*?)\1(?:,|\])" pl = re.compile(regl) for xl in pl.finditer(raw): - word = xl.group(2).replace('\\\\', '\\') + word = xl[2].replace('\\\\', '\\') if word not in list_loaded: list_loaded.append(word) return list_loaded diff --git a/scripts/commonscat.py b/scripts/commonscat.py index dd1cd02..192046c 100755 --- a/scripts/commonscat.py +++ b/scripts/commonscat.py @@ -491,10 +491,10 @@ .format(commonsPage, loguser, logcomment)) break - if m.group('newcat1'): - return self.checkCommonscatLink(m.group('newcat1')) - if m.group('newcat2'): - return self.checkCommonscatLink(m.group('newcat2')) + if m['newcat1']: + return self.checkCommonscatLink(m['newcat1']) + if m['newcat2']: + return self.checkCommonscatLink(m['newcat2']) return '' diff --git a/scripts/dataextend.py b/scripts/dataextend.py index 64e621d..fbde614 100644 --- a/scripts/dataextend.py +++ b/scripts/dataextend.py @@ -590,9 +590,9 @@ day = None m = re.search(r'[{\|](\d{4})\|(\d+)\|(\d+)[\|}]', text) if m: - year = int(m.group(1)) - month = int(m.group(2)) - day = int(m.group(3)) + year = int(m[1]) + month = int(m[2]) + day = int(m[3]) if re.match(r'\d{,4}(?:年頃|\.)?$', text): year = int(text) month = None @@ -606,84 +606,84 @@ month = int(text[-2:]) m = re.match(r'(\d{1,2})[-/](\d{4})', text) if m: - year = int(m.group(2)) - month = int(m.group(1)) + year = int(m[2]) + month = int(m[1]) m = re.match(r'(\d+)[-./|](\d{1,2})[-./|](\d{1,2})$', text) if m: - year = int(m.group(1)) - month = int(m.group(2)) - day = int(m.group(3)) + year = int(m[1]) + month = int(m[2]) + day = int(m[3]) m = re.match( r'(\d{1,2})[-./|]\s*(\d{1,2})[-./|]\s*(\d{3,4})\.?$', text) if m: - year = int(m.group(3)) - month = int(m.group(2)) - day = int(m.group(1)) + year = int(m[3]) + month = int(m[2]) + day = int(m[1]) m = re.match(r'(\d{1,2})[-./\s]([iIvVxX]+)[-./\s](\d{4})$', text) if m: - year = int(m.group(3)) + year = int(m[3]) try: - month = self.MONTHNUMBER[m.group(2).lower()] + month = self.MONTHNUMBER[m[2].lower()] except KeyError: - raise ValueError(f"Don't know month {m.group(2)}") - day = int(m.group(1)) + raise ValueError(f"Don't know month {m[2]}") + day = int(m[1]) m = re.match(r"(\d+)(?:\.|er|eme|ème)?[\s.]\s*(?:d'|d[aei] )?" r'([^\s.]{2,})\.?[\s.]\s*(\d+)$', text) if m: - year = int(m.group(3)) + year = int(m[3]) try: - month = self.MONTHNUMBER[m.group(2).lower()] + month = self.MONTHNUMBER[m[2].lower()] except KeyError: - raise ValueError(f"Don't know month {m.group(2)}") - day = int(m.group(1)) + raise ValueError(f"Don't know month {m[2]}") + day = int(m[1]) m = re.match(r'(\d{4})\.?[\s.]\s*([^\s.]{3,})\.?[\s.]\s*(\d+)$', text) if m: - year = int(m.group(1)) + year = int(m[1]) try: - month = self.MONTHNUMBER[m.group(2).lower()] + month = self.MONTHNUMBER[m[2].lower()] except KeyError: - raise ValueError(f"Don't know month {m.group(2)}") - day = int(m.group(3)) + raise ValueError(f"Don't know month {m[2]}") + day = int(m[3]) m = re.match(r"(\d+) (?:de |d')?(\w+[a-z]\w+) de (\d+)", text) if m: - year = int(m.group(3)) + year = int(m[3]) try: - month = self.MONTHNUMBER[m.group(2).lower()] + month = self.MONTHNUMBER[m[2].lower()] except KeyError: - raise ValueError(f"Don't know month {m.group(2)}") - day = int(m.group(1)) + raise ValueError(f"Don't know month {m[2]}") + day = int(m[1]) m = re.match(r'(\w*[a-zA-Z]\w*)\.? (\d+)$', text) if m: - year = int(m.group(2)) + year = int(m[2]) try: - month = self.MONTHNUMBER[m.group(1).lower()] + month = self.MONTHNUMBER[m[1].lower()] except KeyError: - raise ValueError(f"Don't know month {m.group(1)}") + raise ValueError(f"Don't know month {m[1]}") m = re.match(r'(\w+)\.? (\d{1,2})(?:st|nd|rd|th)?\.?\s*,\s*(\d{3,4})$', text) if m: - year = int(m.group(3)) + year = int(m[3]) try: - month = self.MONTHNUMBER[m.group(1).lower()] + month = self.MONTHNUMBER[m[1].lower()] except KeyError: - raise ValueError(f"Don't know month {m.group(1)}") - day = int(m.group(2)) + raise ValueError(f"Don't know month {m[1]}") + day = int(m[2]) m = re.match(r'(\d{4}),? (\d{1,2}) (\w+)', text) if m: - year = int(m.group(1)) + year = int(m[1]) try: - month = self.MONTHNUMBER[m.group(3).lower()] + month = self.MONTHNUMBER[m[3].lower()] except KeyError: - raise ValueError(f"Don't know month {m.group(1)}") - day = int(m.group(2)) + raise ValueError(f"Don't know month {m[1]}") + day = int(m[2]) m = re.match(r'(\d+)年(\d+)月(\d+)日', text) if m: - year = int(m.group(1)) - month = int(m.group(2)) - day = int(m.group(3)) + year = int(m[1]) + month = int(m[2]) + day = int(m[3]) m = re.match(r'(\d+)年$', text) if m: - year = int(m.group(1)) + year = int(m[1]) if day == 0: day = None if day is None and month == 0: @@ -716,8 +716,8 @@ def createquantityclaim(self, text): m = re.match(r'(\d+(?:\.\d+)?)\s*([a-z]\w*)', text.replace(',', '.')) - amount = m.group(1) - name = m.group(2).lower() + amount = m[1] + name = m[2].lower() return pywikibot.WbQuantity(amount, unit=pywikibot.ItemPage( self.site, self.QUANTITYTYPE[name]), @@ -1125,7 +1125,7 @@ if value.startswith('!date!'): value = value[6:] if value.startswith('!q!'): - value = re.search(r'\d+(?:\.\d+)?', value).group(0) + value = re.search(r'\d+(?:\.\d+)?', value)[0] elif value.startswith('!i!'): value = value[3:].strip() @@ -1330,7 +1330,7 @@ if self.hrtre: match = re.compile('(?s)' + self.hrtre).search(self.html) if match: - text = match.group(1) + text = match[1] text = text.replace('\\n', '\n') text = text.replace('\\t', '\t') text = text.replace('\\r', '\n') @@ -1981,16 +1981,16 @@ if dtype: alt = [dtype] + alt for alttype in alt: - if self.getdata(alttype, m.group(1), ask=False) \ - and self.getdata(alttype, m.group(1), ask=False) != 'XXX': - return self.getdata(alttype, m.group(1), ask=False) + if self.getdata(alttype, m[1], ask=False) \ + and self.getdata(alttype, m[1], ask=False) != 'XXX': + return self.getdata(alttype, m[1], ask=False) for skip in skips: - if self.getdata(skip, m.group(1), ask=False) \ - and self.getdata(skip, m.group(1), ask=False) != 'XXX': + if self.getdata(skip, m[1], ask=False) \ + and self.getdata(skip, m[1], ask=False) != 'XXX': return None if dtype: - return self.getdata(dtype, m.group(1)) - return m.group(1) + return self.getdata(dtype, m[1]) + return m[1] def findallbyre(self, regex, html, dtype=None, skips=None, alt=None) -> List[str]: @@ -2552,9 +2552,7 @@ m = re.match(r'(\d+)[/\-](\d+)[/\-](\d+)', result) if m: result = '{}-{}-{}'.format( - m.group(2), - m.group(1), - m.group(3) if len(m.group(3)) > 2 else '19' + m.group(3) + m[2], m[1], m[3] if len(m[3]) > 2 else '19' + m[3] ) return result @@ -2573,9 +2571,7 @@ m = re.match(r'(\d+)[/\-](\d+)[/\-](\d+)', result) if m: result = '{}-{}-{}'.format( - m.group(2), - m.group(1), - m.group(3) if len(m.group(3)) > 2 else '19' + m.group(3) + m[2], m[1], m[3] if len(m[3]) > 2 else '19' + m[3] ) return result @@ -13885,21 +13881,22 @@ def prepare(self, html: str): def reworkwikilink(wikipart): - parts = wikipart.group(1).split('|') + parts = wikipart[1].split('|') return '[[{}]]'.format(parts[0] if ':' in parts[0] else parts[-1]) if not html: return None + f = codecs.open('result.html', 'w', 'utf-8') f.write(html) f.close() - html = re.search(self.mainRE, html).group(1) + html = re.search(self.mainRE, html)[1] html = re.sub(r'{{nowrap\|([^{}]*)}}', r'\1', html) return re.sub(r'\[\[([^\[\]]*)\]\]', reworkwikilink, html) @staticmethod def excludetemplatelight(text): - templatetype = re.search('([^{|]*)', text).group(0).lower().strip() + templatetype = re.search('([^{|]*)', text)[0].lower().strip() firstword = templatetype.split()[0] lastword = templatetype.split()[-1] return ( @@ -13996,7 +13993,7 @@ @staticmethod def excludetemplate(text): - templatetype = re.search('([^{|]+)', text).group(0).lower().strip() + templatetype = re.search('([^{|]+)', text)[0].lower().strip() firstword = templatetype.split()[0] lastword = templatetype.split()[-1] return ( diff --git a/scripts/fixing_redirects.py b/scripts/fixing_redirects.py index e06e11b..98cbc59 100755 --- a/scripts/fixing_redirects.py +++ b/scripts/fixing_redirects.py @@ -84,16 +84,15 @@ # Make sure that next time around we will not find this same hit. curpos = m.start() + 1 - is_interwikilink = mysite.isInterwikiLink(m.group('title')) + is_interwikilink = mysite.isInterwikiLink(m['title']) # ignore interwiki links, links in the disabled area # and links to sections of the same page - if (m.group('title').strip() == '' + if (m['title'].strip() == '' or is_interwikilink or isDisabled(text, m.start())): continue - actual_link_page = pywikibot.Page(target_page.site, - m.group('title')) + actual_link_page = pywikibot.Page(target_page.site, m['title']) # Check whether the link found is to page. try: actual_link_page.title() @@ -105,22 +104,22 @@ # The link looks like this: # [[page_title|link_text]]trailing_chars - page_title = m.group('title') - link_text = m.group('label') + page_title = m['title'] + link_text = m['label'] if not link_text: # or like this: [[page_title]]trailing_chars link_text = page_title - if m.group('section') is None: + if m['section'] is None: section = '' else: - section = m.group('section') + section = m['section'] if section and target_page.section(): pywikibot.warning( 'Source section {} and target section {} found. ' 'Skipping.'.format(section, target_page)) continue - trailing_chars = m.group('linktrail') + trailing_chars = m['linktrail'] if trailing_chars: link_text += trailing_chars diff --git a/scripts/harvest_template.py b/scripts/harvest_template.py index 2e589fd..e50668e 100755 --- a/scripts/harvest_template.py +++ b/scripts/harvest_template.py @@ -391,7 +391,7 @@ # Try to extract a valid page for match in pywikibot.link_regex.finditer(value): matched = True - link_text = match.group(1) + link_text = match[1] linked_item = self.template_link_target(item, site, link_text) if linked_item: yield linked_item @@ -431,8 +431,8 @@ start, end = match.span() since_prev_match = value[prev_end:start] - title = match.group('title').strip() - text = match.group(2) + title = match['title'].strip() + text = match[2] if text: text = text[1:].strip() # remove '|' @@ -480,7 +480,7 @@ .. versionadded:: 7.5 """ for match in self.linkR.finditer(value): - yield match.group('url') + yield match['url'] @staticmethod def handle_commonsmedia(value, site, diff --git a/scripts/misspelling.py b/scripts/misspelling.py index 71cca13..e72fd16 100755 --- a/scripts/misspelling.py +++ b/scripts/misspelling.py @@ -122,7 +122,7 @@ # misspelling is ambiguous, see for example: # https://de.wikipedia.org/wiki/Buthan for match in self.linkR.finditer(correct_spelling): - self.opt.pos.append(match.group('title')) + self.opt.pos.append(match['title']) if not self.opt.pos: # There were no links in the parameter, so there is diff --git a/scripts/noreferences.py b/scripts/noreferences.py index 96570b6..7460069 100755 --- a/scripts/noreferences.py +++ b/scripts/noreferences.py @@ -642,7 +642,7 @@ 'Adding references section before {} section...\n' .format(section)) index = match.start() - ident = match.group('ident') + ident = match['ident'] return self.createReferenceSection(oldText, index, ident) else: diff --git a/scripts/pagefromfile.py b/scripts/pagefromfile.py index 0685092..4a564d5 100755 --- a/scripts/pagefromfile.py +++ b/scripts/pagefromfile.py @@ -248,12 +248,12 @@ if self.opt.include: contents = location.group() else: - contents = location.group(1) + contents = location[1] title = self.opt.title if not title: try: - title = title_regex.search(contents).group(1) + title = title_regex.search(contents)[1] if self.opt.notitle: # Remove title (to allow creation of redirects) contents = title_regex.sub('', contents, count=1) diff --git a/scripts/redirect.py b/scripts/redirect.py index 4cc7790..ad2847b 100755 --- a/scripts/redirect.py +++ b/scripts/redirect.py @@ -168,7 +168,7 @@ m = redirR.match(entry.text) if m: - target = m.group(1) + target = m[1] # There might be redirects to another wiki. Ignore these. target_link = pywikibot.Link(target, self.site) try: diff --git a/scripts/reflinks.py b/scripts/reflinks.py index 6ef24d6..9fbd2f5 100755 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -320,11 +320,11 @@ # Parse references for match in self.REFS.finditer(text): - content = match.group('content') + content = match['content'] if not content.strip(): continue - params = match.group('params') + params = match['params'] group = self.GROUPS.search(params) or '' if group not in found_refs: found_refs[group] = {} @@ -338,8 +338,8 @@ found = self.NAMES.search(params) if found: - quoted = found.group('quote') in ['"', "'"] - name = found.group('name') + quoted = found['quote'] in ['"', "'"] + name = found['name'] if not v[IX.name]: # First name associated with this content @@ -555,12 +555,12 @@ # for each link to change for match in linksInRef.finditer(raw_text): - link = match.group('url') + link = match['url'] if 'jstor.org' in link: # TODO: Clean URL blacklist continue - ref = RefLink(link, match.group('name'), site=self.site) + ref = RefLink(link, match['name'], site=self.site) try: r = comms.http.fetch( diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py index 2d57096..bc30d27 100755 --- a/scripts/solve_disambiguation.py +++ b/scripts/solve_disambiguation.py @@ -762,7 +762,7 @@ for line in page.text.splitlines(): found = reg.match(line) if found: - yield found.group(1) + yield found[1] def firstize(self, page, links) -> List[pywikibot.Page]: """Call firstlinks and remove extra links. @@ -893,8 +893,7 @@ # Ensure that next time around we will not find this same hit. curpos = m.start() + 1 try: - foundlink = pywikibot.Link(m.group('title'), - disamb_page.site) + foundlink = pywikibot.Link(m['title'], disamb_page.site) foundlink.parse() except Error: continue @@ -911,7 +910,7 @@ except Error: # must be a broken link pywikibot.log('Invalid link [[{}]] in page [[{}]]' - .format(m.group('title'), ref_page.title())) + .format(m['title'], ref_page.title())) continue n += 1 @@ -989,19 +988,19 @@ # The link looks like this: # [[page_title|link_text]]trailing_chars - page_title = m.group('title') - link_text = m.group('label') + page_title = m['title'] + link_text = m['label'] if not link_text: # or like this: [[page_title]]trailing_chars link_text = page_title - if m.group('section') is None: + if m['section'] is None: section = '' else: - section = m.group('section') + section = m['section'] - trailing_chars = m.group('linktrail') + trailing_chars = m['linktrail'] if trailing_chars: link_text += trailing_chars diff --git a/scripts/upload.py b/scripts/upload.py index 1a0d137..c654090 100755 --- a/scripts/upload.py +++ b/scripts/upload.py @@ -75,10 +75,10 @@ if not match: pywikibot.error('Chunk size parameter is not valid.') chunk_size = 0 - elif match.group(1): # number was in there - base = float(match.group(1)) - if match.group(2): # suffix too - suffix = match.group(2).lower() + elif match[1]: # number was in there + base = float(match[1]) + if match[2]: # suffix too + suffix = match[2].lower() if suffix == 'k': suffix = 1000 elif suffix == 'm': diff --git a/scripts/weblinkchecker.py b/scripts/weblinkchecker.py index 0f1dccd..65c3790 100755 --- a/scripts/weblinkchecker.py +++ b/scripts/weblinkchecker.py @@ -226,10 +226,10 @@ text = textlib.removeDisabledParts(text) link_regex = textlib.compileLinkR(without_bracketed, only_bracketed) for m in link_regex.finditer(text): - if m.group('url'): - yield m.group('url') + if m['url']: + yield m['url'] else: - yield m.group('urlb') + yield m['urlb'] XmlDumpPageGenerator = partial( diff --git a/tests/api_tests.py b/tests/api_tests.py index 22753f2..e945abd 100755 --- a/tests/api_tests.py +++ b/tests/api_tests.py @@ -1004,7 +1004,7 @@ for info, time in patterns.items(): lag = api._requests.lagpattern.search(info) self.assertIsNotNone(lag) - self.assertEqual(float(lag.group('lag')), time) + self.assertEqual(float(lag['lag']), time) if __name__ == '__main__': # pragma: no cover diff --git a/tests/aspects.py b/tests/aspects.py index b20b270..36709de 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -1440,7 +1440,7 @@ deprecation_messages = self.deprecation_messages for deprecation_message in deprecation_messages: match = self._generic_match.match(deprecation_message) - if (match and bool(match.group(1)) == (msg is self.INSTEAD) + if (match and bool(match[1]) == (msg is self.INSTEAD) or msg is None): break else: diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index be98cdd..c92e84d 100755 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -630,13 +630,13 @@ for pattern in patterns: m = func(pattern) self.assertIsNotNone(m) - self.assertIsNotNone(m.group(0)) - self.assertIsNone(m.group('name')) - self.assertIsNone(m.group(1)) - self.assertIsNone(m.group('params')) - self.assertIsNone(m.group(2)) - self.assertIsNotNone(m.group('unhandled_depth')) - self.assertTrue(m.group(0).endswith('foo {{bar}}')) + self.assertIsNotNone(m[0]) + self.assertIsNone(m['name']) + self.assertIsNone(m[1]) + self.assertIsNone(m['params']) + self.assertIsNone(m[2]) + self.assertIsNotNone(m['unhandled_depth']) + self.assertTrue(m[0].endswith('foo {{bar}}')) class TestDisabledParts(DefaultDrySiteTestCase): diff --git a/tests/timestripper_tests.py b/tests/timestripper_tests.py index 4929296..65bb9a8 100755 --- a/tests/timestripper_tests.py +++ b/tests/timestripper_tests.py @@ -285,8 +285,7 @@ txt_match = self.date + '' exp_match = 'a test comment' - self.assertEqual(ts._comment_pat.search(txt_match).group(1), - exp_match) + self.assertEqual(ts._comment_pat.search(txt_match)[1], exp_match) def test_timestripper_match_hyperlink(self): """Test that hyperlinks are correctly matched.""" @@ -304,9 +303,9 @@ txt_match = '[[wikilink|a wikilink with no date]]' exp_match_link = 'wikilink' exp_match_anchor = '|a wikilink with no date' - self.assertEqual(ts._wikilink_pat.search(txt_match).group('link'), + self.assertEqual(ts._wikilink_pat.search(txt_match)['link'], exp_match_link) - self.assertEqual(ts._wikilink_pat.search(txt_match).group('anchor'), + self.assertEqual(ts._wikilink_pat.search(txt_match)['anchor'], exp_match_anchor) def test_timestripper_match_comment_with_date(self): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/836138 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: I2e3e4073d317eb23b7ba040642e82edfbe471cdd Gerrit-Change-Number: 836138 Gerrit-PatchSet: 4 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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits