Pywikibot-commits November 2021

pywikibot-commits@lists.wikimedia.org

1 participants
66 discussions

[Gerrit] ...core[master]: [tests] Test Pywikibot with Python 3.10 at Appveyor
by Xqt (Code Review) 30 Nov '21

30 Nov '21

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/742752 ) Change subject: [tests] Test Pywikibot with Python 3.10 at Appveyor ...................................................................... [tests] Test Pywikibot with Python 3.10 at Appveyor Change-Id: I22c5d83b3cba47bb5821b668ae35aacd47e0c558 --- M .appveyor.yml 1 file changed, 6 insertions(+), 2 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.appveyor.yml b/.appveyor.yml index 7fa65f7..439f630 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -41,8 +41,12 @@ PYTHON_VERSION: "3.9.x" PYTHON_ARCH: "32" - - PYTHON: "C:\\Python39-x64" - PYTHON_VERSION: "3.9.x" + - PYTHON: "C:\\Python310" + PYTHON_VERSION: "3.10.x" + PYTHON_ARCH: "32" + + - PYTHON: "C:\\Python310-x64" + PYTHON_VERSION: "3.10.x" PYTHON_ARCH: "64" matrix: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/742752 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: I22c5d83b3cba47bb5821b668ae35aacd47e0c558 Gerrit-Change-Number: 742752 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]: [doc] Update ROADMAP.rst
by Xqt (Code Review) 30 Nov '21

30 Nov '21

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/742691 ) Change subject: [doc] Update ROADMAP.rst ...................................................................... [doc] Update ROADMAP.rst Change-Id: Ib7ddd92dcdb90ffce3b9334398b7537d28e9d675 --- M ROADMAP.rst 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/ROADMAP.rst b/ROADMAP.rst index 323b195..620fe29 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -4,6 +4,8 @@ Improvements and Bugfixes ------------------------- +* Enable move generate_user_files.py with site-package (T107629) +* Only search user_script_paths inside config.base_dir (T296204) * pywikibot.argv has been fixed for pwb.py wrapper if called with global args (T254435) * A new method User.is_locked() was added to determine whether the user is currently locked globally (T249392) * A new method APISite.is_locked() was added to determine whether a given user or user id is locked globally (T249392) @@ -35,6 +37,7 @@ ---------------- * Support of Python 3.5.0 - 3.5.2 has been dropped (T286867) +* generate_user_files.py must be used with pwb wrapper script Code cleanups -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/742691 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: Ib7ddd92dcdb90ffce3b9334398b7537d28e9d675 Gerrit-Change-Number: 742691 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [tests] ignore bugbear 21.11.28
by Xqt (Code Review) 30 Nov '21

30 Nov '21

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/742684 ) Change subject: [tests] ignore bugbear 21.11.28 ...................................................................... [tests] ignore bugbear 21.11.28 https://github.com/PyCQA/flake8-bugbear/issues/208 Change-Id: Ifc3854032ea6f6144e22830dfaf4a4d83f564d4a --- M setup.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/setup.py b/setup.py index af7c5c5..83bfd78 100644 --- a/setup.py +++ b/setup.py @@ -77,7 +77,7 @@ 'flake8>=3.9.1', 'darglint', 'pydocstyle>=4.0.0', - 'flake8-bugbear!=21.4.1', + 'flake8-bugbear!=21.4.1,!=21.11.28', 'flake8-coding', 'flake8-colors>=0.1.9', 'flake8-comprehensions>=3.1.4; python_version >= "3.8"', -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/742684 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: Ifc3854032ea6f6144e22830dfaf4a4d83f564d4a Gerrit-Change-Number: 742684 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: Revert "[flake8] Ignore bugbear B18 false possitives"
by jenkins-bot (Code Review) 29 Nov '21

29 Nov '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/742264 ) Change subject: Revert "[flake8] Ignore bugbear B18 false possitives" ...................................................................... Revert "[flake8] Ignore bugbear B18 false possitives" This reverts commit 48d6024f29fab1670824bc17413b4ca1cfc29a03. Reason for revert: solved upstream Change-Id: I71d4952f8d9ec078784ee14d1a7f1392b43a34a1 --- M pywikibot/families/wikihow_family.py M pywikibot/family.py 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikihow_family.py b/pywikibot/families/wikihow_family.py index 01dfbbd..38d3ab4 100644 --- a/pywikibot/families/wikihow_family.py +++ b/pywikibot/families/wikihow_family.py @@ -29,7 +29,7 @@ removed_wikis = ['ca', 'cy', 'fa', 'he', 'pl', 'ur'] title_delimiter_and_aliases = '- ' - """.. versionadded:: 7.0""" # noqa: B018 + """.. versionadded:: 7.0""" @classproperty def domains(cls): diff --git a/pywikibot/family.py b/pywikibot/family.py index ac8f682..6d515bc 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -555,7 +555,7 @@ escape sequence if necessary .. versionadded:: 7.0 - """ # noqa: B018 + """ _families = {} -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/742264 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: I71d4952f8d9ec078784ee14d1a7f1392b43a34a1 Gerrit-Change-Number: 742264 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [bugfix] Don't pass generator parameter twice to ImageRobot
by jenkins-bot (Code Review) 29 Nov '21

29 Nov '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/742203 ) Change subject: [bugfix] Don't pass generator parameter twice to ImageRobot ...................................................................... [bugfix] Don't pass generator parameter twice to ImageRobot Bug: T296567 Change-Id: I03b2e224807ebbc96b6ddc8fbda7e23236b3a5fc --- M scripts/image.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Matěj Suchánek: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/image.py b/scripts/image.py index bbeb82e..4b55d1d 100755 --- a/scripts/image.py +++ b/scripts/image.py @@ -70,7 +70,7 @@ 'loose': False, }) - SingleSiteBot.__init__(self, generator=generator, **kwargs) + SingleSiteBot.__init__(self, **kwargs) self.old_image = old_image self.new_image = new_image @@ -114,7 +114,7 @@ else: replacements.append((image_regex, '')) - super().__init__(self.generator, replacements, + super().__init__(generator, replacements, always=self.opt.always, site=self.site, summary=summary) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/742203 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: I03b2e224807ebbc96b6ddc8fbda7e23236b3a5fc Gerrit-Change-Number: 742203 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(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 Nov '21

29 Nov '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/742446 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I61747bb93dc960ad32b7d087198b2b0c30394612 --- M blockpageschecker/ckb.json M blockpageschecker/ja.json M category/ckb.json M pywikibot/ja.json 4 files changed, 9 insertions(+), 5 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/blockpageschecker/ckb.json b/blockpageschecker/ckb.json index a2dcc66..c63da0e 100644 --- a/blockpageschecker/ckb.json +++ b/blockpageschecker/ckb.json @@ -1,8 +1,11 @@ { "@metadata": { "authors": [ + "Muhammed taha", "ئارام بکر" ] }, + "blockpageschecker-adding": "بۆت: زیادکردنی داڕێژەی پاراستنی پەڕە", + "blockpageschecker-modifying": "بۆت: دەستکاریکردنی داڕێژەی کۆن", "blockpageschecker-deleting": "بۆت: سڕینەوەی داڕێژەی کۆن" } diff --git a/blockpageschecker/ja.json b/blockpageschecker/ja.json index f81edcc..cc91816 100644 --- a/blockpageschecker/ja.json +++ b/blockpageschecker/ja.json @@ -7,7 +7,5 @@ "Whym" ] }, - "blockpageschecker-adding": "ボットによる：テンプレートページロックを追加", - "blockpageschecker-modifying": "ボットによる: 失効したテンプレートを削除に修正", "blockpageschecker-deleting": "ボットによる: 失効したテンプレートを削除" } diff --git a/category/ckb.json b/category/ckb.json index 203afa9..f0547ca 100644 --- a/category/ckb.json +++ b/category/ckb.json @@ -3,6 +3,7 @@ "authors": [ "Asoxor", "Calak", + "Muhammed taha", "ئارام بکر" ] }, @@ -13,6 +14,9 @@ "category-renamed": "بۆت: گوازرایەوە لە %(oldcat)s. دانەران: %(authors)s", "category-replacing": "بۆت: دانانی پۆلی %(newcat)s لە جێگەی %(oldcat)s", "category-section-title": "مێژووی پەڕەی %(oldcat)sی پێشوو", - "category-version-history": "بۆت: مێژووی پێداچوونەوەی %(oldcat)sی پێشوو", + "category-strip-cfd-templates": "بۆت: سڕینەوەی داڕێژەکانی پۆلەکان بۆ سڕینەوە بۆ ئەو کارانەی تەواو بوون", + "category-strip-sort-keys": "بۆت: سڕینەوەی کلیلەکانی ڕیزکردن بۆ کارە تەواوبووەکان", + "category-strip-both": "بۆت: سڕینەوەی داڕێژەکانی پۆلەکان بۆ سڕینەوە و کلیلەکانی ڕیزکردن بۆ کارە تەواوبووەکان", + "category-version-history": "بۆت: پاشکەوتکردنی مێژووی پێداچوونەوەی %(oldcat)sی پێشوو", "category-was-moved": "بۆت: پۆل گوازرایەوە بۆ [[:Category:%(newcat)s|%(title)s]]" } diff --git a/pywikibot/ja.json b/pywikibot/ja.json index 837e4f0..94e7f47 100644 --- a/pywikibot/ja.json +++ b/pywikibot/ja.json @@ -16,6 +16,5 @@ "pywikibot-enter-xml-filename": "XML ダンプのファイル名を入力:", "pywikibot-fixes-fckeditor": "ボットによる: リッチエディターの html を修正", "pywikibot-fixes-html": "ボットによる: HTML を転換・修正", - "pywikibot-fixes-syntax": "ボットによる: wiki 構文を修正", - "pywikibot-touch": "Pywikibot タッチ編集" + "pywikibot-fixes-syntax": "ボットによる: wiki 構文を修正" } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/742446 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: I61747bb93dc960ad32b7d087198b2b0c30394612 Gerrit-Change-Number: 742446 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] move generate_user_files.py to pywikibot/scripts/
by jenkins-bot (Code Review) 29 Nov '21

29 Nov '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/740534 ) Change subject: [IMPR] move generate_user_files.py to pywikibot/scripts/ ...................................................................... [IMPR] move generate_user_files.py to pywikibot/scripts/ Enable generate_user_files with site package - move generate_user_files.py to pywikibot/scripts/ - Update parse_sections to resolve config.py path - move _import_with_no_user_config from generate_family_file.py to to pywikibot/scripts/__init__.py - import _import_with_no_user_config from pywikibot.scripts in generate_family_file.py - update imports - update tests scripts - update doc Bug: T107629 Change-Id: I7fd8aa95c7338e4028ab1ec8f7b42e82c2594e74 --- M .appveyor.yml M .travis.yml M CONTENT.rst M docs/installation.rst M docs/utilities/index.rst M generate_family_file.py M pwb.py M pywikibot/CONTENT.rst M pywikibot/scripts/__init__.py R pywikibot/scripts/generate_user_files.py M tests/generate_user_files_tests.py M tox.ini M user-config.py.sample 13 files changed, 54 insertions(+), 41 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.appveyor.yml b/.appveyor.yml index 42603e8..7fa65f7 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -73,7 +73,7 @@ - set PYTHONIOENCODING=utf8 - "mkdir %PYWIKIBOT_DIR%" - - "python -Werror::UserWarning -m generate_user_files -dir:%PYWIKIBOT_DIR% -family:wikipedia -lang:en -v -debug -user:%PYWIKIBOT_USERNAME%" + - "python -Werror::UserWarning -m pwb generate_user_files -dir:%PYWIKIBOT_DIR% -family:wikipedia -lang:en -v -debug -user:%PYWIKIBOT_USERNAME%" - ps: "[IO.File]::AppendAllText($env:PYWIKIBOT_USER_CONFIG, 'max_retries = 2; maximum_GET_length = 5000; transliteration_target = None;')" - ps: "[IO.File]::AppendAllText($env:PYWIKIBOT_USER_CONFIG, 'usernames[''wikipedia''][''test''] = ''{0}'';' -f $env:PYWIKIBOT_USERNAME)" - ps: "[IO.File]::AppendAllText($env:PYWIKIBOT_USER_CONFIG, 'usernames[''wikidata''][''test''] = ''{0}'';' -f $env:PYWIKIBOT_USERNAME)" diff --git a/.travis.yml b/.travis.yml index d16a73f..5283c71 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,7 +75,7 @@ python -m generate_family_file 'https://theportalwiki.com/wiki/Main_Page' 'portalwiki' 'y' 'y'; fi - - python -W error::UserWarning -m generate_user_files -dir:~/.pywikibot/ -family:$FAMILY -lang:$LANGUAGE -v -user:"$PYWIKIBOT_USERNAME" + - python -W error::UserWarning -m pwb generate_user_files -dir:~/.pywikibot/ -family:$FAMILY -lang:$LANGUAGE -v -user:"$PYWIKIBOT_USERNAME" - if [[ -n "$USER_PASSWORD" && -n "$PYWIKIBOT_USERNAME" ]]; then printf "usernames['wikipedia']['en'] = '%q'\n" "$PYWIKIBOT_USERNAME" >> ~/.pywikibot/user-config.py ; diff --git a/CONTENT.rst b/CONTENT.rst index 230992c..7f42248 100644 --- a/CONTENT.rst +++ b/CONTENT.rst @@ -18,13 +18,11 @@ +---------------------------+-----------------------------------------------------------+ | generate_family_file.py | Creates a new family file | +---------------------------+-----------------------------------------------------------+ - | generate_user_files.py | Creates user-config.py or user-fixes.py | - +---------------------------+-----------------------------------------------------------+ | HISTORY.rst | PyPI version history file | +---------------------------+-----------------------------------------------------------+ | LICENSE | Reference to the MIT license | +---------------------------+-----------------------------------------------------------+ - | pwb.py | Wrapper script to use Pywikibot in 'directory' mode | + | pwb.py | Code entry wrapper script (directory mode only) | +---------------------------+-----------------------------------------------------------+ | README.rst | Short info string used by Pywikibot Nightlies | +---------------------------+-----------------------------------------------------------+ diff --git a/docs/installation.rst b/docs/installation.rst index 0f1f34e..b943842 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -15,7 +15,7 @@ This sample is shipped with the repository but is not available with the site-package. For more settings use :mod:`generate_user_files` script -(not available with site-package) or refer :mod:`pywikibot.config`. +or refer :mod:`pywikibot.config`. .. note:: Please also see the documentation at :manpage:`Installation` diff --git a/docs/utilities/index.rst b/docs/utilities/index.rst index 9965397..5e61800 100644 --- a/docs/utilities/index.rst +++ b/docs/utilities/index.rst @@ -19,4 +19,4 @@ generate\_user\_files script ---------------------------- -.. automodule:: generate_user_files +.. automodule:: pywikibot.scripts.generate_user_files diff --git a/generate_family_file.py b/generate_family_file.py index 330a725..f3125f8 100755 --- a/generate_family_file.py +++ b/generate_family_file.py @@ -29,7 +29,6 @@ import string import sys -from os import environ, getenv from typing import Optional from urllib.parse import urlparse @@ -63,6 +62,7 @@ pass `Y` or `y` to disable certificate validaton `N` or `n` to keep it enabled. """ + from pywikibot.scripts import _import_with_no_user_config # from pywikibot.site_detect import MWSite # when required but disable user-config checks # so the family can be created first, @@ -275,19 +275,6 @@ """ -def _import_with_no_user_config(*import_args): - """Return __import__(*import_args) without loading user-config.py.""" - orig_no_user_config = getenv('PYWIKIBOT_NO_USER_CONFIG') - environ['PYWIKIBOT_NO_USER_CONFIG'] = '2' - result = __import__(*import_args) - # Reset this flag - if not orig_no_user_config: - del environ['PYWIKIBOT_NO_USER_CONFIG'] - else: - environ['PYWIKIBOT_NO_USER_CONFIG'] = orig_no_user_config - return result - - def main(): """Process command line arguments and generate a family file.""" if len(sys.argv) > 1 and sys.argv[1] == '-help': diff --git a/pwb.py b/pwb.py index 1f6741d..6c44f9c 100755 --- a/pwb.py +++ b/pwb.py @@ -285,7 +285,8 @@ or filename == 'version.py'): print("NOTE: 'user-config.py' was not found!") print('Please follow the prompts to create it:') - run_python_file(os.path.join(_pwb_dir, 'generate_user_files.py'), []) + run_python_file(os.path.join( + _pwb_dir, 'pywikibot', 'scripts', 'generate_user_files.py'), []) # because we have loaded pywikibot without user-config.py loaded, # we need to re-start the entire process. Ask the user to do so. print('Now, you have to re-execute the command to start your script.') diff --git a/pywikibot/CONTENT.rst b/pywikibot/CONTENT.rst index deb5c3e..468259a 100644 --- a/pywikibot/CONTENT.rst +++ b/pywikibot/CONTENT.rst @@ -115,7 +115,9 @@ +----------------------------+------------------------------------------------------+ | scripts | Framework helper scripts and entry points | +============================+======================================================+ - | pwb.py | code entry wrapper script (site-package only) | + | generate_user_files.py | Creates user-config.py or user-fixes.py | + +----------------------------+------------------------------------------------------+ + | pwb.py | Code entry wrapper script (site-package only) | +----------------------------+------------------------------------------------------+ | version.py | Outputs Pywikibot's revision number, Python's | | | version and OS used. | diff --git a/pywikibot/scripts/__init__.py b/pywikibot/scripts/__init__.py index 5a69b88..4836696 100644 --- a/pywikibot/scripts/__init__.py +++ b/pywikibot/scripts/__init__.py @@ -4,3 +4,22 @@ .. versionadded:: 7.0 """ +from os import environ, getenv + + +def _import_with_no_user_config(*import_args: str): + """Return __import__(*import_args) without loading user-config.py. + + .. versionadded:: 3.0 + .. versionchanged:: 7.0 + moved to pywikibot.scripts + """ + orig_no_user_config = getenv('PYWIKIBOT_NO_USER_CONFIG') + environ['PYWIKIBOT_NO_USER_CONFIG'] = '2' + result = __import__(*import_args) + # Reset this flag + if not orig_no_user_config: + del environ['PYWIKIBOT_NO_USER_CONFIG'] + else: + environ['PYWIKIBOT_NO_USER_CONFIG'] = orig_no_user_config + return result diff --git a/generate_user_files.py b/pywikibot/scripts/generate_user_files.py similarity index 95% rename from generate_user_files.py rename to pywikibot/scripts/generate_user_files.py index 745de1e..1a364c2 100755 --- a/generate_user_files.py +++ b/pywikibot/scripts/generate_user_files.py @@ -1,5 +1,9 @@ #!/usr/bin/python -"""Script to create user-config.py.""" +"""Script to create user-config.py. + +.. versionchanged:: 7.0 + moved to pywikibot.scripts folder +""" # # (C) Pywikibot team, 2010-2021 # @@ -9,14 +13,16 @@ import os import re import sys + from collections import namedtuple +from pathlib import Path from textwrap import fill from typing import Optional -from generate_family_file import _import_with_no_user_config +from pywikibot.scripts import _import_with_no_user_config - -if sys.version_info[:2] >= (3, 9): +PYTHON_VERSION = sys.version_info[:2] +if PYTHON_VERSION >= (3, 9): Tuple = tuple else: from typing import Tuple @@ -42,9 +48,6 @@ except AttributeError: console_encoding = None -# the directory in which generate_user_files.py is located -pywikibot_dir = sys.path[0] - if console_encoding is None or sys.platform == 'cygwin': console_encoding = 'iso-8859-1' @@ -217,21 +220,22 @@ {botpasswords}""" -def parse_sections(): +def parse_sections() -> list: """Parse sections from config.py file. - config.py will be in the pywikibot/ directory relative to this - generate_user_files script. + config.py will be in the pywikibot/ directory whereas + generate_user_files script is in pywikibot/scripts. :return: a list of ConfigSection named tuples. - :rtype: list """ data = [] ConfigSection = namedtuple('ConfigSection', 'head, info, section') - install = os.path.dirname(os.path.abspath(__file__)) - with codecs.open(os.path.join(install, 'pywikibot', 'config.py'), - 'r', 'utf-8') as config_f: + config_path = Path(__file__).resolve().parents[1].joinpath('config.py') + if PYTHON_VERSION < (3, 6): + config_path = str(config_path) + + with codecs.open(config_path, 'r', 'utf-8') as config_f: config_file = config_f.read() result = re.findall( diff --git a/tests/generate_user_files_tests.py b/tests/generate_user_files_tests.py index b24af84..2824de5 100644 --- a/tests/generate_user_files_tests.py +++ b/tests/generate_user_files_tests.py @@ -7,7 +7,8 @@ import re import unittest -import generate_user_files as guf +from pywikibot.scripts import generate_user_files as guf + from tests.aspects import TestCase diff --git a/tox.ini b/tox.ini index 47069fb..f109f51 100644 --- a/tox.ini +++ b/tox.ini @@ -10,7 +10,7 @@ [params] doctest_skip = --ignore-files=(eventstreams|gui|mysql)\.py -generate_user_files = -W error::UserWarning -m generate_user_files -family:wikipedia -lang:test -v +generate_user_files = -W error::UserWarning -m pwb generate_user_files -family:wikipedia -lang:test -v [testenv] basepython = diff --git a/user-config.py.sample b/user-config.py.sample index 2889796..cf80b2c 100644 --- a/user-config.py.sample +++ b/user-config.py.sample @@ -1,5 +1,6 @@ -# This is a sample file. You should use generate_user_files.py -# to create your user-config.py file. +# This is a sample file. You should use generate_user_files script +# to create your user-config.py file: +# pwb generate_user_files mylang = 'en' family = 'wikipedia' -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/740534 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: I7fd8aa95c7338e4028ab1ec8f7b42e82c2594e74 Gerrit-Change-Number: 740534 Gerrit-PatchSet: 8 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: AbdealiJK <abdealikothari(a)gmail.com> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [flake8] Ignore bugbear B18 false possitives
by jenkins-bot (Code Review) 29 Nov '21

29 Nov '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/742281 ) Change subject: [flake8] Ignore bugbear B18 false possitives ...................................................................... [flake8] Ignore bugbear B18 false possitives Change-Id: I3f58feace1fe392b1dbaf4b15fefdc1f5d841def --- M pywikibot/families/wikihow_family.py M pywikibot/family.py 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikihow_family.py b/pywikibot/families/wikihow_family.py index 38d3ab4..01dfbbd 100644 --- a/pywikibot/families/wikihow_family.py +++ b/pywikibot/families/wikihow_family.py @@ -29,7 +29,7 @@ removed_wikis = ['ca', 'cy', 'fa', 'he', 'pl', 'ur'] title_delimiter_and_aliases = '- ' - """.. versionadded:: 7.0""" + """.. versionadded:: 7.0""" # noqa: B018 @classproperty def domains(cls): diff --git a/pywikibot/family.py b/pywikibot/family.py index 6d515bc..ac8f682 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -555,7 +555,7 @@ escape sequence if necessary .. versionadded:: 7.0 - """ + """ # noqa: B018 _families = {} -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/742281 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: I3f58feace1fe392b1dbaf4b15fefdc1f5d841def Gerrit-Change-Number: 742281 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]: [bugfix] Only search user_script_paths inside config.base_dir
by jenkins-bot (Code Review) 28 Nov '21

28 Nov '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/742245 ) Change subject: [bugfix] Only search user_script_paths inside config.base_dir ...................................................................... [bugfix] Only search user_script_paths inside config.base_dir Bug: T296204 Change-Id: I119e87b7c8b1a8d0c65e6e41e166f6ebf487bf83 --- M pwb.py 1 file changed, 28 insertions(+), 14 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pwb.py b/pwb.py index 1f6741d..001193f 100755 --- a/pwb.py +++ b/pwb.py @@ -350,8 +350,24 @@ def find_filename(filename): - """Search for the filename in the given script paths.""" + """Search for the filename in the given script paths. + + .. versionchanged:: 7.0 + Search users_scripts_paths in config.base_dir + """ from pywikibot import config + path_list = [] # paths to find misspellings + + def test_paths(paths, root): + """Search for filename in given paths within 'root' base directory.""" + for file_package in paths: + package = file_package.split('.') + path = package + [filename] + testpath = os.path.join(root, *path) + if os.path.exists(testpath): + return testpath + path_list.append(package) + return None if site_package: script_paths = [_pwb_dir] @@ -363,26 +379,24 @@ 'pywikibot.scripts', ] + user_script_paths = [] if config.user_script_paths: if isinstance(config.user_script_paths, list): - script_paths = config.user_script_paths + script_paths + user_script_paths = config.user_script_paths else: warn("'user_script_paths' must be a list,\n" 'found: {}. Ignoring this setting.' .format(type(config.user_script_paths))) - path_list = [] - for file_package in script_paths: - package = file_package.split('.') - paths = package + [filename] - testpath = os.path.join(config.base_dir, *paths) - if os.path.exists(testpath): - filename = testpath - break - path_list.append(package) - else: - filename = find_alternates(filename, path_list) - return filename + found = test_paths(user_script_paths, config.base_dir) + if found: + return found + + found = test_paths(script_paths, _pwb_dir) + if found: + return found + + return find_alternates(filename, path_list) def execute(): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/742245 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: I119e87b7c8b1a8d0c65e6e41e166f6ebf487bf83 Gerrit-Change-Number: 742245 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]: [doc] update ROADMAP.rst
by jenkins-bot (Code Review) 28 Nov '21

28 Nov '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/742241 ) Change subject: [doc] update ROADMAP.rst ...................................................................... [doc] update ROADMAP.rst Change-Id: I32292bda05506be981e3ed299b61b32781ae9fb5 --- M ROADMAP.rst 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/ROADMAP.rst b/ROADMAP.rst index 9d32716..323b195 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -4,6 +4,14 @@ Improvements and Bugfixes ------------------------- +* pywikibot.argv has been fixed for pwb.py wrapper if called with global args (T254435) +* A new method User.is_locked() was added to determine whether the user is currently locked globally (T249392) +* A new method APISite.is_locked() was added to determine whether a given user or user id is locked globally (T249392) +* APISite.get_globaluserinfo() method was added to retrieve globaluserinfo for any user or user id (T163629) +* APISite.globaluserinfo attribute may be deleted to force reload +* APISite.is_blocked() method has a force parameter to reload that info +* Allow family files in base_dir by default +* Only ignore FileExistsError when creating the api cache (T295924) * Make pwb wrapper script a pywikibot entry point for scripts (T139143, T270480) * Enable -version and --version with pwb wrapper or code entry point (T101828) * Retry upload if 'copyuploadbaddomain' API error occurs (T294825) @@ -82,6 +90,8 @@ Deprecations ^^^^^^^^^^^^ +* 7.0.0: User.isBlocked() method is renamed to is_blocked for consistency +* 7.0.0: Require mysql >= 0.7.11 (T216741) * 7.0.0: Private BaseBot counters _treat_counter, _save_counter, _skip_counter will be removed in favour of collections.Counter counter attribute * 7.0.0: A boolean watch parameter in Page.save() is deprecated and will be desupported * 7.0.0: baserevid parameter of editSource(), editQualifier(), removeClaims(), removeSources(), remove_qualifiers() DataSite methods will be removed -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/742241 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: I32292bda05506be981e3ed299b61b32781ae9fb5 Gerrit-Change-Number: 742241 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits November 2021