Pywikibot-commits

pywikibot-commits@lists.wikimedia.org

1 participants
13500 discussions

[Gerrit] ...core[tests]: Backport T324310 changes to tests
by jenkins-bot (Code Review) 08 Dec '22

08 Dec '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/866253 ) Change subject: Backport T324310 changes to tests ...................................................................... Backport T324310 changes to tests Bug: T324310 Change-Id: Iad16e226b59e3c990f124f56b25d53703b169402 --- M pywikibot/textlib.py 1 file changed, 28 insertions(+), 8 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index e8e0af3..b09d31d 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -25,7 +25,12 @@ from pywikibot.exceptions import InvalidTitleError, SiteDefinitionError from pywikibot.family import Family from pywikibot.time import TZoneFixedOffset -from pywikibot.tools import ModuleDeprecationWrapper, deprecated +from pywikibot.tools import ( + ModuleDeprecationWrapper, + deprecated, + first_lower, + first_upper, +) from pywikibot.userinterfaces.transliteration import NON_LATIN_DIGITS @@ -1837,13 +1842,18 @@ self.site = pywikibot.Site() if site is None else site self.origNames2monthNum = {} - for n, (_long, _short) in enumerate(self.site.months_names, start=1): - self.origNames2monthNum[_long] = n - self.origNames2monthNum[_short] = n - # in some cases month in ~~~~ might end without dot even if - # site.months_names do not. - if _short.endswith('.'): - self.origNames2monthNum[_short[:-1]] = n + # use first_lower/first_upper for 'vi' language because monthsnames + # were changed: T324310 + functions = [first_upper, + first_lower] if self.site.lang == 'vi' else [str] + for n, (long, short) in enumerate(self.site.months_names, start=1): + for func in functions: + self.origNames2monthNum[func(long)] = n + self.origNames2monthNum[func(short)] = n + # in some cases month in ~~~~ might end without dot even if + # site.months_names do not. + if short.endswith('.'): + self.origNames2monthNum[func(short[:-1])] = n self.groups = ['year', 'month', 'hour', 'time', 'day', 'minute', 'tzinfo'] -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/866253 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: tests Gerrit-Change-Id: Iad16e226b59e3c990f124f56b25d53703b169402 Gerrit-Change-Number: 866253 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [doc] Update tools' doc and add some doctests
by jenkins-bot (Code Review) 08 Dec '22

08 Dec '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/866251 ) Change subject: [doc] Update tools' doc and add some doctests ...................................................................... [doc] Update tools' doc and add some doctests Change-Id: Iaaa01bf5635bb219fe49237e0afbdeb6f76e9aa9 --- M pywikibot/tools/__init__.py 1 file changed, 34 insertions(+), 6 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index bad616f..902653e 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -264,6 +264,11 @@ Empty strings are supported. The original string is not changed. + **Example**: + + >>> first_lower('Hello World') + 'hello World' + .. versionadded:: 3.0 """ return string[:1].lower() + string[1:] @@ -275,13 +280,16 @@ Empty strings are supported. The original string is not changed. - .. versionadded:: 3.0 + **Example**: - .. note:: MediaWiki doesn't capitalize - some characters the same way as Python. - This function tries to be close to - MediaWiki's capitalize function in - title.php. See T179115 and T200357. + >>> first_upper('hello World') + 'Hello World' + + .. versionadded:: 3.0 + .. note:: MediaWiki doesn't capitalize some characters the same way + as Python. This function tries to be close to MediaWiki's + capitalize function in title.php. See :phab:`T179115` and + :phab:`T200357`. """ first = string[:1] return (_first_upper_exception(first) or first.upper()) + string[1:] @@ -334,6 +342,17 @@ This is a reimplementation of distutils.util.strtobool due to :pep:`632#Migration Advice` + **Example**: + + >>> strtobool('yes') + True + >>> strtobool('Off') + False + >>> strtobool('aye') + Traceback (most recent call last): + ... + ValueError: invalid truth value 'aye' + .. versionadded:: 7.1 :param val: True values are 'y', 'yes', 't', 'true', 'on', and '1'; -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/866251 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: Iaaa01bf5635bb219fe49237e0afbdeb6f76e9aa9 Gerrit-Change-Number: 866251 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]: [IMPR] Create a cookie file for each account
by jenkins-bot (Code Review) 07 Dec '22

07 Dec '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/861895 ) Change subject: [IMPR] Create a cookie file for each account ...................................................................... [IMPR] Create a cookie file for each account - Add/restore PywikibotCookieJar which overrides load and save method. This enables lazy load of cookies during login when the username is known already. - load() creates the PywikibotCookieJar.filename and tries to load the cookies - save() creates the cookies file and checks the file mode - APISite.login calls http.cookie_jar.load to load cookies for a given user - remove http.SSL_CERT_VERIFY_FAILED_MSG and remove duplicate error message in generate_family_file.py - add a new tools function as_filename() which ensures that a string can be used as filename. - use as_filename to create a filename for the given user - use as_filename with BasePage.title() Bug: T324000 Change-Id: Ibb717fdb18d5bd9ed6b39e025e5a1dd1afde4eda --- M pywikibot/tools/__init__.py M pywikibot/comms/http.py M pywikibot/scripts/generate_family_file.py M pywikibot/site/_apisite.py M pywikibot/page/_page.py 5 files changed, 129 insertions(+), 33 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index 429c96b..56518b3 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -11,15 +11,19 @@ - Basic HTTP error handling This module creates and uses its own ``requests.Session`` object. -The session is closed if the module terminates. -If required you can use your own Session object passing it to the -``http.session`` variable:: +The session is closed if the module terminates. If required you can use +your own Session object passing it to the ``http.session`` variable:: from pywikibot.comms import http session = requests.Session() http.session = session -:py:obj:`flush()` can be called to close the session object. +To enable access via cookies, assign cookie handling class:: + + session.cookies = http.cookie_jar + +.. versionchanged:: 8.0 + Cookies are lazy loaded when logging to site. """ # # (C) Pywikibot team, 2007-2022 @@ -40,7 +44,7 @@ import requests import pywikibot -from pywikibot import config +from pywikibot import config, tools from pywikibot.backports import Tuple from pywikibot.exceptions import ( FatalServerError, @@ -58,20 +62,48 @@ requests_oauthlib = e -# The error message for failed SSL certificate verification -# 'certificate verify failed' is a commonly detectable string -SSL_CERT_VERIFY_FAILED_MSG = 'certificate verify failed' +class PywikibotCookieJar(cookiejar.LWPCookieJar): -cookie_file_path = config.datafilepath('pywikibot.lwp') -file_mode_checker(cookie_file_path, create=True) -cookie_jar = cookiejar.LWPCookieJar(cookie_file_path) -try: - cookie_jar.load(ignore_discard=True) -except cookiejar.LoadError: - debug('Loading cookies failed.') -else: - debug('Loaded cookies from file.') + """CookieJar which create the filename and checks file permissions. + .. versionadded:: 8.0 + """ + + def load(self, user: str = '', *args, **kwargs) -> None: + """Loads cookies from a file. + + Insert the account name to the cookie filename, set the + instance`s filename and load the cookies. + + :param user: account name to be part of the cookie filename. + """ + _user = '-' + tools.as_filename(user) if user else '' + self.filename = config.datafilepath(f'pywikibot{_user}.lwp') + + try: + super().load(*args, **kwargs) + except (cookiejar.LoadError, FileNotFoundError): + debug(f'Loading cookies for user {user} failed.') + else: + debug(f'Loaded cookies for user {user} from file.') + + def save(self, *args, **kwargs) -> None: + """Check the file mode and save cookies to a file. + + .. note:: *PywikibotCookieJar* must be loaded previously to set + the filename. + + :raises ValueError: a filename was not supplied; :meth:`load` + must be called first. + """ + if self.filename: + file_mode_checker(self.filename, create=True) + super().save(*args, **kwargs) + + +#: global :class:`PywikibotCookieJar` instance. +cookie_jar = PywikibotCookieJar() +#: global :class:`requests.Session`. session = requests.Session() session.cookies = cookie_jar @@ -268,7 +300,7 @@ """ # TODO: do some error correcting stuff if isinstance(response, requests.exceptions.SSLError) \ - and SSL_CERT_VERIFY_FAILED_MSG in str(response): + and 'certificate verify failed' in str(response): raise FatalServerError(str(response)) if isinstance(response, requests.ConnectionError): diff --git a/pywikibot/page/_page.py b/pywikibot/page/_page.py index 1b424ed..2e9f734 100644 --- a/pywikibot/page/_page.py +++ b/pywikibot/page/_page.py @@ -30,7 +30,7 @@ from warnings import warn import pywikibot -from pywikibot import Timestamp, config, date, i18n, textlib +from pywikibot import Timestamp, config, date, i18n, textlib, tools from pywikibot.backports import ( Dict, Generator, @@ -305,14 +305,7 @@ encoded_title = title.encode(self.site.encoding()) title = quote_from_bytes(encoded_title, safe='') if as_filename: - # Replace characters that are not possible in file names on some - # systems, but still are valid in MediaWiki titles: - # Unix: / - # MediaWiki: /:\ - # Windows: /:\"?* - # Spaces are possible on most systems, but are bad for URLs. - for forbidden in ':*?/\\" ': - title = title.replace(forbidden, '_') + title = tools.as_filename(title) return title def section(self) -> Optional[str]: diff --git a/pywikibot/scripts/generate_family_file.py b/pywikibot/scripts/generate_family_file.py index e79a650..16e2171 100755 --- a/pywikibot/scripts/generate_family_file.py +++ b/pywikibot/scripts/generate_family_file.py @@ -119,8 +119,6 @@ try: w = self.Wiki(self.base_url, verify=verify) except FatalServerError: - pywikibot.error( - pywikibot.comms.http.SSL_CERT_VERIFY_FAILED_MSG) pywikibot.exception() if not pywikibot.bot.input_yn( 'Retry with disabled ssl certificate validation', diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index 8032203..b6ccda2 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -25,7 +25,7 @@ removesuffix, ) from pywikibot.backports import OrderedDict as OrderedDictType -from pywikibot.comms.http import get_authentication +from pywikibot.comms import http from pywikibot.data import api from pywikibot.exceptions import ( AbuseFilterDisallowedError, @@ -326,7 +326,7 @@ def is_oauth_token_available(self) -> bool: """Check whether OAuth token is set for this site.""" - auth_token = get_authentication(self.base_url('')) + auth_token = http.get_authentication(self.base_url('')) return auth_token is not None and len(auth_token) == 4 def login( @@ -334,8 +334,10 @@ autocreate: bool = False, user: Optional[str] = None ) -> None: - """ - Log the user in if not already logged in. + """Log the user in if not already logged in. + + .. versionchanged:: 8.0 + lazy load cookies when logging in. .. seealso:: :api:`Login` @@ -372,6 +374,10 @@ self._loginstatus = _LoginStatus.IN_PROGRESS if user: self._username = normalize_username(user) + + # load the password for self.username from cookie file + http.cookie_jar.load(self.username(), ignore_discard=True) + try: del self.userinfo # force reload if self.userinfo['name'] == self.user(): diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index f59c46e..bad616f 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -60,6 +60,7 @@ # other tools 'PYTHON_VERSION', + 'as_filename', 'is_ip_address', 'has_module', 'classproperty', @@ -286,6 +287,47 @@ return (_first_upper_exception(first) or first.upper()) + string[1:] +def as_filename(string: str, repl: str = '_') -> str: + r"""Return a string with characters are valid for filenames. + + Replace characters that are not possible in file names on some + systems, but still are valid in MediaWiki titles: + + - Unix: ``/`` + - MediaWiki: ``/:\\`` + - Windows: ``/:\\"?*`` + + Spaces are possible on most systems, but are bad for URLs. + + **Example**: + + >>> as_filename('How are you?') + 'How_are_you_' + >>> as_filename('Say: "Hello"') + 'Say___Hello_' + >>> as_filename('foo*bar', '') + 'foobar' + >>> as_filename('foo', 'bar') + Traceback (most recent call last): + ... + ValueError: Invalid repl parameter 'bar' + >>> as_filename('foo', '?') + Traceback (most recent call last): + ... + ValueError: Invalid repl parameter '?' + + .. versionadded:: 8.0 + + :param string: the string to be modified + :param repl: the replacement character + :raises ValueError: Invalid repl parameter + """ + pattern = r':*?/\\" ' + if len(repl) > 1 or len(repl) == 1 and repl in pattern: + raise ValueError(f'Invalid repl parameter {repl!r}') + return re.sub(f'[{pattern}]', repl, string) + + def strtobool(val: str) -> bool: """Convert a string representation of truth to True or False. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/861895 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: Ibb717fdb18d5bd9ed6b39e025e5a1dd1afde4eda Gerrit-Change-Number: 861895 Gerrit-PatchSet: 9 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Bináris <wikiposta(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] use pathlib.write_text instead of codecs in daemonize.py
by jenkins-bot (Code Review) 07 Dec '22

07 Dec '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/862228 ) Change subject: [IMPR] use pathlib.write_text instead of codecs in daemonize.py ...................................................................... [IMPR] use pathlib.write_text instead of codecs in daemonize.py Change-Id: I63343aa139d48ec99f676c2276fcc7aa7a5cc59d --- M pywikibot/daemonize.py 1 file changed, 16 insertions(+), 7 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/daemonize.py b/pywikibot/daemonize.py index 6b433e8..1ed97bc 100644 --- a/pywikibot/daemonize.py +++ b/pywikibot/daemonize.py @@ -4,20 +4,20 @@ # # Distributed under the terms of the MIT license. # -import codecs import os import stat import sys +from pathlib import Path from typing import Optional is_daemon = False -def daemonize(close_fd: bool = True, chdir: bool = True, +def daemonize(close_fd: bool = True, + chdir: bool = True, redirect_std: Optional[str] = None) -> None: - """ - Daemonize the current process. + """Daemonize the current process. Only works on POSIX compatible operating systems. The process will fork to the background and return control to terminal. @@ -58,9 +58,9 @@ return # Write out the pid - path = os.path.basename(sys.argv[0]) + '.pid' - with codecs.open(path, 'w', 'utf-8') as f: - f.write(str(pid)) + path = Path(Path(sys.argv[0]).name).with_suffix('.pid') + path.write_text(str(pid), encoding='uft-8') + # Exit to return control to the terminal # os._exit to prevent the cleanup to run os._exit(os.EX_OK) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/862228 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: I63343aa139d48ec99f676c2276fcc7aa7a5cc59d Gerrit-Change-Number: 862228 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]: [IMPR] Move data.api._login.LoginManager to login.ClientLoginManager
by jenkins-bot (Code Review) 07 Dec '22

07 Dec '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/860980 ) Change subject: [IMPR] Move data.api._login.LoginManager to login.ClientLoginManager ...................................................................... [IMPR] Move data.api._login.LoginManager to login.ClientLoginManager Keep LoginManagers in only one place. Therefore Move data.api._login.LoginManager to login file as ClientLoginManager where also OauthLoginManager resides. This might be important to implement OAuth 2 or other login related issues like interactive login. Change-Id: Ic6d5bd9a5824b0400fbf4f74fbbcc324d0684ca6 --- M pywikibot/login.py M pywikibot/data/api/__init__.py M tests/utils.py M pywikibot/CONTENT.rst D pywikibot/data/api/_login.py M pywikibot/site/_apisite.py M tests/api_tests.py 7 files changed, 215 insertions(+), 210 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/CONTENT.rst b/pywikibot/CONTENT.rst index 52ba21a..337b855 100644 --- a/pywikibot/CONTENT.rst +++ b/pywikibot/CONTENT.rst @@ -95,8 +95,6 @@ | +----------------+-------------------------------------+ | | _generators.py | API/Query generators | | +----------------+-------------------------------------+ - | | _login.py | API login interface | - | +----------------+-------------------------------------+ | | _optionset.py | Boolean API option | | +----------------+-------------------------------------+ | | _paraminfo.py | API information data object | diff --git a/pywikibot/data/api/__init__.py b/pywikibot/data/api/__init__.py index 6445c8c..c7e6db9 100644 --- a/pywikibot/data/api/__init__.py +++ b/pywikibot/data/api/__init__.py @@ -19,11 +19,11 @@ QueryGenerator, update_page, ) -from pywikibot.data.api._login import LoginManager from pywikibot.data.api._paraminfo import ParamInfo from pywikibot.data.api._optionset import OptionSet from pywikibot.data.api._requests import CachedRequest, Request, encode_url from pywikibot.family import SubdomainFamily +from pywikibot.tools import ModuleDeprecationWrapper __all__ = ( 'APIGeneratorBase', @@ -31,7 +31,6 @@ 'CachedRequest', 'ListGenerator', 'LogEntryListGenerator', - 'LoginManager', 'OptionSet', 'PageGenerator', 'ParamInfo', @@ -95,3 +94,9 @@ MIMEMultipart = CTEBinaryMIMEMultipart + +wrapper = ModuleDeprecationWrapper(__name__) +wrapper.add_deprecated_attr( + 'LoginManager', + replacement_name='pywikibot.login.ClientLoginManager', + since='8.0.0') diff --git a/pywikibot/data/api/_login.py b/pywikibot/data/api/_login.py deleted file mode 100644 index 09a318d..0000000 --- a/pywikibot/data/api/_login.py +++ /dev/null @@ -1,174 +0,0 @@ -"""API login Interface.""" -# -# (C) Pywikibot team, 2008-2022 -# -# Distributed under the terms of the MIT license. -# -import datetime -import re -from typing import Optional - -import pywikibot -from pywikibot import login -from pywikibot.backports import Dict -from pywikibot.login import LoginStatus -from pywikibot.tools import deprecated - -__all__ = ['LoginManager'] - - -class LoginManager(login.LoginManager): - - """Supply login_to_site method to use API interface. - - .. versionchanged:: 8.0 - 2FA login was enabled. - """ - - # API login parameters mapping - mapping = { - 'user': ('lgname', 'username'), - 'password': ('lgpassword', 'password'), - 'ldap': ('lgdomain', 'domain'), - 'token': ('lgtoken', 'logintoken'), - 'result': ('result', 'status'), - 'success': ('Success', 'PASS'), - 'fail': ('Failed', 'FAIL'), - 'reason': ('reason', 'message') - } - - def keyword(self, key): - """Get API keyword from mapping.""" - return self.mapping[key][self.action != 'login'] - - def _login_parameters(self, *, botpassword: bool = False - ) -> Dict[str, str]: - """Return login parameters.""" - if botpassword: - self.action = 'login' - else: - token = self.site.tokens['login'] - self.action = 'clientlogin' - - # prepare default login parameters - parameters = {'action': self.action, - self.keyword('user'): self.login_name, - self.keyword('password'): self.password} - - if self.action == 'clientlogin': - # clientlogin requires non-empty loginreturnurl - parameters['loginreturnurl'] = 'https://example.com' - parameters['rememberMe'] = '1' - parameters['logintoken'] = token - - if self.site.family.ldapDomain: - parameters[self.keyword('ldap')] = self.site.family.ldapDomain - - return parameters - - def login_to_site(self) -> None: - """Login to the site. - - Note, this doesn't do anything with cookies. The http module - takes care of all the cookie stuff. Throws exception on failure. - - .. versionchanged:: 8.0 - 2FA login was enabled. - """ - if hasattr(self, '_waituntil') \ - and datetime.datetime.now() < self._waituntil: - diff = self._waituntil - datetime.datetime.now() - pywikibot.warning( - 'Too many tries, waiting {} seconds before retrying.' - .format(diff.seconds)) - pywikibot.sleep(diff.seconds) - - self.site._loginstatus = LoginStatus.IN_PROGRESS - - # Bot passwords username contains @, - # otherwise @ is not allowed in usernames. - # @ in bot password is deprecated, - # but we don't want to break bots using it. - parameters = self._login_parameters( - botpassword='@' in self.login_name or '@' in self.password) - - # base login request - login_request = self.site._request(use_get=False, - parameters=parameters) - while True: - # try to login - try: - login_result = login_request.submit() - except pywikibot.exceptions.APIError as e: # pragma: no cover - login_result = {'error': e.__dict__} - - # clientlogin response can be clientlogin or error - if self.action in login_result: - response = login_result[self.action] - result_key = self.keyword('result') - elif 'error' in login_result: - response = login_result['error'] - result_key = 'code' - else: - raise RuntimeError('Unexpected API login response key.') - - status = response[result_key] - fail_reason = response.get(self.keyword('reason'), '') - if status == self.keyword('success'): - return - - if status in ('NeedToken', 'WrongToken', 'badtoken'): - # if incorrect login token was used, - # force relogin and generate fresh one - pywikibot.error('Received incorrect login token. ' - 'Forcing re-login.') - # invalidate superior wiki cookies (T224712) - pywikibot.data.api._invalidate_superior_cookies( - self.site.family) - self.site.tokens.clear() - login_request[ - self.keyword('token')] = self.site.tokens['login'] - continue - - if status == 'UI': # pragma: no cover - oathtoken = pywikibot.input(response['message'], password=True) - login_request['OATHToken'] = oathtoken - login_request['logincontinue'] = True - del login_request['username'] - del login_request['password'] - del login_request['rememberMe'] - continue - - # messagecode was introduced with 1.29.0-wmf.14 - # but older wikis are still supported - login_throttled = response.get('messagecode') == 'login-throttled' - - if (status == 'Throttled' or status == self.keyword('fail') - and (login_throttled or 'wait' in fail_reason)): - wait = response.get('wait') - if wait: - delta = datetime.timedelta(seconds=int(wait)) - else: - match = re.search(r'(\d+) (seconds|minutes)', fail_reason) - if match: - delta = datetime.timedelta(**{match[2]: int(match[1])}) - else: - delta = datetime.timedelta() - self._waituntil = datetime.datetime.now() + delta - - break - - if 'error' in login_result: - raise pywikibot.exceptions.APIError(**response) - - raise pywikibot.exceptions.APIError(code=status, info=fail_reason) - - @deprecated("site.tokens['login']", since='8.0.0') - def get_login_token(self) -> Optional[str]: - """Fetch login token for MediaWiki 1.27+. - - .. deprecated:: 8.0 - - :return: login token - """ - return self.site.tokens['login'] diff --git a/pywikibot/login.py b/pywikibot/login.py index 2a13ffe..1b1b661 100644 --- a/pywikibot/login.py +++ b/pywikibot/login.py @@ -5,7 +5,9 @@ # Distributed under the terms of the MIT license. # import codecs +import datetime import os +import re import webbrowser from enum import IntEnum from typing import Any, Optional @@ -16,7 +18,7 @@ from pywikibot.backports import Dict, Tuple from pywikibot.comms import http from pywikibot.exceptions import APIError, NoUsernameError -from pywikibot.tools import file_mode_checker, normalize_username +from pywikibot.tools import deprecated, file_mode_checker, normalize_username try: @@ -170,7 +172,7 @@ def login_to_site(self) -> None: """Login to the site.""" - # THIS IS OVERRIDDEN IN data/api.py + # This is overridden in ClientLoginManager raise NotImplementedError def storecookiedata(self) -> None: @@ -178,30 +180,29 @@ http.cookie_jar.save(ignore_discard=True) def readPassword(self) -> None: - """ - Read passwords from a file. + """Read passwords from a file. - DO NOT FORGET TO REMOVE READ ACCESS FOR OTHER USERS!!! - Use chmod 600 password-file. + .. warning:: **Do not forget to remove read access for other + users!** Use chmod 600 for password-file. All lines below should be valid Python tuples in the form - (code, family, username, password), - (family, username, password) or - (username, password) - to set a default password for an username. The last matching entry will - be used, so default usernames should occur above specific usernames. + ``(code, family, username, password)``, + ``(family, username, password)`` or ``(username, password)`` to + set a default password for an username. The last matching entry + will be used, so default usernames should occur above specific + usernames. - For BotPasswords the password should be given as a BotPassword object. + .. note:: For BotPasswords the password should be given as a + :class:`BotPassword` object. The file must be either encoded in ASCII or UTF-8. - Example:: + **Example**:: ('my_username', 'my_default_password') ('wikipedia', 'my_wikipedia_user', 'my_wikipedia_pass') ('en', 'wikipedia', 'my_en_wikipedia_user', 'my_en_wikipedia_pass') - ('my_username', BotPassword( - 'my_BotPassword_suffix', 'my_BotPassword_password')) + ('my_username', BotPassword('my_suffix', 'my_password')) """ # Set path to password file relative to the user_config # but fall back on absolute path for backwards compatibility @@ -215,6 +216,7 @@ with codecs.open(password_file, encoding='utf-8') as f: lines = f.readlines() + line_nr = len(lines) + 1 for line in reversed(lines): line_nr -= 1 @@ -232,8 +234,8 @@ continue if not 2 <= len(entry) <= 4: - warn('The length of tuple in line {} should be 2 to 4 ({} ' - 'given)'.format(line_nr, entry), _PasswordFileWarning) + warn(f'The length of tuple in line {line_nr} should be 2 to 4 ' + f'({entry} given)', _PasswordFileWarning) continue code, family, username, password = ( @@ -313,6 +315,164 @@ return False +class ClientLoginManager(LoginManager): + + """Supply login_to_site method to use API interface. + + .. versionchanged:: 8.0 + 2FA login was enabled. LoginManager was moved from :mod:`data.api` + to :mod:`login` module and renamed to *ClientLoginManager*. + """ + + # API login parameters mapping + mapping = { + 'user': ('lgname', 'username'), + 'password': ('lgpassword', 'password'), + 'ldap': ('lgdomain', 'domain'), + 'token': ('lgtoken', 'logintoken'), + 'result': ('result', 'status'), + 'success': ('Success', 'PASS'), + 'fail': ('Failed', 'FAIL'), + 'reason': ('reason', 'message') + } + + def keyword(self, key): + """Get API keyword from mapping.""" + return self.mapping[key][self.action != 'login'] + + def _login_parameters(self, *, botpassword: bool = False + ) -> Dict[str, str]: + """Return login parameters.""" + if botpassword: + self.action = 'login' + else: + token = self.site.tokens['login'] + self.action = 'clientlogin' + + # prepare default login parameters + parameters = {'action': self.action, + self.keyword('user'): self.login_name, + self.keyword('password'): self.password} + + if self.action == 'clientlogin': + # clientlogin requires non-empty loginreturnurl + parameters['loginreturnurl'] = 'https://example.com' + parameters['rememberMe'] = '1' + parameters['logintoken'] = token + + if self.site.family.ldapDomain: + parameters[self.keyword('ldap')] = self.site.family.ldapDomain + + return parameters + + def login_to_site(self) -> None: + """Login to the site. + + Note, this doesn't do anything with cookies. The http module + takes care of all the cookie stuff. Throws exception on failure. + + .. versionchanged:: 8.0 + 2FA login was enabled. + """ + if hasattr(self, '_waituntil') \ + and datetime.datetime.now() < self._waituntil: + diff = self._waituntil - datetime.datetime.now() + pywikibot.warning( + 'Too many tries, waiting {} seconds before retrying.' + .format(diff.seconds)) + pywikibot.sleep(diff.seconds) + + self.site._loginstatus = LoginStatus.IN_PROGRESS + + # Bot passwords username contains @, + # otherwise @ is not allowed in usernames. + # @ in bot password is deprecated, + # but we don't want to break bots using it. + parameters = self._login_parameters( + botpassword='@' in self.login_name or '@' in self.password) + + # base login request + login_request = self.site._request(use_get=False, + parameters=parameters) + while True: + # try to login + try: + login_result = login_request.submit() + except pywikibot.exceptions.APIError as e: # pragma: no cover + login_result = {'error': e.__dict__} + + # clientlogin response can be clientlogin or error + if self.action in login_result: + response = login_result[self.action] + result_key = self.keyword('result') + elif 'error' in login_result: + response = login_result['error'] + result_key = 'code' + else: + raise RuntimeError('Unexpected API login response key.') + + status = response[result_key] + fail_reason = response.get(self.keyword('reason'), '') + if status == self.keyword('success'): + return + + if status in ('NeedToken', 'WrongToken', 'badtoken'): + # if incorrect login token was used, + # force relogin and generate fresh one + pywikibot.error('Received incorrect login token. ' + 'Forcing re-login.') + # invalidate superior wiki cookies (T224712) + pywikibot.data.api._invalidate_superior_cookies( + self.site.family) + self.site.tokens.clear() + login_request[ + self.keyword('token')] = self.site.tokens['login'] + continue + + if status == 'UI': # pragma: no cover + oathtoken = pywikibot.input(response['message'], password=True) + login_request['OATHToken'] = oathtoken + login_request['logincontinue'] = True + del login_request['username'] + del login_request['password'] + del login_request['rememberMe'] + continue + + # messagecode was introduced with 1.29.0-wmf.14 + # but older wikis are still supported + login_throttled = response.get('messagecode') == 'login-throttled' + + if (status == 'Throttled' or status == self.keyword('fail') + and (login_throttled or 'wait' in fail_reason)): + wait = response.get('wait') + if wait: + delta = datetime.timedelta(seconds=int(wait)) + else: + match = re.search(r'(\d+) (seconds|minutes)', fail_reason) + if match: + delta = datetime.timedelta(**{match[2]: int(match[1])}) + else: + delta = datetime.timedelta() + self._waituntil = datetime.datetime.now() + delta + + break + + if 'error' in login_result: + raise pywikibot.exceptions.APIError(**response) + + raise pywikibot.exceptions.APIError(code=status, info=fail_reason) + + @deprecated("site.tokens['login']", since='8.0.0') + def get_login_token(self) -> Optional[str]: + """Fetch login token for MediaWiki 1.27+. + + .. deprecated:: 8.0 + + :return: login token + """ + return self.site.tokens['login'] + + class BotPassword: """BotPassword object for storage in password file.""" diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index 8032203..10f54a3 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -53,7 +53,7 @@ TitleblacklistError, UnknownExtensionError, ) -from pywikibot.login import LoginStatus as _LoginStatus +from pywikibot import login from pywikibot.site._basesite import BaseSite from pywikibot.site._decorators import need_right, need_version from pywikibot.site._extensions import ( @@ -126,7 +126,7 @@ super().__init__(code, fam, user) self._globaluserinfo: Dict[Union[int, str], Any] = {} self._interwikimap = _InterwikiMap(self) - self._loginstatus = _LoginStatus.NOT_ATTEMPTED + self._loginstatus = login.LoginStatus.NOT_ATTEMPTED self._msgcache: Dict[str, str] = {} self._paraminfo = api.ParamInfo(self) self._siteinfo = Siteinfo(self) @@ -354,7 +354,7 @@ # (below) is successful. Instead, log the problem, # to be increased to 'warning' level once majority # of issues are resolved. - if self._loginstatus == _LoginStatus.IN_PROGRESS: + if self._loginstatus == login.LoginStatus.IN_PROGRESS: pywikibot.log( '{!r}.login() called when a previous login was in progress.' .format(self)) @@ -364,18 +364,18 @@ # logged_in() is False if _userinfo exists, which means this # will have no effect for the invocation from api.py if self.logged_in(): - self._loginstatus = _LoginStatus.AS_USER + self._loginstatus = login.LoginStatus.AS_USER return # check whether a login cookie already exists for this user # or check user identity when OAuth enabled - self._loginstatus = _LoginStatus.IN_PROGRESS + self._loginstatus = login.LoginStatus.IN_PROGRESS if user: self._username = normalize_username(user) try: del self.userinfo # force reload if self.userinfo['name'] == self.user(): - self._loginstatus = _LoginStatus.AS_USER + self._loginstatus = login.LoginStatus.AS_USER return # May occur if you are not logged in (no API read permissions). @@ -406,14 +406,15 @@ raise NoUsernameError(error_msg) - login_manager = api.LoginManager(site=self, user=self.username()) + login_manager = login.ClientLoginManager(site=self, + user=self.username()) if login_manager.login(retry=True, autocreate=autocreate): self._username = login_manager.username del self.userinfo # force reloading # load userinfo if self.userinfo['name'] == self.username(): - self._loginstatus = _LoginStatus.AS_USER + self._loginstatus = login.LoginStatus.AS_USER return pywikibot.error('{} != {} after {}.login() and successful ' @@ -423,7 +424,7 @@ type(self).__name__, type(login_manager).__name__)) - self._loginstatus = _LoginStatus.NOT_LOGGED_IN # failure + self._loginstatus = login.LoginStatus.NOT_LOGGED_IN # failure def _relogin(self) -> None: """Force a login sequence without logging out, using the current user. @@ -433,7 +434,7 @@ from the site. """ del self.userinfo - self._loginstatus = _LoginStatus.NOT_LOGGED_IN + self._loginstatus = login.LoginStatus.NOT_LOGGED_IN self.login() def logout(self) -> None: @@ -452,7 +453,7 @@ req_params = {'action': 'logout', 'token': self.tokens['csrf']} uirequest = self.simple_request(**req_params) uirequest.submit() - self._loginstatus = _LoginStatus.NOT_LOGGED_IN + self._loginstatus = login.LoginStatus.NOT_LOGGED_IN # Reset tokens and user properties del self.userinfo diff --git a/tests/api_tests.py b/tests/api_tests.py index c721cb3..5f13c04 100755 --- a/tests/api_tests.py +++ b/tests/api_tests.py @@ -847,12 +847,12 @@ def setUp(self): """Patch the LoginManager to avoid UI interaction.""" super().setUp() - self.orig_login_manager = pywikibot.data.api.LoginManager - pywikibot.data.api.LoginManager = FakeLoginManager + self.orig_login_manager = pywikibot.login.ClientLoginManager + pywikibot.login.ClientLoginManager = FakeLoginManager def tearDown(self): """Restore the original LoginManager.""" - pywikibot.data.api.LoginManager = self.orig_login_manager + pywikibot.login.ClientLoginManager = self.orig_login_manager super().tearDown() @patch.object(pywikibot, 'info') diff --git a/tests/utils.py b/tests/utils.py index 397552d..c71658d 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -428,7 +428,7 @@ return self._disambig -class FakeLoginManager(pywikibot.data.api.LoginManager): +class FakeLoginManager(pywikibot.login.ClientLoginManager): """Loads a fake password.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/860980 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: Ic6d5bd9a5824b0400fbf4f74fbbcc324d0684ca6 Gerrit-Change-Number: 860980 Gerrit-PatchSet: 7 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-CC: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-MessageType: merged

1 0

[Gerrit] ...i18n[master]: Localisation updates from https://translatewiki.net.
by Xqt (Code Review) 05 Dec '22

05 Dec '22

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/864740 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: Ifdf0c4be26b9e815e10d2d3032c8f2ece65633fc --- A clean_sandbox/krc.json A image/krc.json M interwiki/krc.json A protect/krc.json A delinker/krc.json A checkimages/krc.json A misspelling/krc.json A pywikibot/krc.json A delete/krc.json A interwikidata/krc.json A blockpageschecker/krc.json A imagetransfer/krc.json M add_text/krc.json A basic/krc.json A reflinks/krc.json A replace/krc.json A weblinkchecker/krc.json A noreferences/krc.json A revertbot/krc.json A welcome/krc.json A fixing_redirects/krc.json A commonscat/krc.json M category/krc.json A template/krc.json A unusedfiles/krc.json A pagefromfile/krc.json A redirect/krc.json A listpages/krc.json A category_redirect/krc.json A solve_disambiguation/krc.json A archivebot/krc.json A unprotect/krc.json A djvutext/krc.json A transferbot/krc.json A movepages/krc.json A undelete/krc.json A cosmetic_changes/krc.json 37 files changed, 395 insertions(+), 8 deletions(-) Approvals: L10n-bot: Looks good to me, approved Xqt: Verified; Looks good to me, approved diff --git a/add_text/krc.json b/add_text/krc.json index 5fbbf51..50be797 100644 --- a/add_text/krc.json +++ b/add_text/krc.json @@ -1,6 +1,8 @@ { "@metadata": { - "authors": [] + "authors": [ + "Къарачайлы" + ] }, - "add_text-adding": "робот къошду %(adding)s" + "add_text-adding": "Бот: Къошулады %(adding)s" } diff --git a/archivebot/krc.json b/archivebot/krc.json new file mode 100644 index 0000000..272f98d --- /dev/null +++ b/archivebot/krc.json @@ -0,0 +1,11 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "archivebot-archive-full": "(АРХИВ ТОЛУДУ)", + "archivebot-archive-summary": "Бот: [[%(from)s]] бетден %(count)d башлыкъ архивленеди", + "archivebot-older-than": "{{PLURAL:%(count)d|эскисинден}} %(duration)s", + "archivebot-page-summary": "Бот: Архивленеди: %(count)d башлыкъ (%(why)s) былайгъа: %(archives)s." +} diff --git a/basic/krc.json b/basic/krc.json new file mode 100644 index 0000000..c79b34f --- /dev/null +++ b/basic/krc.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "basic-changing": "Бот: Тюрлендире турады ..." +} diff --git a/blockpageschecker/krc.json b/blockpageschecker/krc.json new file mode 100644 index 0000000..02e8fa7 --- /dev/null +++ b/blockpageschecker/krc.json @@ -0,0 +1,10 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "blockpageschecker-adding": "Бот: Бетни блогуну шаблону къошула турады", + "blockpageschecker-modifying": "Бот: Эски шаблонну тюлендиригиз", + "blockpageschecker-deleting": "Бот: Эски шаблон кетериле турады" +} diff --git a/category/krc.json b/category/krc.json index 3fbc63f..c18d416 100644 --- a/category/krc.json +++ b/category/krc.json @@ -1,8 +1,22 @@ { "@metadata": { "authors": [ - "Xqt" + "Xqt", + "Къарачайлы" ] }, - "category-adding": "робот: къошду category [[:Category:%(newcat)s|%(newcat)s]]" + "category-adding": "робот: къошду category [[:Category:%(newcat)s|%(newcat)s]]", + "category-also-in": "(%(alsocat)s категорияда да)", + "category-clean": "Бот: %(child)s бар болгъан %(category)s категория кетериледи", + "category-listifying": "Бот: %(fromcat)s бетден башлаб (%(num)d кирди) тизмеленеди", + "category-removing": "Бот: %(oldcat)s категориясындан къоратылады", + "category-renamed": "Бот: %(oldcat)s къоратылды. Авторла: %(authors)s", + "category-replacing": "Бот: %(oldcat)s, %(newcat)s категория бла алмашдырылады", + "category-section-title": "Аллындагъы %(oldcat)s бетни тарихи", + "category-strip-cfd-templates": "Бот: Тамаланнган этиуле ючюн CFD-шаблонланы кетериу", + "category-strip-sort-keys": "Бот: Тамамланнган этиу ючюн айырыу ачхычланы кетериу", + "category-strip-both": "Бот: Тамаланнган этиуле ючюн CFD-шаблонла бла ачхычланы кетериу", + "category-version-history": "Бот: Эски %(oldcat)s версияны сакълау тарихи", + "category-was-disbanded": "Бот: Категория чачылды", + "category-was-moved": "Бот: Категория [[:Category:%(newcat)s|%(title)s]] кёчюрюлдю" } diff --git a/category_redirect/krc.json b/category_redirect/krc.json new file mode 100644 index 0000000..99e7c85 --- /dev/null +++ b/category_redirect/krc.json @@ -0,0 +1,29 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "category_redirect-add-template": "Бот: Къуллукъ ишле бардырыр ючюн категория джолландырыу шаблону къошулады", + "category_redirect-change-category": "Бот: Джолландырыу [[:%(oldCatLink)s|%(oldCatTitle)s]] категория [[:%(newCatLink)s|%(newCatTitle)s]] халгъа тюрлендириледи", + "category_redirect-comment": "Категорияны джолландырыуну къуллукъ ишлерин этген бот", + "category_redirect-edit-request": "Къорууламада болгъан бу бетледеги категория джибериулеге джангыртыу керекди: %(itemlist)s", + "category_redirect-edit-request-item": "* %(title)s, %(newcat)s'-ге джолландырылгъан %(oldcat)s'-де", + "category_redirect-fix-double": "Бот: Экили джолландырыу тюзетиле турады", + "category_redirect-log-added": "* [[%(ns)s%(template)s]] да %(oldcat)s къошулду", + "category_redirect-log-add-failed": "* [[%(ns)s%(template)s]] да %(oldcat)s къошулуу тындырылмады", + "category_redirect-log-double": "* Экили джолландырыу тюзетилди: %(oldcat)s -> %(newcat)s -> %(targetcat)s", + "category_redirect-log-failed": "** Тындырылмады: %(error)s", + "category_redirect-log-false-positive": "* Сакъланмагъан джолландырыу: %(oldcat)s", + "category_redirect-log-ignoring": "* %(oldcat)s джокъ саналмасы", + "category_redirect-log-loop": "*%(oldcat)s къайнакъдан джолландырыу цикл", + "category_redirect-log-moved": "* %(oldcat)s: %(found)d табылды, %(moved)d кёчюрюлдю", + "category_redirect-log-move-error": "* %(oldcat)s: move_contents'-де халат", + "category_redirect-log-new": "Ахыр рапортдан бу заманнга дери джангы джолландырыула:", + "category_redirect-log-not-loaded": "* %(oldcat)s джюкленемеди; джокъ саналады", + "category_redirect-log-skipping": "* %(oldcat)s атлатылады; джангыртыу кёзюуюню ичиндеди", + "category_redirect-older-logs": "'''[%(oldlogs)s Дагъыда эски логла]'''", + "category_redirect-problem-hard": "# %(oldcat)s, %(page)s бетге зорлу джолландырыуду", + "category_redirect-problem-redirects": "# %(oldcat)s, %(redpage)s джолландырыуду", + "category_redirect-problem-self-linked": "# %(oldcat)s кеси кесине байламлы джолландырыуду" +} diff --git a/checkimages/krc.json b/checkimages/krc.json new file mode 100644 index 0000000..812fa91 --- /dev/null +++ b/checkimages/krc.json @@ -0,0 +1,17 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "checkimages-deletion-comment": "Бот: Къошулады %(adding)s", + "checkimages-doubles-file-comment": "Бот: Файл алайсыз да Викигёзендеди, кетерирге боллукъду", + "checkimages-doubles-head": "Дубликат файл", + "checkimages-doubles-talk-comment": "Бот: Файлны алайсыз да Викигёзенде болгъанын билдириу", + "checkimages-log-comment": "Бот: Логну джангырт", + "checkimages-no-license-head": "Лицензиясыз сурат", + "checkimages-source-tag-comment": "Бот: Джангы джюкленнген белгисиз файлны белгилеу", + "checkimages-source-notice-comment": "Бот: Къайнакъ информация изленеди", + "checkimages-unknown-extension-head": "Билинмеген кенгериу!", + "checkimages-unknown-extension-msg": "%(file)s файлны джангылыч кенгериую болгъаннга ушайды, тилейбиз тинтигиз" +} diff --git a/clean_sandbox/krc.json b/clean_sandbox/krc.json new file mode 100644 index 0000000..3f6a921 --- /dev/null +++ b/clean_sandbox/krc.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "clean_sandbox-cleaned": "Бот: Автомат халат тазаланды" +} diff --git a/commonscat/krc.json b/commonscat/krc.json new file mode 100644 index 0000000..027963f --- /dev/null +++ b/commonscat/krc.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "commonscat-msg_change": "Бот: Commonscat джибериуню [[:Commons:Category:%(oldcat)s|%(oldcat)s]]'дан [[:Commons:Category:%(newcat)s|%(newcat)s]]-ге кёчюрюледи" +} diff --git a/cosmetic_changes/krc.json b/cosmetic_changes/krc.json new file mode 100644 index 0000000..9297291 --- /dev/null +++ b/cosmetic_changes/krc.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "cosmetic_changes-standalone": "Бот: Косметик тюрлениуле" +} diff --git a/delete/krc.json b/delete/krc.json new file mode 100644 index 0000000..6171063 --- /dev/null +++ b/delete/krc.json @@ -0,0 +1,12 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "delete-from-category": "Бот: %(page)s категориядагъы бютеу бетле кетериледиле", + "delete-from-file": "Бот: Бетлени тизмеси кетериледи.", + "delete-images": "Бот: %(page)s бетдеги бютеу суратла кетериледиле", + "delete-linked-pages": "Бот: %(page)s бет бла байламлы бютеу бетле кетериледиле", + "delete-referring-pages": "Бот: %(page)s бетге бютеу джибериуле кетедиле" +} diff --git a/delinker/krc.json b/delinker/krc.json new file mode 100644 index 0000000..f0f410e --- /dev/null +++ b/delinker/krc.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "delinker-delink": "Бот: [[%(title)s]] файл, [[:User:%(user)s]] джанындан кетерилгени ючюн, бетден къоратылгъанды: ''%(comment)s''." +} diff --git a/djvutext/krc.json b/djvutext/krc.json new file mode 100644 index 0000000..1915a55 --- /dev/null +++ b/djvutext/krc.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "djvutext-creating": "Бот: DjVu чыгъарылгъан текстни бетге къошду" +} diff --git a/fixing_redirects/krc.json b/fixing_redirects/krc.json new file mode 100644 index 0000000..295b5dd --- /dev/null +++ b/fixing_redirects/krc.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "fixing_redirects-fixing": "Бот: Джолландырыуланы тюзетиу" +} diff --git a/image/krc.json b/image/krc.json new file mode 100644 index 0000000..771a25a --- /dev/null +++ b/image/krc.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "image-remove": "Бот: %(file)s суратны кетериу", + "image-replace": "Бот: %(old)s'-ну орнуна %(new)s сурат аушдурулады" +} diff --git a/imagetransfer/krc.json b/imagetransfer/krc.json new file mode 100644 index 0000000..db9cdb8 --- /dev/null +++ b/imagetransfer/krc.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "imagetransfer-file_page_message": "Бу сурат %(site)s адресден копияланды. Оригинал ачыкълама бу эди:\n\n%(description)s", + "imagetransfer-nowcommons_notice": "Файл энди Викигёзенден ачыкъды" +} diff --git a/interwiki/krc.json b/interwiki/krc.json index 0dec20c..c8526f4 100644 --- a/interwiki/krc.json +++ b/interwiki/krc.json @@ -2,14 +2,16 @@ "@metadata": { "authors": [ "Hugo.arg", - "Xqt" + "Xqt", + "Къарачайлы" ] }, - "interwiki-adding": "робот къошду: %(adding)s", + "interwiki-adding": "Бот: Къошулады %(adding)s", "interwiki-adding-modifying": "робот къошду: %(adding)s тюрлендирди: %(modifying)s", - "interwiki-adding-removing": "робот къошду: %(adding)s кетерди: %(removing)s", + "interwiki-adding-removing": "Бот: Къошулады %(adding)s; кетерди: %(removing)s", "interwiki-adding-removing-modifying": "робот къошду: %(adding)s кетерди: %(removing)s тюрлендирди: %(modifying)s", - "interwiki-modifying": "робот тюрлендирди: %(modifying)s", + "interwiki-modifying": "Бот: Тюрлендирди %(modifying)s", + "interwiki-modifying-from": "Бот: %(from)s %(modifying)s болуб тюрлендириледи", "interwiki-removing": "робот кетерди: %(removing)s", "interwiki-removing-modifying": "робот кетерди: %(removing)s тюрлендирди: %(modifying)s" } diff --git a/interwikidata/krc.json b/interwikidata/krc.json new file mode 100644 index 0000000..93509f4 --- /dev/null +++ b/interwikidata/krc.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "interwikidata-clean-summary": "Бот: Эски интервики джибериулени тазалау" +} diff --git a/listpages/krc.json b/listpages/krc.json new file mode 100644 index 0000000..d1bedd6 --- /dev/null +++ b/listpages/krc.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "listpages-save-list": "Бот: Болдурулгъан бетлени тизмесин сакъла" +} diff --git a/misspelling/krc.json b/misspelling/krc.json new file mode 100644 index 0000000..b136068 --- /dev/null +++ b/misspelling/krc.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "misspelling-fixing": "Бот: Терс джазылгъан джибериуню %(page)s тюзетиу" +} diff --git a/movepages/krc.json b/movepages/krc.json new file mode 100644 index 0000000..e8504a5 --- /dev/null +++ b/movepages/krc.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "movepages-moving": "Бот: Кёчюрюлген бет" +} diff --git a/noreferences/krc.json b/noreferences/krc.json new file mode 100644 index 0000000..d07fe60 --- /dev/null +++ b/noreferences/krc.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "noreferences-add-tag": "Бот: Джетмеген <references /> белги къошулады", + "noreferences-fix-tag": "Бот: <references /> белгини терс синтаксисин тюзет" +} diff --git a/pagefromfile/krc.json b/pagefromfile/krc.json new file mode 100644 index 0000000..232c141 --- /dev/null +++ b/pagefromfile/krc.json @@ -0,0 +1,11 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "pagefromfile-msg": "Бот: Автомат халда статьялан импорту", + "pagefromfile-msg_bottom": "тюбюне къош", + "pagefromfile-msg_force": "бар болгъан текстни юсюне джазылгъанды", + "pagefromfile-msg_top": "башына къош" +} diff --git a/protect/krc.json b/protect/krc.json new file mode 100644 index 0000000..9ba2120 --- /dev/null +++ b/protect/krc.json @@ -0,0 +1,12 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "protect-category": "Бот: %(cat)s категориядан бютеу бетни къоруулау", + "protect-images": "Бот: %(page)s бетде бютеу суратланы къоруулау", + "protect-links": "Бот: %(page)s бла байламлы бютеу бетлени къоруулау", + "protect-ref": "Бот: %(page)s' бетден джибериу болгъан бютеу бетлени къоруулау", + "protect-simple": "Бот: Файлланы тизмесин къоруулау." +} diff --git a/pywikibot/krc.json b/pywikibot/krc.json new file mode 100644 index 0000000..7b2b59a --- /dev/null +++ b/pywikibot/krc.json @@ -0,0 +1,20 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "pywikibot-cosmetic-changes": "; косметик тюрлениуле", + "pywikibot-enter-category-name": "Тилейбиз, категорияны атын киргизтигиз:", + "pywikibot-enter-file-links-processing": "Файлны къайсы бетине джибериуню джарашдырыргъа керекди?", + "pywikibot-enter-finished-browser": "Браузерде битсе, Enter тиекге басыгъыз.", + "pywikibot-enter-namespace-number": "Тилейбиз, номерине кёре ат аланны киргизтигиз:", + "pywikibot-enter-new-text": "Тилейбиз, джангы текст киргизтигиз:", + "pywikibot-enter-page-processing": "Къайсы бет джарашдырылыргъа керекди?", + "pywikibot-enter-xml-filename": "Тилейбиз, XML дампны файлыны атын киргизтигиз:", + "pywikibot-fixes-fckeditor": "Бот: Кенгертилген редактор html-ни тюзетиу", + "pywikibot-fixes-isbn": "Бот: ISBN джасау", + "pywikibot-fixes-html": "Бот: HTML-ни тюрленириу/тюзетиу", + "pywikibot-fixes-syntax": "Бот: Вики синтаксисни тюзетиу", + "pywikibot-touch": "Pywikibot сенсор тюзетиу" +} diff --git a/redirect/krc.json b/redirect/krc.json new file mode 100644 index 0000000..be7fb60 --- /dev/null +++ b/redirect/krc.json @@ -0,0 +1,12 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "redirect-fix-broken-moved": "Бот: бузукъ джолландырыуну %(to)s нюзюр бетге кёчюрюу", + "redirect-fix-double": "Бот: %(to)s бетге экили джолландырыуну тюзетиу", + "redirect-fix-loop": "Бот: Ахырсыз джолландырыуну %(to)s тюзетилиую", + "redirect-remove-broken": "Бот: Кетерилген неда бар болмагъан бетге джолландырыу", + "redirect-remove-loop": "Бот: Джолландырыу ахырсызл джолландырыуну формалашдырады" +} diff --git a/reflinks/krc.json b/reflinks/krc.json new file mode 100644 index 0000000..22ded14 --- /dev/null +++ b/reflinks/krc.json @@ -0,0 +1,10 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "reflinks-autogen": "автомат халда болдруу", + "reflinks-comment": "Башлыкъны бот болдурду", + "reflinks-msg": "Бот: Дубликат болуудан къачар ючюн, таза джибериулени, джибериу атланы болушлугъу бла тюрлендириу, къарагъыз [[%(manual)s|FAQ]]" +} diff --git a/replace/krc.json b/replace/krc.json new file mode 100644 index 0000000..c525a31 --- /dev/null +++ b/replace/krc.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "replace-replacing": "Бот: Автомат халда текстни алмашдырыу %(description)s" +} diff --git a/revertbot/krc.json b/revertbot/krc.json new file mode 100644 index 0000000..c753a1e --- /dev/null +++ b/revertbot/krc.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "revertbot-revert": "Бот: %(revid)s %(author)s %(timestamp)s юсюнде версиягъа къайтарылды" +} diff --git a/solve_disambiguation/krc.json b/solve_disambiguation/krc.json new file mode 100644 index 0000000..b7eb1e5 --- /dev/null +++ b/solve_disambiguation/krc.json @@ -0,0 +1,14 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "solve_disambiguation-adding-dn-template": "Ботну болушлугъу бла ангылам айрымы: %(from)s - Экспертни эсин бёлмеси керек болгъанча белгиленнгенди", + "solve_disambiguation-links-removed": "Ботну болушлугъу бла ангылам айрымы: %(from)s — Джибериу(ле) къоратылды.", + "solve_disambiguation-links-resolved": "Ботну болушлугъу бла ангылам айрымы: %(from)s — джибериу (ле) тюрлендирилиб %(to)s халгъа келтирилди", + "solve_disambiguation-redirect-adding-dn-template": "Ботну болушлугъу бла ангылам айрымы: %(from)s - Экспертни эсин бёлмеси керек болгъанча белгиленнгенди", + "solve_disambiguation-redirect-removed": "Ботну болушлгъу бла ангылам айрымы: %(from)s — Джибериу(ле) къоратылды", + "solve_disambiguation-redirect-resolved": "Ботну болушлугъу бла ангылам айрымы: %(from)s — джибериу (ле) тюрлендирилиб %(to)s халгъа келтирилди", + "solve_disambiguation-unknown-page": "(билинмеген)" +} diff --git a/template/krc.json b/template/krc.json new file mode 100644 index 0000000..aa2951c --- /dev/null +++ b/template/krc.json @@ -0,0 +1,10 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "template-changing": "Бот:{{PLURAL:%(num)d|шаблон}} ауушдурулады: %(list)s", + "template-removing": "Бот:{{PLURAL:%(num)d|шаблон}} къоратылады: %(list)s", + "template-substituting": "Бот: {{PLURAL:%(num)d|шаблон}} кёчюрюледи: %(list)s" +} diff --git a/transferbot/krc.json b/transferbot/krc.json new file mode 100644 index 0000000..2e5d1da --- /dev/null +++ b/transferbot/krc.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "transferbot-summary": "Бетни %(source)s бетден кёчюрдю", + "transferbot-target": "Бу бет %(source)s бетден кёчюрюлдю. Тюзетиу тарихи %(history)s бетден кёрюнеди." +} diff --git a/undelete/krc.json b/undelete/krc.json new file mode 100644 index 0000000..d772715 --- /dev/null +++ b/undelete/krc.json @@ -0,0 +1,10 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "undelete-from-file": "Бот: Бетлени тизмеси джангыртылады.", + "undelete-images": "Бот: %(page)s бетдеги бютеу суратла джангыртылыуу", + "undelete-linked-pages": "Бот: %(page)s бет бла байламлы бютеу бетлени джангыртылыуу" +} diff --git a/unprotect/krc.json b/unprotect/krc.json new file mode 100644 index 0000000..3303c4f --- /dev/null +++ b/unprotect/krc.json @@ -0,0 +1,12 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "unprotect-category": "Бот: %(cat)s категориядан бютеу бетни къоруулаудан къоратыу", + "unprotect-images": "Бот: %(page)s бетде бютеу бетлени къоруулауун къоратыу", + "unprotect-links": "Бот: %(page)s бла байламлы бютеу бетлени къоруулаудан къоратыу", + "unprotect-ref": "Бот: %(page)s' бетден джибериу болгъан бютеу бетлени къоруулауун къоратыу", + "unprotect-simple": "Бот: Файлланы тизмесин къоруулаудан къоратыу" +} diff --git a/unusedfiles/krc.json b/unusedfiles/krc.json new file mode 100644 index 0000000..c0f439f --- /dev/null +++ b/unusedfiles/krc.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "unusedfiles-comment": "Бот: файлны тас болгъанча белгилеу" +} diff --git a/weblinkchecker/krc.json b/weblinkchecker/krc.json new file mode 100644 index 0000000..d3743bf --- /dev/null +++ b/weblinkchecker/krc.json @@ -0,0 +1,12 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "weblinkchecker-archive_msg": "Web-бет интернет-архивде сакъланнганды. Тилейбиз, келишген архивленнген версиягъа байланыуну сагъышын этигиз: [%(URL)s].", + "weblinkchecker-badurl": "Белгиленнген джибериу, джараулу URL-адресге ушамайды", + "weblinkchecker-caption": "Ёлю джибериу", + "weblinkchecker-report": "Автомат халда джокълама этген талай бот, тюбюндеги тыш джибериу ишлемегенин табды. Тилейбиз, джибериуню кертиден да ишлеб ишлемегенин тинтигиз эмда бу болумда тюзетигиз неда къоратыгъыз!", + "weblinkchecker-summary": "Бот: Ишлемегин тыш джибериу табылгъанды" +} diff --git a/welcome/krc.json b/welcome/krc.json new file mode 100644 index 0000000..8fc2dca --- /dev/null +++ b/welcome/krc.json @@ -0,0 +1,10 @@ +{ + "@metadata": { + "authors": [ + "Къарачайлы" + ] + }, + "welcome-bad_username": "Бот: Къошулуучу атны тинтиу кереклеге къошуу", + "welcome-updating": "Бот: Логну джангыртыу", + "welcome-welcome": "Хош келигиз!" +} -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/864740 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: Ifdf0c4be26b9e815e10d2d3032c8f2ece65633fc Gerrit-Change-Number: 864740 Gerrit-PatchSet: 1 Gerrit-Owner: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [tests] Re-add test for kb.mozillazine.org
by jenkins-bot (Code Review) 03 Dec '22

03 Dec '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/863445 ) Change subject: [tests] Re-add test for kb.mozillazine.org ...................................................................... [tests] Re-add test for kb.mozillazine.org Test was removed after site_detect_tests.py cleanup but seems that the MediaWiki version was updated from pre-API to 1.26.4 Change-Id: Ib7024992cbeaacb18ab73ec81aafabdd1e20914a --- M tests/site_detect_tests.py 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/site_detect_tests.py b/tests/site_detect_tests.py index 2c9a224..3b56837 100755 --- a/tests/site_detect_tests.py +++ b/tests/site_detect_tests.py @@ -78,6 +78,7 @@ 'http://www.otterstedt.de/wiki/index.php/$1', 'http://kb.mozillazine.org/$1', 'https://en.wikifur.com/wiki/$1', # 1.23.16 + 'http://kb.mozillazine.org/$1' # 1.26.4 ) no_sites = ( -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/863445 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: Ib7024992cbeaacb18ab73ec81aafabdd1e20914a Gerrit-Change-Number: 863445 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [doc] Remove linecode badge, it does not work
by jenkins-bot (Code Review) 03 Dec '22

03 Dec '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/863444 ) Change subject: [doc] Remove linecode badge, it does not work ...................................................................... [doc] Remove linecode badge, it does not work Change-Id: I7453833258ebca53674ed907af26624c966a0f95 --- M README.rst 1 file changed, 9 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/README.rst b/README.rst index 876bb38..8acdd16 100644 --- a/README.rst +++ b/README.rst @@ -28,9 +28,6 @@ .. image:: https://static.pepy.tech/personalized-badge/pywikibot?period=month&units=in… :alt: Monthly downloads :target: https://pepy.tech/project/pywikibot -.. image:: https://img.shields.io/tokei/lines/github/wikimedia/pywikibot - :alt: Lines of Code - :target: https://gerrit.wikimedia.org/r/plugins/gitiles/pywikibot/core/ .. image:: https://img.shields.io/github/last-commit/wikimedia/pywikibot :alt: Last commit :target: https://gerrit.wikimedia.org/r/plugins/gitiles/pywikibot/core/ -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/863444 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: I7453833258ebca53674ed907af26624c966a0f95 Gerrit-Change-Number: 863444 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[stable]: [7.7.2] Backport T324310 changes to stable
by jenkins-bot (Code Review) 03 Dec '22

03 Dec '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/863436 ) Change subject: [7.7.2] Backport T324310 changes to stable ...................................................................... [7.7.2] Backport T324310 changes to stable Also update languages_by_size and adjust jenkins tests Bug: T324310 Change-Id: If20b7e0e3cf246ac91cce4a53bde34174bc6b2d6 --- M pywikibot/families/wikisource_family.py M pywikibot/families/wikibooks_family.py M pywikibot/textlib.py M tests/site_detect_tests.py M setup.py M pywikibot/__metadata__.py M pywikibot/page/_wikibase.py R docs/requirements.txt M pywikibot/families/wikiquote_family.py M pywikibot/bot.py M pywikibot/families/wiktionary_family.py M tox.ini M pywikibot/families/wikipedia_family.py 13 files changed, 124 insertions(+), 83 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/requirements-py3.txt b/docs/requirements.txt similarity index 100% rename from docs/requirements-py3.txt rename to docs/requirements.txt diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py index 276a423..7081716 100644 --- a/pywikibot/__metadata__.py +++ b/pywikibot/__metadata__.py @@ -11,7 +11,7 @@ __name__ = 'pywikibot' -__version__ = '7.7.1' +__version__ = '7.7.2' __description__ = 'Python MediaWiki Bot Framework' __maintainer__ = 'The Pywikibot team' __maintainer_email__ = 'pywikibot(a)lists.wikimedia.org' diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 6aaa9f0..9d86e97 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -699,7 +699,7 @@ self._default = default self._quit = automatic_quit - current_match_type = Optional[Tuple[ # skipcq: PYL-W0612 + current_match_type = Optional[Tuple[ # noqa: F841 PageLinkType, str, Mapping[str, str], diff --git a/pywikibot/families/wikibooks_family.py b/pywikibot/families/wikibooks_family.py index bf28930..5f230d2 100644 --- a/pywikibot/families/wikibooks_family.py +++ b/pywikibot/families/wikibooks_family.py @@ -30,9 +30,9 @@ languages_by_size = [ 'en', 'hu', 'de', 'vi', 'fr', 'it', 'ja', 'pt', 'es', 'nl', 'pl', 'id', - 'he', 'fi', 'zh', 'sq', 'az', 'fa', 'ru', 'ca', 'eu', 'th', 'da', 'ko', - 'ba', 'sv', 'gl', 'cs', 'hi', 'sr', 'uk', 'hr', 'no', 'tr', 'sa', 'ar', - 'ta', 'eo', 'sk', 'is', 'bn', 'ro', 'si', 'bg', 'ms', 'ka', 'mk', 'tt', + 'he', 'fi', 'zh', 'fa', 'sq', 'az', 'ru', 'ca', 'eu', 'th', 'cs', 'da', + 'ko', 'ba', 'sv', 'gl', 'hi', 'sr', 'uk', 'hr', 'no', 'tr', 'sa', 'ar', + 'ta', 'bn', 'eo', 'sk', 'is', 'ro', 'si', 'bg', 'ms', 'ka', 'mk', 'tt', 'lt', 'el', 'li', 'sl', 'tl', 'ur', 'km', 'la', 'mr', 'kk', 'te', 'et', 'be', 'ia', 'ml', 'oc', 'hy', 'ne', 'pa', 'cv', 'tg', 'ku', 'fy', 'af', 'bs', 'cy', 'mg', 'ky', diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index 619f5ab..010ffc8 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -28,35 +28,35 @@ languages_by_size = [ 'en', 'ceb', 'de', 'sv', 'fr', 'nl', 'ru', 'es', 'it', 'arz', 'pl', 'ja', 'zh', 'vi', 'war', 'uk', 'ar', 'pt', 'fa', 'ca', 'sr', 'id', - 'ko', 'no', 'fi', 'tr', 'hu', 'cs', 'ce', 'sh', 'ro', 'zh-min-nan', - 'tt', 'eu', 'ms', 'eo', 'he', 'hy', 'da', 'bg', 'cy', 'azb', 'sk', - 'kk', 'et', 'min', 'be', 'simple', 'el', 'hr', 'lt', 'gl', 'az', 'sl', - 'ur', 'uz', 'ka', 'nn', 'hi', 'th', 'ta', 'la', 'mk', 'ast', 'bn', - 'zh-yue', 'lv', 'tg', 'af', 'my', 'mg', 'bs', 'oc', 'mr', 'sq', 'nds', - 'ky', 'ml', 'be-tarask', 'te', 'sw', 'br', 'new', 'jv', 'vec', 'ht', - 'pms', 'pnb', 'su', 'lb', 'ba', 'lld', 'ga', 'szl', 'lmo', 'ku', 'is', - 'cv', 'fy', 'ckb', 'tl', 'wuu', 'an', 'sco', 'diq', 'pa', 'io', 'ne', - 'vo', 'yo', 'gu', 'als', 'kn', 'bar', 'scn', 'ia', 'bpy', 'avk', 'qu', - 'mn', 'nv', 'crh', 'xmf', 'ha', 'si', 'bat-smg', 'os', 'frr', 'or', - 'ps', 'gd', 'ban', 'cdo', 'yi', 'bug', 'ilo', 'sd', 'am', 'nap', 'sah', - 'hsb', 'fo', 'li', 'map-bms', 'mai', 'mzn', 'gor', 'eml', 'ace', 'bcl', - 'shn', 'sa', 'zh-classical', 'wa', 'ie', 'lij', 'as', 'ig', 'zu', - 'mhr', 'mrj', 'hyw', 'hif', 'mni', 'km', 'hak', 'roa-tara', 'pam', - 'sn', 'so', 'nso', 'rue', 'bh', 'se', 'myv', 'vls', 'nds-nl', 'mi', - 'sat', 'sc', 'nah', 'vep', 'tum', 'gan', 'kab', 'glk', 'tk', 'fiu-vro', - 'co', 'bo', 'ab', 'ary', 'gv', 'frp', 'kw', 'kv', 'pcd', 'csb', 'ug', - 'udm', 'skr', 'zea', 'ay', 'gn', 'mt', 'nrm', 'bjn', 'smn', 'lez', - 'lfn', 'stq', 'lo', 'olo', 'mwl', 'fur', 'rm', 'ang', 'rw', 'lad', - 'gom', 'koi', 'ext', 'tyv', 'dsb', 'dty', 'ln', 'av', 'cbk-zam', 'dv', - 'ksh', 'gag', 'pap', 'bxr', 'pfl', 'pag', 'pi', 'haw', 'awa', 'tay', - 'ks', 'tw', 'inh', 'dag', 'krc', 'szy', 'xal', 'mdf', 'kaa', 'za', - 'pdc', 'atj', 'to', 'arc', 'tcy', 'kbp', 'jam', 'na', 'wo', 'kbd', - 'nia', 'nov', 'tet', 'ki', 'mnw', 'lg', 'bi', 'tpi', 'nqo', 'jbo', - 'roa-rup', 'fj', 'lbe', 'kg', 'xh', 'ty', 'cu', 'shi', 'srn', 'trv', - 'om', 'guw', 'sm', 'gcr', 'alt', 'blk', 'chr', 'ltg', 'ny', 'pih', - 'got', 'mad', 'st', 'ami', 'tn', 'bm', 've', 'rmy', 'ts', 'chy', 'rn', - 'iu', 'ak', 'ss', 'ff', 'ch', 'kcg', 'pnt', 'ady', 'ik', 'ee', 'pcm', - 'sg', 'din', 'pwn', 'kl', 'ti', 'dz', 'cr', + 'ko', 'no', 'fi', 'tr', 'hu', 'cs', 'ce', 'sh', 'tt', 'ro', + 'zh-min-nan', 'eu', 'ms', 'eo', 'he', 'hy', 'da', 'bg', 'cy', 'sk', + 'azb', 'kk', 'et', 'min', 'be', 'simple', 'el', 'hr', 'uz', 'lt', 'gl', + 'az', 'ur', 'sl', 'ka', 'nn', 'hi', 'th', 'ta', 'la', 'mk', 'bn', + 'ast', 'zh-yue', 'lv', 'tg', 'af', 'my', 'mg', 'bs', 'mr', 'oc', 'sq', + 'nds', 'ky', 'be-tarask', 'ml', 'te', 'br', 'sw', 'new', 'jv', 'lld', + 'vec', 'ht', 'pnb', 'pms', 'su', 'lb', 'ba', 'ku', 'ga', 'lmo', 'szl', + 'is', 'cv', 'fy', 'ckb', 'tl', 'an', 'wuu', 'diq', 'sco', 'pa', 'io', + 'vo', 'yo', 'ne', 'gu', 'als', 'kn', 'ia', 'bar', 'scn', 'avk', 'bpy', + 'qu', 'crh', 'mn', 'nv', 'xmf', 'ha', 'si', 'bat-smg', 'ban', 'ps', + 'os', 'frr', 'or', 'sah', 'gd', 'bug', 'cdo', 'yi', 'ilo', 'sd', 'am', + 'nap', 'li', 'hsb', 'fo', 'map-bms', 'gor', 'mai', 'mzn', 'ig', 'eml', + 'bcl', 'ace', 'shn', 'zh-classical', 'sa', 'wa', 'ie', 'lij', 'as', + 'zu', 'mhr', 'mrj', 'hyw', 'hif', 'mni', 'bjn', 'hak', 'km', 'sn', + 'roa-tara', 'pam', 'so', 'nso', 'rue', 'bh', 'tum', 'se', 'myv', 'vls', + 'sat', 'mi', 'nds-nl', 'sc', 'nah', 'vep', 'tk', 'kab', 'gan', 'glk', + 'co', 'fiu-vro', 'kw', 'ary', 'ab', 'bo', 'gv', 'frp', 'skr', 'dag', + 'ug', 'kv', 'pcd', 'zea', 'udm', 'csb', 'ay', 'mt', 'gn', 'nrm', 'smn', + 'lez', 'lfn', 'stq', 'olo', 'rw', 'lo', 'mwl', 'ang', 'fur', 'rm', + 'lad', 'gom', 'koi', 'ext', 'tyv', 'dsb', 'dty', 'ln', 'av', 'cbk-zam', + 'dv', 'pap', 'ksh', 'gag', 'bxr', 'kaa', 'pfl', 'pag', 'pi', 'ks', + 'szy', 'haw', 'awa', 'tay', 'za', 'mdf', 'tw', 'inh', 'blk', 'krc', + 'xal', 'pdc', 'atj', 'to', 'arc', 'tcy', 'kbp', 'mnw', 'jam', 'na', + 'wo', 'kbd', 'lg', 'nia', 'nov', 'ki', 'bi', 'nqo', 'tpi', 'tet', + 'shi', 'jbo', 'roa-rup', 'fj', 'lbe', 'kg', 'xh', 'ty', 'cu', 'guw', + 'srn', 'trv', 'om', 'sm', 'alt', 'gcr', 'chr', 'ltg', 'tn', 'ny', 'st', + 'pih', 'mad', 'got', 'ami', 'bm', 'rmy', 've', 'ts', 'chy', 'ff', 'rn', + 'ss', 'ak', 'kcg', 'iu', 'ch', 'pnt', 'ee', 'ady', 'ik', 'pcm', 'sg', + 'din', 'pwn', 'kl', 'ti', 'dz', 'cr', ] # Sites we want to edit but not count as real languages diff --git a/pywikibot/families/wikiquote_family.py b/pywikibot/families/wikiquote_family.py index 8a6c39c..db85f3f 100644 --- a/pywikibot/families/wikiquote_family.py +++ b/pywikibot/families/wikiquote_family.py @@ -27,13 +27,13 @@ ] languages_by_size = [ - 'it', 'en', 'pl', 'ru', 'cs', 'et', 'pt', 'fa', 'uk', 'de', 'fr', 'he', + 'it', 'en', 'pl', 'ru', 'cs', 'et', 'pt', 'fa', 'uk', 'de', 'he', 'fr', 'es', 'eo', 'tr', 'sk', 'bs', 'ca', 'az', 'fi', 'sl', 'zh', 'lt', 'ar', - 'bg', 'hy', 'hr', 'sr', 'el', 'su', 'nn', 'id', 'sv', 'li', 'hu', 'ko', - 'nl', 'sah', 'ja', 'la', 'ta', 'gl', 'gu', 'ur', 'be', 'te', 'vi', - 'cy', 'no', 'ml', 'sq', 'hi', 'kn', 'eu', 'ro', 'ku', 'uz', 'ka', 'da', - 'sa', 'is', 'br', 'mr', 'af', 'th', 'wo', 'ky', 'ig', 'bcl', 'tl', - 'bn', + 'sr', 'bg', 'hy', 'hr', 'el', 'su', 'nn', 'id', 'sv', 'li', 'hu', 'ko', + 'nl', 'sah', 'ja', 'la', 'ta', 'gl', 'gu', 'ur', 'ig', 'hi', 'be', + 'te', 'vi', 'tl', 'cy', 'no', 'ml', 'sq', 'kn', 'bn', 'ro', 'eu', 'ku', + 'uz', 'ka', 'da', 'sa', 'is', 'bcl', 'br', 'mr', 'af', 'th', 'wo', + 'ky', ] category_redirect_templates = { diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index 8a676d1..388e2a3 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -25,12 +25,12 @@ ] languages_by_size = [ - 'pl', 'en', 'ru', 'de', 'fr', 'zh', 'he', 'it', 'es', 'uk', 'ar', 'cs', - 'mul', 'gu', 'sr', 'pt', 'fa', 'sv', 'bn', 'hu', 'ko', 'ml', 'ta', - 'sa', 'te', 'sl', 'tr', 'hy', 'la', 'el', 'vi', 'ja', 'ro', 'fi', - 'nap', 'nl', 'az', 'ca', 'br', 'be', 'kn', 'no', 'hr', 'th', 'id', + 'pl', 'en', 'ru', 'de', 'fr', 'zh', 'he', 'it', 'uk', 'es', 'ar', 'cs', + 'mul', 'gu', 'sr', 'pt', 'fa', 'sv', 'bn', 'hu', 'ko', 'ta', 'ml', + 'sa', 'te', 'sl', 'tr', 'la', 'hy', 'el', 'vi', 'ja', 'ro', 'fi', + 'nap', 'nl', 'be', 'az', 'ca', 'br', 'kn', 'no', 'hr', 'id', 'th', 'eo', 'hi', 'is', 'vec', 'pms', 'ban', 'mr', 'cy', 'da', 'lij', 'et', - 'mk', 'as', 'yi', 'bg', 'li', 'wa', 'lt', 'jv', 'pa', 'eu', 'or', 'gl', + 'mk', 'as', 'yi', 'bg', 'li', 'wa', 'jv', 'lt', 'pa', 'eu', 'or', 'gl', 'bs', 'sah', 'sk', 'zh-min-nan', 'fo', ] diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index b695432..7977678 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -28,20 +28,20 @@ languages_by_size = [ 'en', 'fr', 'mg', 'zh', 'ru', 'de', 'es', 'sh', 'sv', 'nl', 'el', 'pl', - 'ku', 'lt', 'ca', 'it', 'fi', 'ta', 'hu', 'tr', 'io', 'ja', 'hy', 'ko', + 'ku', 'lt', 'ca', 'it', 'fi', 'ta', 'hu', 'tr', 'ja', 'io', 'hy', 'ko', 'pt', 'kn', 'vi', 'sr', 'th', 'hi', 'ro', 'no', 'id', 'et', 'cs', 'ml', - 'my', 'uz', 'li', 'or', 'eo', 'te', 'fa', 'skr', 'gl', 'ar', 'oc', - 'jv', 'az', 'eu', 'uk', 'br', 'ast', 'is', 'da', 'lo', 'simple', 'bn', - 'sg', 'la', 'hr', 'fj', 'tg', 'sk', 'ky', 'mnw', 'bg', 'wa', 'shn', - 'ur', 'ps', 'cy', 'vo', 'he', 'om', 'sl', 'af', 'zh-min-nan', 'scn', - 'lmo', 'tl', 'pa', 'sw', 'fy', 'ms', 'nn', 'ka', 'lv', 'min', 'sq', + 'my', 'uz', 'li', 'skr', 'or', 'eo', 'te', 'fa', 'gl', 'ar', 'oc', + 'jv', 'az', 'eu', 'uk', 'br', 'ast', 'is', 'sg', 'bn', 'da', 'lo', + 'simple', 'la', 'hr', 'mnw', 'fj', 'sk', 'tg', 'shn', 'ky', 'bg', 'wa', + 'ur', 'ps', 'cy', 'vo', 'he', 'om', 'sl', 'af', 'zh-min-nan', 'lmo', + 'scn', 'tl', 'pa', 'ms', 'sw', 'fy', 'nn', 'ka', 'lv', 'min', 'sq', 'nds', 'lb', 'co', 'mn', 'pnb', 'bs', 'nah', 'yue', 'sa', 'kk', 'km', - 'diq', 'vec', 'be', 'tk', 'mk', 'nia', 'sm', 'hsb', 'ks', 'shy', 'su', + 'vec', 'be', 'diq', 'tk', 'mk', 'nia', 'sm', 'hsb', 'ks', 'shy', 'su', 'gd', 'ga', 'bcl', 'an', 'gom', 'mr', 'wo', 'mni', 'ia', 'ang', 'mt', - 'sd', 'fo', 'tt', 'gn', 'so', 'ie', 'mi', 'csb', 'ug', 'si', 'st', - 'roa-rup', 'tpi', 'hif', 'kl', 'bjn', 'ha', 'zu', 'guw', 'ay', 'jbo', - 'yi', 'ln', 'gu', 'na', 'gv', 'kw', 'am', 'ne', 'rw', 'ts', 'qu', 'ss', - 'iu', 'chr', 'dv', 'ti', 'tn', 'ig', + 'fo', 'sd', 'tt', 'gn', 'bjn', 'so', 'ie', 'mi', 'csb', 'ug', 'si', + 'st', 'ha', 'roa-rup', 'tpi', 'hif', 'guw', 'kl', 'zu', 'ay', 'jbo', + 'yi', 'ln', 'gu', 'na', 'gv', 'kw', 'am', 'ne', 'rw', 'ts', 'ig', 'qu', + 'ss', 'iu', 'chr', 'dv', 'ti', 'tn', ] category_redirect_templates = { diff --git a/pywikibot/page/_wikibase.py b/pywikibot/page/_wikibase.py index 2418cd8..14e7d5b 100644 --- a/pywikibot/page/_wikibase.py +++ b/pywikibot/page/_wikibase.py @@ -1936,7 +1936,7 @@ >>> repo = pywikibot.Site('wikidata') >>> L2 = pywikibot.LexemePage(repo, 'L2') # create a Lexeme page >>> list(L2.claims.keys()) # access the claims - ['P5831', 'P5402'] + ['P5402', 'P5831'] >>> len(L2.forms) # access the forms 2 >>> F1 = L2.forms[0] # access the first form diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index f8e1675..38687ed 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -25,7 +25,12 @@ from pywikibot.exceptions import InvalidTitleError, SiteDefinitionError from pywikibot.family import Family from pywikibot.time import TZoneFixedOffset -from pywikibot.tools import ModuleDeprecationWrapper, deprecated +from pywikibot.tools import ( + ModuleDeprecationWrapper, + deprecated, + first_lower, + first_upper, +) from pywikibot.userinterfaces.transliteration import NON_LATIN_DIGITS @@ -1838,13 +1843,18 @@ self.site = pywikibot.Site() if site is None else site self.origNames2monthNum = {} - for n, (_long, _short) in enumerate(self.site.months_names, start=1): - self.origNames2monthNum[_long] = n - self.origNames2monthNum[_short] = n - # in some cases month in ~~~~ might end without dot even if - # site.months_names do not. - if _short.endswith('.'): - self.origNames2monthNum[_short[:-1]] = n + # use first_lower/first_upper for 'vi' language because monthsnames + # were changed: T324310 + functions = [first_upper, + first_lower] if self.site.lang == 'vi' else [str] + for n, (long, short) in enumerate(self.site.months_names, start=1): + for func in functions: + self.origNames2monthNum[func(long)] = n + self.origNames2monthNum[func(short)] = n + # in some cases month in ~~~~ might end without dot even if + # site.months_names do not. + if short.endswith('.'): + self.origNames2monthNum[func(short[:-1])] = n self.groups = ['year', 'month', 'hour', 'time', 'day', 'minute', 'tzinfo'] diff --git a/setup.py b/setup.py index c1e9957..74af5f8 100755 --- a/setup.py +++ b/setup.py @@ -87,7 +87,9 @@ 'flake8-docstrings>=1.3.1', 'verve-flake8-mock>=0.4', 'flake8-print>=2.0.1', - 'flake8-quotes>=2.0.1', + # flake8-quotes is incompatible with flake8 6 (T323752), + # jenkins CI ignores "3.8.1" + 'flake8-quotes>=3.3.0; python_version < "3.8"', 'flake8-string-format', 'flake8-tuple>=0.2.8', 'flake8-no-u-prefixed-strings>=0.2', @@ -97,8 +99,8 @@ 'hacking': [ 'hacking', # importlib-metadata module already installed with hacking 4.1.0 - # but importlib-metadata 5.0.0 fails, so adjust it - 'importlib-metadata!=5.0.0', + # but importlib-metadata 5 fails, so adjust it + 'importlib-metadata<5.0.0; python_version < "3.8"', ], } diff --git a/tests/site_detect_tests.py b/tests/site_detect_tests.py index 2ac6ffc..a96e3ff 100755 --- a/tests/site_detect_tests.py +++ b/tests/site_detect_tests.py @@ -130,10 +130,6 @@ """Test detection of MediaWiki sites for www.otterstedt.de.""" self.assertNoSite('http://www.otterstedt.de/wiki/index.php/$1') - def test_mozillazine(self): - """Test detection of MediaWiki sites for kb.mozillazine.org.""" - self.assertNoSite('http://kb.mozillazine.org/$1') - class APIHiddenTestCase(SiteDetectionTestCase): diff --git a/tox.ini b/tox.ini index 4f0e1f0..ec44541 100644 --- a/tox.ini +++ b/tox.ini @@ -22,11 +22,14 @@ py36: python3.6 py37: python3.7 py38: python3.8 + py39: python3.9 setenv = VIRTUAL_ENV={envdir} PYWIKIBOT_NO_USER_CONFIG=2 + PYWIKIBOT_TEST_RUNNING=1 usedevelop = True commands = + python --version flake8: flake8 --version flake8-py36: flake8 --doctests {posargs} {[params]exclude} flake8-py38: flake8 --doctests {posargs} @@ -35,7 +38,8 @@ hacking: flake8 --format=default {posargs} deeptest: python {[params]generate_user_files} - deeptest: python -m unittest discover -vv -p "*_tests.py" + deeptest-py36: python -m unittest discover -vv -p "*_tests.py" + deeptest-py39: pytest fasttest: python {[params]generate_user_files} fasttest: pytest --version @@ -44,20 +48,22 @@ flake8: .[flake8] hacking: .[hacking] - fasttest: pytest >= 5.3 + fasttest: pytest >= 7.0.1 fasttest: pytest-attrib>=0.1.3 fasttest: pytest-subtests >= 0.3.2 fasttest: mock fasttest: .[mwparserfromhell] fasttest: .[scripts] - fasttest-py35: .[html] + fasttest-py36: .[html] fasttest-py37: .[wikitextparser] deeptest: .[html] deeptest: .[mwparserfromhell] deeptest: .[scripts] - deeptest: .[wikitextparser] + deeptest-py39: .[wikitextparser] + deeptest-py39: pytest >= 7.0.1 + deeptest-py39: pytest-subtests >= 0.3.2 [testenv:commit-message] basepython = python3 @@ -80,13 +86,29 @@ commands = {posargs} [testenv:doc] +basepython = python3.7 commands = - sphinx-build -M html ./docs ./docs/_build - rstcheck --recursive --report warning --ignore-roles api,phab . -basepython = python3.6 + sphinx-build -M html ./docs ./docs/_build -j auto deps = -rrequirements.txt - -rdocs/requirements-py3.txt + -rdocs/requirements.txt + +[testenv:rstcheck] +basepython = python3.7 +commands = + rstcheck --version + rstcheck -r --report-level WARNING --ignore-roles api,phab . +deps = + -rrequirements.txt + -rdocs/requirements.txt + +[testenv:sphinx] +basepython = python3.7 +commands = + sphinx-build -M html ./docs ./docs/_build -j auto -D html_theme=nature +deps = + -rrequirements.txt + -rdocs/requirements.txt [flake8] # The following are intentionally ignored, possibly pending consensus @@ -112,7 +134,7 @@ # DARXXX: Darglint docstring issues to be solved -ignore = B007,C103,D105,D211,D401,D413,D412,DAR003,DAR101,DAR102,DAR201,DAR202,DAR301,DAR401,DAR402,DAR501,H101,H238,H301,H306,H404,H405,H903,P101,P102,P103,P205,W503 +ignore = B007,C103,D105,D211,D401,D413,D412,DAR003,DAR101,DAR102,DAR201,DAR202,DAR301,DAR401,DAR402,DAR501,F401,H101,H238,H301,H306,H404,H405,H903,P101,P102,P103,P205,W503 enable-extensions = H203,H204,H205,N818 color = always @@ -235,8 +257,7 @@ ignore = D105,D211 [pytest] -minversion = 5.3 +minversion = 7.0.1 testpaths = tests python_files = *_tests.py addopts = --ignore=tests/l10n_tests.py -filterwarnings = ignore::pytest.PytestDeprecationWarning -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/863436 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: stable Gerrit-Change-Id: If20b7e0e3cf246ac91cce4a53bde34174bc6b2d6 Gerrit-Change-Number: 863436 Gerrit-PatchSet: 9 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]: Improve documentation for pywikibot.WbTime
by jenkins-bot (Code Review) 03 Dec '22

03 Dec '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/863293 ) Change subject: Improve documentation for pywikibot.WbTime ...................................................................... Improve documentation for pywikibot.WbTime - Mention that `site` isn't used if `calendermodel` is given Bug: T324329 Change-Id: I24cf00e74282a94b15af93b352031c3783ad8c41 --- M pywikibot/__init__.py 1 file changed, 35 insertions(+), 14 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 3b5a311..97c4bd9 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -350,19 +350,21 @@ to minutes. :param year: The year as a signed integer of between 1 and 16 digits. - :param month: Month - :param day: Day - :param hour: Hour - :param minute: Minute - :param second: Second + :param month: Month of the timestamp, if it exists. + :param day: Day of the timestamp, if it exists. + :param hour: Hour of the timestamp, if it exists. + :param minute: Minute of the timestamp, if it exists. + :param second: Second of the timestamp, if it exists. :param precision: The unit of the precision of the time. :param before: Number of units after the given time it could be, if uncertain. The unit is given by the precision. :param after: Number of units before the given time it could be, if uncertain. The unit is given by the precision. :param timezone: Timezone information in minutes. - :param calendarmodel: URI identifying the calendar model - :param site: The Wikibase site + :param calendarmodel: URI identifying the calendar model. + :param site: The Wikibase site. If not provided, retrieves the data + repository from the default site from user-config.py. + Only used if calendarmodel is not given. """ if year is None: raise ValueError('no year given') @@ -431,14 +433,17 @@ :param datetimestr: Timestamp in a format resembling ISO 8601, e.g. +2013-01-01T00:00:00Z - :param precision: The unit of the precision of the time. + :param precision: The unit of the precision of the time. Defaults to + 14 (second). :param before: Number of units after the given time it could be, if uncertain. The unit is given by the precision. :param after: Number of units before the given time it could be, if uncertain. The unit is given by the precision. :param timezone: Timezone information in minutes. - :param calendarmodel: URI identifying the calendar model - :param site: The Wikibase site + :param calendarmodel: URI identifying the calendar model. + :param site: The Wikibase site. If not provided, retrieves the data + repository from the default site from user-config.py. + Only used if calendarmodel is not given. """ match = re.match(r'([-+]?\d+)-(\d+)-(\d+)T(\d+):(\d+):(\d+)Z', datetimestr) @@ -459,14 +464,17 @@ Create a new WbTime object from a pywikibot.Timestamp. :param timestamp: Timestamp - :param precision: The unit of the precision of the time. + :param precision: The unit of the precision of the time. Defaults to + 14 (second). :param before: Number of units after the given time it could be, if uncertain. The unit is given by the precision. :param after: Number of units before the given time it could be, if uncertain. The unit is given by the precision. :param timezone: Timezone information in minutes. - :param calendarmodel: URI identifying the calendar model - :param site: The Wikibase site + :param calendarmodel: URI identifying the calendar model. + :param site: The Wikibase site. If not provided, retrieves the data + repository from the default site from user-config.py. + Only used if calendarmodel is not given. """ return cls.fromTimestr(timestamp.isoformat(), precision=precision, before=before, after=after, @@ -524,7 +532,8 @@ Create a WbTime from the JSON data given by the Wikibase API. :param data: Wikibase JSON - :param site: The Wikibase site + :param site: The Wikibase site. If not provided, retrieves the data + repository from the default site from user-config.py. """ return cls.fromTimestr(data['time'], data['precision'], data['before'], data['after'], -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/863293 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: I24cf00e74282a94b15af93b352031c3783ad8c41 Gerrit-Change-Number: 863293 Gerrit-PatchSet: 6 Gerrit-Owner: RPI2026F1 <sarkaraoyan+rpi2026f1(a)gmail.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