Pywikibot-commits May 2021

pywikibot-commits@lists.wikimedia.org

1 participants
182 discussions

[Gerrit] ...core[master]: [IMPR] Remove deprecated parameter from inside pagegenerators.py
by jenkins-bot (Code Review) 03 May '21

03 May '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/684441 ) Change subject: [IMPR] Remove deprecated parameter from inside pagegenerators.py ...................................................................... [IMPR] Remove deprecated parameter from inside pagegenerators.py The following warning is printed every time the mysql page generator is used: WARNING: /mnt/nfs/labstore-secondary-tools-project/dvorapabot/pywikibot/ pywikibot/pagegenerators.py:2687: FutureWarning: encoding argument of pywikibot.data.mysql.mysql_query is deprecated. verbose=verbose) Change-Id: I126abd808c692e2291eae555a9c731a2190c6c5f --- M pywikibot/pagegenerators.py 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 0d2314d..58b1349 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -2683,7 +2683,6 @@ row_gen = mysql.mysql_query(query, dbname=site.dbName(), - encoding=site.encoding(), verbose=verbose) for row in row_gen: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/684441 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: I126abd808c692e2291eae555a9c731a2190c6c5f Gerrit-Change-Number: 684441 Gerrit-PatchSet: 1 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

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

03 May '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/684398 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I392cb62b0752314f7970c98b87bb0a68509f28e9 --- M category/ce.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/category/ce.json b/category/ce.json index c87022a..5aa0833 100644 --- a/category/ce.json +++ b/category/ce.json @@ -8,7 +8,7 @@ "category-adding": "робот: тIетоьхна Категори [[:Category:%(newcat)s|%(newcat)s]]", "category-also-in": "(кхин %(alsocat)s) чохь", "category-listifying": "бот: кхуллуш бу могӀам ({{PLURAL:%(num)d|элементах|элементашах}}) %(fromcat)s", - "category-removing": "бот: юкъара яккхар %(oldcat)s чура", + "category-removing": "бот: юкъара яккхар %(oldcat)s чуьра", "category-renamed": "бот: %(oldcat)s чура дихьа яьккхина. автораш: %(authors)s", "category-replacing": "бот: хийцина категореш %(oldcat)s → %(newcat)s", "category-section-title": "АгӀона истори хила %(oldcat)s чура", -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/684398 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: I392cb62b0752314f7970c98b87bb0a68509f28e9 Gerrit-Change-Number: 684398 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]: [typing] plural.py: import Dict from backports
by jenkins-bot (Code Review) 02 May '21

02 May '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/684119 ) Change subject: [typing] plural.py: import Dict from backports ...................................................................... [typing] plural.py: import Dict from backports Change-Id: I770895d915c7dcaef804b528db8e60f439418de2 --- M pywikibot/plural.py 1 file changed, 2 insertions(+), 7 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/plural.py b/pywikibot/plural.py index aebde6a..a53f469 100644 --- a/pywikibot/plural.py +++ b/pywikibot/plural.py @@ -1,17 +1,12 @@ """Module containing plural rules of various languages.""" # -# (C) Pywikibot team, 2011-2020 +# (C) Pywikibot team, 2011-2021 # # Distributed under the terms of the MIT license. # -import sys from typing import Callable, Union - -if sys.version_info[:2] >= (3, 9): - Dict = dict -else: - from typing import Dict +from pywikibot.backports import Dict PluralRule = Dict[str, Union[int, Callable]] -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/684119 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: I770895d915c7dcaef804b528db8e60f439418de2 Gerrit-Change-Number: 684119 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [bugfix] Import exceptions directly to solve circular imports in Pyt...
by jenkins-bot (Code Review) 02 May '21

02 May '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/684063 ) Change subject: [bugfix] Import exceptions directly to solve circular imports in Python 3.6- ...................................................................... [bugfix] Import exceptions directly to solve circular imports in Python 3.6- Bug: T281551 Change-Id: Iee7b69dd9c0efd785d2d28694c1a2553dd83ddf5 --- M pywikibot/__init__.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 15b0b0d..ce08e96 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -11,6 +11,7 @@ import re import threading import time + from contextlib import suppress from decimal import Decimal from queue import Queue @@ -18,8 +19,8 @@ from urllib.parse import urlparse from warnings import warn -import pywikibot.exceptions as exceptions from pywikibot import config as _config +from pywikibot import exceptions from pywikibot.__metadata__ import ( __copyright__, __description__, -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/684063 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: Iee7b69dd9c0efd785d2d28694c1a2553dd83ddf5 Gerrit-Change-Number: 684063 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [fix] quote python version
by jenkins-bot (Code Review) 02 May '21

02 May '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/684062 ) Change subject: [fix] quote python version ...................................................................... [fix] quote python version Change-Id: I25b9c8d5d4e61afe47fd78e60d7fdd09bce9c966 --- M dev-requirements.txt 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/dev-requirements.txt b/dev-requirements.txt index 777353a..e7ea1a0 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -16,7 +16,7 @@ pyflakes>=2.1.0 flake8>=3.7.5 flake8-docstrings>=0.2.6 -flake8-isort;python_version>=3.6 +flake8-isort;python_version>="3.6" flake8-mock>=0.3 codecov coverage -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/684062 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: I25b9c8d5d4e61afe47fd78e60d7fdd09bce9c966 Gerrit-Change-Number: 684062 Gerrit-PatchSet: 1 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [bugfix] Solve circular import if user-config.p is missing
by jenkins-bot (Code Review) 02 May '21

02 May '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/684014 ) Change subject: [bugfix] Solve circular import if user-config.p is missing ...................................................................... [bugfix] Solve circular import if user-config.p is missing - Do not import or assign unused exceptions; ModuleDeprecationWrapper will provide the requested module part - import pywikibot.exceptions as exceptions to solve circular import Bug: T281551 Change-Id: I892d8c40496c3a8e7b2f065726b60e98964e64d3 --- M pywikibot/__init__.py M pywikibot/data/api.py M pywikibot/i18n.py 3 files changed, 18 insertions(+), 69 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 7ec3875..15b0b0d 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -18,7 +18,7 @@ from urllib.parse import urlparse from warnings import warn -import pywikibot.exceptions +import pywikibot.exceptions as exceptions from pywikibot import config as _config from pywikibot.__metadata__ import ( __copyright__, @@ -46,6 +46,10 @@ ui, ) from pywikibot.diff import PatchManager +from pywikibot.exceptions import ( + CoordinateGlobeUnknownError, + DEPRECATED_EXCEPTIONS, +) from pywikibot.family import AutoFamily, Family from pywikibot.i18n import translate from pywikibot.logging import ( @@ -62,55 +66,11 @@ from pywikibot.tools import ( ModuleDeprecationWrapper as _ModuleDeprecationWrapper, ) -from pywikibot.tools import classproperty +from pywikibot.tools import classproperty, normalize_username from pywikibot.tools import deprecate_arg as _deprecate_arg -from pywikibot.tools import normalize_username, suppress_warnings from pywikibot.tools.formatter import color_format -with suppress_warnings(category=FutureWarning): - from pywikibot.data.api import UploadWarning - from pywikibot.exceptions import ( - DEPRECATED_EXCEPTIONS, - CaptchaError, - CascadeLockedPage, - CircularRedirect, - CoordinateGlobeUnknownError, - CoordinateGlobeUnknownException, - EditConflict, - Error, - FatalServerError, - InterwikiRedirectPage, - InvalidTitle, - IsNotRedirectPage, - IsRedirectPage, - LockedNoPage, - LockedPage, - NoCreateError, - NoMoveTarget, - NoPage, - NoUsername, - NoWikibaseEntity, - OtherPageSaveError, - PageCreatedConflict, - PageDeletedConflict, - PageRelatedError, - PageSaveRelatedError, - SectionError, - Server414Error, - Server504Error, - ServerError, - SiteDefinitionError, - SpamblacklistError, - TitleblacklistError, - UnknownExtension, - UnknownFamily, - UnknownSite, - UnsupportedPage, - WikiBaseError, - ) - - __all__ = ( '__copyright__', '__description__', '__download_url__', '__license__', '__maintainer__', '__maintainer_email__', '__name__', @@ -1366,7 +1326,7 @@ # we can drop them from both our import and __all__ listing. EXCEPTION_CLASSES = { - n for n, _ in inspect.getmembers(pywikibot.exceptions, inspect.isclass) + n for n, _ in inspect.getmembers(exceptions, inspect.isclass) } EXCEPTION_CLASSES.add('UploadWarning') diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index d487ac5..2d9c6b1 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -12,6 +12,7 @@ import pprint import re import traceback + from collections.abc import Container, MutableMapping, Sized from contextlib import suppress from email.generator import BytesGenerator @@ -24,7 +25,7 @@ from warnings import warn import pywikibot -import pywikibot.exceptions + from pywikibot import config, login from pywikibot.backports import Tuple, removeprefix from pywikibot.comms import http @@ -3155,23 +3156,13 @@ page._lintinfo.pop('ns') -APIError = pywikibot.exceptions.APIError -UploadWarning = pywikibot.exceptions.UploadError -APIMWException = pywikibot.exceptions.APIMWError - wrapper = ModuleDeprecationWrapper(__name__) wrapper._add_deprecated_attr( - 'APIError', - replacement_name='pywikibot.exceptions.APIError', - since='20210423', - future_warning=True) + 'APIError', replacement_name='pywikibot.exceptions.APIError', + since='20210423', future_warning=True) wrapper._add_deprecated_attr( - 'UploadWarning', - replacement_name='pywikibot.exceptions.UploadError', - since='20210423', - future_warning=True) + 'UploadWarning', replacement_name='pywikibot.exceptions.UploadError', + since='20210423', future_warning=True) wrapper._add_deprecated_attr( - 'APIMWException', - replacement_name='pywikibot.exceptions.APIMWError', - since='20210423', - future_warning=True) + 'APIMWException', replacement_name='pywikibot.exceptions.APIMWError', + since='20210423', future_warning=True) diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index 39f424e..bd83e13 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -23,6 +23,7 @@ import os import pkgutil import re + from collections import defaultdict from collections.abc import Mapping from contextlib import suppress @@ -31,7 +32,7 @@ from warnings import warn import pywikibot -import pywikibot.exceptions + from pywikibot import __url__, config from pywikibot.backports import List, cache from pywikibot.plural import plural_rule @@ -861,11 +862,8 @@ return pywikibot.input(prompt, password) -TranslationError = pywikibot.exceptions.TranslationError - wrapper = ModuleDeprecationWrapper(__name__) wrapper._add_deprecated_attr( 'TranslationError', replacement_name='pywikibot.exceptions.TranslationError', - since='20210423', - future_warning=True) + since='20210423', future_warning=True) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/684014 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: I892d8c40496c3a8e7b2f065726b60e98964e64d3 Gerrit-Change-Number: 684014 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Isaacandy <isaac(a)iznd.xyz> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Siebrand <siebrand(a)kitano.nl> Gerrit-Reviewer: jenkins-bot Gerrit-CC: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [tests] remove isort from tests
by jenkins-bot (Code Review) 02 May '21

02 May '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/684017 ) Change subject: [tests] remove isort from tests ...................................................................... [tests] remove isort from tests isort tests looks to heavy and demands a wrong sorting order https://integration.wikimedia.org/ci/job/pywikibot-core-tox-docker/15376/co… (probably uppercase first) Do not include isort to flake8 tests but add it to dev-requirements.txt to be runned manually. See also T132122 Bug: T166950 Change-Id: I8f0b16f07151eb0fc1efab341d6c773f8ed57351 --- M dev-requirements.txt M setup.py 2 files changed, 1 insertion(+), 1 deletion(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/dev-requirements.txt b/dev-requirements.txt index 7323cec..777353a 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -16,6 +16,7 @@ pyflakes>=2.1.0 flake8>=3.7.5 flake8-docstrings>=0.2.6 +flake8-isort;python_version>=3.6 flake8-mock>=0.3 codecov coverage diff --git a/setup.py b/setup.py index 4abb54d..4e352ed 100644 --- a/setup.py +++ b/setup.py @@ -81,7 +81,6 @@ 'flake8-comprehensions>=2.2.0', 'flake8-docstrings>=1.3.1', 'flake8-future-import', - 'flake8-isort;python_version>="3.6"', 'flake8-mock>=0.3', 'flake8-print>=2.0.1', 'flake8-quotes>=2.0.1', -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/684017 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: I8f0b16f07151eb0fc1efab341d6c773f8ed57351 Gerrit-Change-Number: 684017 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [cleanup] PageInUse error is already published by ModuleDeprecationWr...
by jenkins-bot (Code Review) 01 May '21

01 May '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/683887 ) Change subject: [cleanup] PageInUse error is already published by ModuleDeprecationWrapper ...................................................................... [cleanup] PageInUse error is already published by ModuleDeprecationWrapper Also remove PageInUse replacements inside private _basesite module Change-Id: I8a77a3822838dc127dadb32eff72e84348dec776 --- M pywikibot/site/__init__.py M pywikibot/site/_basesite.py 2 files changed, 1 insertion(+), 15 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site/__init__.py b/pywikibot/site/__init__.py index 0065402..d4cd3ea 100644 --- a/pywikibot/site/__init__.py +++ b/pywikibot/site/__init__.py @@ -11,12 +11,9 @@ from pywikibot.site._obsoletesites import ClosedSite, RemovedSite from pywikibot.site._siteinfo import Siteinfo from pywikibot.site._tokenwallet import TokenWallet -from pywikibot.tools import ModuleDeprecationWrapper, suppress_warnings +from pywikibot.tools import ModuleDeprecationWrapper -with suppress_warnings(category=FutureWarning): - from pywikibot.site._basesite import PageInUse - __all__ = ('APISite', 'BaseSite', 'ClosedSite', 'DataSite', 'RemovedSite', 'Namespace', 'NamespacesDict', 'PageInUse', 'Siteinfo', 'TokenWallet') diff --git a/pywikibot/site/_basesite.py b/pywikibot/site/_basesite.py index e84cbef..a1c8a55 100644 --- a/pywikibot/site/_basesite.py +++ b/pywikibot/site/_basesite.py @@ -21,7 +21,6 @@ from pywikibot.throttle import Throttle from pywikibot.tools import ( ComparableMixin, - ModuleDeprecationWrapper, SelfCallString, deprecated, first_upper, @@ -456,13 +455,3 @@ def getSite(self, code): # noqa: N802 """Return Site object for language 'code' in this Family.""" return pywikibot.Site(code=code, fam=self.family, user=self.user()) - - -PageInUse = PageInUseError - -wrapper = ModuleDeprecationWrapper(__name__) -wrapper._add_deprecated_attr( - 'PageInUse', - replacement_name='pywikibot.exceptions.PageInUseError', - since='20210423', - future_warning=True) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/683887 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: I8a77a3822838dc127dadb32eff72e84348dec776 Gerrit-Change-Number: 683887 Gerrit-PatchSet: 4 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]: [cleanup] Deprecate regex classes
by jenkins-bot (Code Review) 01 May '21

01 May '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/681194 ) Change subject: [cleanup] Deprecate regex classes ...................................................................... [cleanup] Deprecate regex classes DeprecatedRegex is completely unused (even by the deprecation helpers), and the only spot that LazyRegex is used can just as easily compile in the normal fashion. Bug: T281200 Change-Id: Ia0f065ba063c1cdb0994d46d5b076bc0d43a999a --- M pywikibot/tools/__init__.py M pywikibot/tools/chars.py 2 files changed, 8 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index 33c764b..ebf28ff 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -1937,3 +1937,7 @@ replacement_name='types.MappingProxyType', since='20210415', future_warning=True) +wrapper._add_deprecated_attr('LazyRegex', replacement_name='', + since='20210418', future_warning=True) +wrapper._add_deprecated_attr('DeprecatedRegex', replacement_name='', + since='20210418', future_warning=True) diff --git a/pywikibot/tools/chars.py b/pywikibot/tools/chars.py index 945e70f..d7799a9 100644 --- a/pywikibot/tools/chars.py +++ b/pywikibot/tools/chars.py @@ -4,9 +4,9 @@ # # Distributed under the terms of the MIT license. # +import re import sys -from pywikibot.tools import LazyRegex from pywikibot.tools._unidata import _category_cf @@ -14,7 +14,7 @@ # At the moment we've only added the characters from the Cf category _invisible_chars = _category_cf -invisible_regex = LazyRegex(lambda: '[{}]'.format(''.join(_invisible_chars))) +INVISIBLE_REGEX = re.compile('[{}]'.format(''.join(_invisible_chars))) def contains_invisible(text): @@ -34,4 +34,5 @@ else: codepoint = ord(match) return '<{0:x}>'.format(codepoint) - return invisible_regex.sub(replace, text) + + return INVISIBLE_REGEX.sub(replace, text) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/681194 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: Ia0f065ba063c1cdb0994d46d5b076bc0d43a999a Gerrit-Change-Number: 681194 Gerrit-PatchSet: 7 Gerrit-Owner: Damian <atagar1(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [cleanup] Rename config2
by jenkins-bot (Code Review) 01 May '21

01 May '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/682781 ) Change subject: [cleanup] Rename config2 ...................................................................... [cleanup] Rename config2 This file is called 'config2.py' because it conflicted with a file by the same name in compat [1][2]. That is no longer a concern so we can rename this to the name we import as. Importing 'pywikibot.config2' still works, just deprecated. [2] https://www.mediawiki.org/wiki/Special:Code/pywikipedia/6062 [1] https://gerrit.wikimedia.org/r/plugins/gitiles/pywikibot/compat/+/refs/head… Change-Id: I74cbb1bc609a105245d0edc66e20e78339ec31d4 --- M docs/api_ref/pywikibot.rst M generate_user_files.py M pwb.py M pywikibot/CONTENT.rst M pywikibot/__init__.py M pywikibot/bot.py M pywikibot/comms/http.py R pywikibot/config.py M pywikibot/data/mysql.py M pywikibot/exceptions.py M pywikibot/i18n.py M pywikibot/interwiki_graph.py M pywikibot/userinterfaces/terminal_interface_base.py M pywikibot/version.py M scripts/maintenance/cache.py M scripts/version.py M tests/aspects.py M tests/http_tests.py M tests/interwiki_link_tests.py M tests/link_tests.py M tests/page_tests.py M tests/ui_tests.py M tox.ini 23 files changed, 54 insertions(+), 56 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/api_ref/pywikibot.rst b/docs/api_ref/pywikibot.rst index 05b3f0b..bbfec20 100644 --- a/docs/api_ref/pywikibot.rst +++ b/docs/api_ref/pywikibot.rst @@ -35,10 +35,10 @@ .. automodule:: pywikibot.bot_choice -pywikibot.config2 module ------------------------- +pywikibot.config module +----------------------- -.. automodule:: pywikibot.config2 +.. automodule:: pywikibot.config pywikibot.cosmetic\_changes module ---------------------------------- diff --git a/generate_user_files.py b/generate_user_files.py index 1de6e43..3ac55ab 100755 --- a/generate_user_files.py +++ b/generate_user_files.py @@ -33,8 +33,8 @@ # Disable user-config usage as we are creating it here pywikibot = _import_with_no_user_config('pywikibot') -config, __url__ = pywikibot.config2, pywikibot.__url__ -base_dir = pywikibot.config2.base_dir +config, __url__ = pywikibot.config, pywikibot.__url__ +base_dir = pywikibot.config.base_dir try: console_encoding = sys.stdout.encoding @@ -68,14 +68,14 @@ pywikibot.output('Using existing directory') else: try: - os.mkdir(new_base, pywikibot.config2.private_files_permission) + os.mkdir(new_base, pywikibot.config.private_files_permission) except Exception as e: pywikibot.error('directory creation failed: {0}'.format(e)) continue pywikibot.output('Created new directory.') break - if new_base == pywikibot.config2.get_base_dir(new_base): + if new_base == pywikibot.config.get_base_dir(new_base): # config would find that file return new_base @@ -114,7 +114,7 @@ @return: The family, language and username @rtype: tuple of three str """ - known_families = sorted(pywikibot.config2.family_files.keys()) + known_families = sorted(pywikibot.config.family_files.keys()) if default_family not in known_families: default_family = None fam = pywikibot.bot.input_list_choice( @@ -216,9 +216,9 @@ def parse_sections(): - """Parse sections from config2.py file. + """Parse sections from config.py file. - config2.py will be in the pywikibot/ directory relative to this + config.py will be in the pywikibot/ directory relative to this generate_user_files script. @return: a list of ConfigSection named tuples. @@ -228,7 +228,7 @@ ConfigSection = namedtuple('ConfigSection', 'head, info, section') install = os.path.dirname(os.path.abspath(__file__)) - with codecs.open(os.path.join(install, 'pywikibot', 'config2.py'), + with codecs.open(os.path.join(install, 'pywikibot', 'config.py'), 'r', 'utf-8') as config_f: config_file = config_f.read() diff --git a/pwb.py b/pwb.py index 1d20d0e..3e14281 100755 --- a/pwb.py +++ b/pwb.py @@ -191,8 +191,8 @@ # Search for user-config.py before creating one. # If successful, user-config.py already exists in one of the candidate -# directories. See config2.py for details on search order. -# Use env var to communicate to config2.py pwb.py location (bug T74918). +# directories. See config.py for details on search order. +# Use env var to communicate to config.py pwb.py location (bug T74918). _pwb_dir = os.path.split(__file__)[0] os.environ['PYWIKIBOT_DIR_PWB'] = _pwb_dir try: diff --git a/pywikibot/CONTENT.rst b/pywikibot/CONTENT.rst index 978079f..10ae2c3 100644 --- a/pywikibot/CONTENT.rst +++ b/pywikibot/CONTENT.rst @@ -17,7 +17,7 @@ +----------------------------+------------------------------------------------------+ | bot_choice.py | Classes for input_choice | +----------------------------+------------------------------------------------------+ - | config2.py | Module to define and load Pywikibot configuration | + | config.py | Module to define and load Pywikibot configuration | +----------------------------+------------------------------------------------------+ | cosmetic_changes.py | Slight modifications to a wiki page's source code | +----------------------------+------------------------------------------------------+ diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index b282396..7ec3875 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -19,7 +19,7 @@ from warnings import warn import pywikibot.exceptions -from pywikibot import config2 as config +from pywikibot import config as _config from pywikibot.__metadata__ import ( __copyright__, __description__, @@ -116,7 +116,7 @@ '__maintainer__', '__maintainer_email__', '__name__', '__url__', '__version__', 'Bot', 'calledModuleName', 'CaptchaError', 'CascadeLockedPage', - 'Category', 'CircularRedirect', 'Claim', 'config', 'Coordinate', + 'Category', 'CircularRedirect', 'Claim', 'Coordinate', 'CoordinateGlobeUnknownException', 'critical', 'CurrentPageBot', 'debug', 'EditConflict', 'error', 'Error', 'exception', 'FatalServerError', 'FilePage', 'handle_args', 'html2unicode', 'input', 'input_choice', @@ -1105,7 +1105,7 @@ matched_sites = [] # Iterate through all families and look, which does apply to # the given URL - for fam in config.family_files: + for fam in _config.family_files: family = Family.load(fam) code = family.from_url(url) if code is not None: @@ -1165,8 +1165,8 @@ fam, _, code = code.partition(':') else: # Fallback to config defaults - code = code or config.mylang - fam = fam or config.family + code = code or _config.mylang + fam = fam or _config.family if not isinstance(fam, Family): fam = Family.load(fam) @@ -1177,9 +1177,9 @@ family_name = str(fam) code_to_user = {} - if '*' in config.usernames: # T253127: usernames is a defaultdict - code_to_user = config.usernames['*'].copy() - code_to_user.update(config.usernames[family_name]) + if '*' in _config.usernames: # T253127: usernames is a defaultdict + code_to_user = _config.usernames['*'].copy() + code_to_user.update(_config.usernames[family_name]) user = user or code_to_user.get(code) or code_to_user.get('*') if not isinstance(interface, type): @@ -1282,7 +1282,7 @@ remainingPages -= 1 remainingSeconds = datetime.timedelta( - seconds=round(remainingPages * config.put_throttle)) + seconds=round(remainingPages * _config.put_throttle)) return (remainingPages, remainingSeconds) if stop: @@ -1290,7 +1290,7 @@ page_put_queue.put((None, [], {})) num, sec = remaining() - if num > 0 and sec.total_seconds() > config.noisysleep: + if num > 0 and sec.total_seconds() > _config.noisysleep: output(color_format( '{lightblue}Waiting for {num} pages to be put. ' 'Estimated time remaining: {sec}{default}', num=num, sec=sec)) @@ -1343,9 +1343,9 @@ # queue to hold pending requests -page_put_queue = Queue(config.max_queue_size) +page_put_queue = Queue(_config.max_queue_size) # queue to signal that async_manager is working on a request. See T147178. -page_put_queue_busy = Queue(config.max_queue_size) +page_put_queue_busy = Queue(_config.max_queue_size) # set up the background thread _putthread = threading.Thread(target=async_manager) # identification for debugging purposes @@ -1353,6 +1353,8 @@ _putthread.setDaemon(True) wrapper = _ModuleDeprecationWrapper(__name__) +wrapper._add_deprecated_attr('config2', replacement_name='pywikibot.config', + since='20210426', future_warning=True) wrapper._add_deprecated_attr('__release__', __version__, replacement_name='pywikibot.__version__', since='20200707') diff --git a/pywikibot/bot.py b/pywikibot/bot.py index f694c00..a6c4c61 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -102,8 +102,7 @@ from warnings import warn import pywikibot -from pywikibot import config2 as config -from pywikibot import daemonize, i18n, version +from pywikibot import config, daemonize, i18n, version from pywikibot.backports import Dict, Iterable, List, Sequence from pywikibot.bot_choice import ( AlwaysChoice, @@ -409,7 +408,7 @@ log('SYSTEM: {}'.format(os.uname())) # config file dir - log('CONFIG FILE DIR: {}'.format(pywikibot.config2.base_dir)) + log('CONFIG FILE DIR: {}'.format(pywikibot.config.base_dir)) all_modules = sys.modules.keys() diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index 4b52e35..b35a7f0 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -29,7 +29,7 @@ import requests import pywikibot -from pywikibot import config2 as config +from pywikibot import config from pywikibot.backports import Tuple from pywikibot.exceptions import ( FatalServerError, diff --git a/pywikibot/config2.py b/pywikibot/config.py similarity index 99% rename from pywikibot/config2.py rename to pywikibot/config.py index 1e8985b..a32bfe1 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config.py @@ -434,7 +434,7 @@ # Get the names of all known families, and initialize with empty dictionaries. -# ‘families/’ is a subdirectory of the directory in which config2.py is found. +# ‘families/’ is a subdirectory of the directory in which config.py is found. register_families_folder(os.path.join(os.path.dirname(__file__), 'families')) # Set to True to override the {{bots}} exclusion protocol (at your own risk!) diff --git a/pywikibot/data/mysql.py b/pywikibot/data/mysql.py index 907457e..79f4bc3 100644 --- a/pywikibot/data/mysql.py +++ b/pywikibot/data/mysql.py @@ -9,7 +9,7 @@ import pkg_resources import pywikibot -from pywikibot import config2 as config +from pywikibot import config from pywikibot.tools import deprecated_args @@ -46,7 +46,7 @@ if None, config.verbose_output will be used. @return: generator which yield tuples """ - # These are specified in config2.py or user-config.py + # These are specified in config.py or user-config.py if verbose is None: verbose = config.verbose_output diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py index 019f337..48c85ed 100644 --- a/pywikibot/exceptions.py +++ b/pywikibot/exceptions.py @@ -149,7 +149,7 @@ UserWarning: warnings targeted at users - - config2._ConfigurationDeprecationWarning: user configuration file problems + - config._ConfigurationDeprecationWarning: user configuration file problems - login._PasswordFileWarning: password file problems - ArgumentDeprecationWarning: command line argument problems - FamilyMaintenanceWarning: missing information in family definition diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index 42fcbda..39f424e 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -32,8 +32,7 @@ import pywikibot import pywikibot.exceptions -from pywikibot import __url__ -from pywikibot import config2 as config +from pywikibot import __url__, config from pywikibot.backports import List, cache from pywikibot.plural import plural_rule from pywikibot.tools import ( diff --git a/pywikibot/interwiki_graph.py b/pywikibot/interwiki_graph.py index 8faa414..ddd1de8 100644 --- a/pywikibot/interwiki_graph.py +++ b/pywikibot/interwiki_graph.py @@ -10,7 +10,7 @@ from typing import Optional import pywikibot -from pywikibot import config2 as config +from pywikibot import config from pywikibot.tools import ModuleDeprecationWrapper diff --git a/pywikibot/userinterfaces/terminal_interface_base.py b/pywikibot/userinterfaces/terminal_interface_base.py index 106edbf..4c6dee2 100755 --- a/pywikibot/userinterfaces/terminal_interface_base.py +++ b/pywikibot/userinterfaces/terminal_interface_base.py @@ -12,7 +12,7 @@ from typing import Any, Optional, Union import pywikibot -from pywikibot import config2 as config +from pywikibot import config from pywikibot.backports import Sequence from pywikibot.bot_choice import ( ChoiceException, diff --git a/pywikibot/version.py b/pywikibot/version.py index 96b1d03..ddf4543 100644 --- a/pywikibot/version.py +++ b/pywikibot/version.py @@ -21,7 +21,7 @@ from warnings import warn import pywikibot -from pywikibot import config2 as config +from pywikibot import config from pywikibot.backports import cache from pywikibot.comms.http import fetch from pywikibot.exceptions import VersionParseError diff --git a/scripts/maintenance/cache.py b/scripts/maintenance/cache.py index 7c6d78b..a7a242f 100755 --- a/scripts/maintenance/cache.py +++ b/scripts/maintenance/cache.py @@ -227,7 +227,7 @@ - True = always use """ if not cache_path: - cache_path = os.path.join(pywikibot.config2.base_dir, + cache_path = os.path.join(pywikibot.config.base_dir, 'apicache-py{0:d}'.format(PYTHON_VERSION[0])) if not os.path.exists(cache_path): @@ -436,13 +436,13 @@ cache_paths += [os.path.join('tests', f) for f in folders] # Also process the base directory, if it isn't the current directory - if os.path.abspath(os.getcwd()) != pywikibot.config2.base_dir: + if os.path.abspath(os.getcwd()) != pywikibot.config.base_dir: cache_paths += [ - os.path.join(pywikibot.config2.base_dir, f) for f in folders] + os.path.join(pywikibot.config.base_dir, f) for f in folders] # Also process the user home cache, if it isn't the config directory userpath = os.path.expanduser(os.path.join('~', '.pywikibot')) - if userpath != pywikibot.config2.base_dir: + if userpath != pywikibot.config.base_dir: cache_paths += [ os.path.join(userpath, f) for f in folders] diff --git a/scripts/version.py b/scripts/version.py index c0da3e8..a11faf2 100755 --- a/scripts/version.py +++ b/scripts/version.py @@ -68,8 +68,8 @@ os.environ.get(environ_name, 'Not set'))) - pywikibot.output('Config base dir: ' + pywikibot.config2.base_dir) - for family, usernames in pywikibot.config2.usernames.items(): + pywikibot.output('Config base dir: ' + pywikibot.config.base_dir) + for family, usernames in pywikibot.config.usernames.items(): if not usernames: continue pywikibot.output('Usernames for family "{0}":'.format(family)) diff --git a/tests/aspects.py b/tests/aspects.py index 5831ab7..e3eb391 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -23,8 +23,7 @@ from unittest.util import safe_repr import pywikibot -import pywikibot.config2 as config -from pywikibot import Site +from pywikibot import Site, config from pywikibot.backports import removeprefix from pywikibot.comms import http from pywikibot.data.api import Request as _original_Request diff --git a/tests/http_tests.py b/tests/http_tests.py index fed76e2..2bd4256 100644 --- a/tests/http_tests.py +++ b/tests/http_tests.py @@ -13,7 +13,7 @@ import requests import pywikibot -from pywikibot import config2 as config +from pywikibot import config from pywikibot.comms import http from pywikibot.exceptions import FatalServerError, Server504Error from pywikibot.tools import PYTHON_VERSION, suppress_warnings diff --git a/tests/interwiki_link_tests.py b/tests/interwiki_link_tests.py index 196c80e..bc30396 100644 --- a/tests/interwiki_link_tests.py +++ b/tests/interwiki_link_tests.py @@ -6,7 +6,7 @@ # from contextlib import suppress -from pywikibot import config2 as config +from pywikibot import config from pywikibot.exceptions import InvalidTitleError from pywikibot.page import Link from tests.aspects import AlteredDefaultSiteTestCase as LinkTestCase diff --git a/tests/link_tests.py b/tests/link_tests.py index e9a0530..52e0433 100644 --- a/tests/link_tests.py +++ b/tests/link_tests.py @@ -8,8 +8,7 @@ from contextlib import suppress import pywikibot -from pywikibot import Site -from pywikibot import config2 as config +from pywikibot import Site, config from pywikibot.exceptions import InvalidTitleError, SiteDefinitionError from pywikibot.page import Link, Page, SiteLink from pywikibot.site import Namespace diff --git a/tests/page_tests.py b/tests/page_tests.py index f63cdab..2baa0e6 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -186,7 +186,7 @@ maintalk = mainpage.toggleTalkPage() family_name = (site.family.name + ':' - if pywikibot.config2.family != site.family.name + if pywikibot.config.family != site.family.name else '') self.assertEqual(str(mainpage), '[[{}{}:{}]]' .format(family_name, site.code, diff --git a/tests/ui_tests.py b/tests/ui_tests.py index c6c9cad..9310526 100644 --- a/tests/ui_tests.py +++ b/tests/ui_tests.py @@ -732,12 +732,12 @@ def setUp(self): """Force colorized_output to True.""" super().setUp() - self._old_config = pywikibot.config2.colorized_output - pywikibot.config2.colorized_output = True + self._old_config = pywikibot.config.colorized_output + pywikibot.config.colorized_output = True def tearDown(self): """Undo colorized_output configuration.""" - pywikibot.config2.colorized_output = self._old_config + pywikibot.config.colorized_output = self._old_config super().tearDown() diff --git a/tox.ini b/tox.ini index 6500f3c..82304f3 100644 --- a/tox.ini +++ b/tox.ini @@ -131,7 +131,7 @@ pywikibot/_wbtypes.py: N802 pywikibot/backports.py: F401 pywikibot/bot.py: N802, N816 - pywikibot/config2.py: N816 + pywikibot/config.py: N816 pywikibot/cosmetic_changes.py : N802, N803, N806, N816 pywikibot/data/api.py : N802 pywikibot/date.py : N802, N803, N806, N816 -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/682781 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: I74cbb1bc609a105245d0edc66e20e78339ec31d4 Gerrit-Change-Number: 682781 Gerrit-PatchSet: 6 Gerrit-Owner: Damian <atagar1(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Isaacandy <isaac(a)iznd.xyz> Gerrit-Reviewer: Siebrand <siebrand(a)kitano.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-CC: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-CC: Legoktm <legoktm(a)debian.org> Gerrit-MessageType: merged

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits May 2021