Pywikibot-commits September 2020

pywikibot-commits@lists.wikimedia.org

1 participants
110 discussions

[Gerrit] ...core[master]: [IMPR] Allow querying deleted revs without the deletedhistory right

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/623226 ) Change subject: [IMPR] Allow querying deleted revs without the deletedhistory right ...................................................................... [IMPR] Allow querying deleted revs without the deletedhistory right API restiction revised in MW 1.34 I84dc138aa310b601423161d1140891d47f8c64d8 Login not required after T71283 Change-Id: Ie2e8258e9e00170821f9fe817093e03d69a6c706 --- M pywikibot/site/__init__.py 1 file changed, 14 insertions(+), 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 8a4200e..64789b5 100644 --- a/pywikibot/site/__init__.py +++ b/pywikibot/site/__init__.py @@ -4771,19 +4771,25 @@ old_props.append('token') return old_props + # set default properties + prop = kwargs.pop('prop', + ['ids', 'user', 'comment', 'flags', 'timestamp']) + if content: + prop.append('content') + if start and end: self.assert_valid_iter_params('deletedrevs', start, end, reverse) - if not self.logged_in(): - self.login() - err = ('deletedrevs: User:{} not authorized to ' .format(self.user())) if not self.has_right('deletedhistory'): - raise Error(err + 'access deleted revisions.') - if content: - if not self.has_right('undelete'): - raise Error(err + 'view deleted content.') + if self.mw_version < '1.34': + raise Error(err + 'access deleted revisions.') + if 'comment' in prop or 'parsedcomment' in prop: + raise Error(err + 'access comments of deleted revisions.') + if ('content' in prop and not (self.has_right('deletedtext') + or self.has_right('undelete'))): + raise Error(err + 'view deleted content.') revids = kwargs.pop('revids', None) if not (bool(titles) ^ (revids is not None)): @@ -4809,14 +4815,7 @@ gen.request[pre + 'start'] = start gen.request[pre + 'end'] = end - - # handle properties - prop = kwargs.pop('prop', - ['ids', 'user', 'comment', 'flags', 'timestamp']) - if content: - prop.append('content') - prop = handle_props(prop) - gen.request[pre + 'prop'] = prop + gen.request[pre + 'prop'] = handle_props(prop) # handle other parameters like user for k, v in kwargs.items(): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/623226 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: Ie2e8258e9e00170821f9fe817093e03d69a6c706 Gerrit-Change-Number: 623226 Gerrit-PatchSet: 9 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 7 months

[Gerrit] ...core[master]: [bugfix] use IntEnum for _loginstatus instead of int value

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/627779 ) Change subject: [bugfix] use IntEnum for _loginstatus instead of int value ...................................................................... [bugfix] use IntEnum for _loginstatus instead of int value Also update dry_api_tests.py Bug: T263010 Change-Id: I5b8cec2ed5a1dea96998c641b422e538b1aa31b8 --- M pywikibot/data/api.py M tests/dry_api_tests.py 2 files changed, 18 insertions(+), 16 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 9bd5791..798ebd2 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -2011,7 +2011,10 @@ continue # If readapidenied is returned try to login - if code == 'readapidenied' and self.site._loginstatus in (-3, -1): + if code == 'readapidenied' \ + and self.site._loginstatus in ( + pywikibot.site.LoginStatus.NOT_ATTEMPTED, + pywikibot.site.LoginStatus.NOT_LOGGED_IN): self.site.login() continue @@ -3032,7 +3035,7 @@ return self.mapping[key][index] @remove_last_args(arg_names=['remember, captchaId, captchaAnswer']) - def getCookie(self): + def getCookie(self) -> str: """Login to the site. Note, this doesn't actually return or do anything with cookies. @@ -3080,7 +3083,7 @@ if self.site.family.ldapDomain: login_request[self.keyword('ldap')] = self.site.family.ldapDomain - self.site._loginstatus = -2 # IN_PROGRESS + self.site._loginstatus = pywikibot.site.LoginStatus.IN_PROGRESS while True: # get token using meta=tokens if supported if not below_mw_1_27: diff --git a/tests/dry_api_tests.py b/tests/dry_api_tests.py index 9e61e60..0aaeba5 100644 --- a/tests/dry_api_tests.py +++ b/tests/dry_api_tests.py @@ -5,8 +5,6 @@ # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - import datetime import pywikibot @@ -17,6 +15,7 @@ QueryGenerator, ) from pywikibot.family import Family +from pywikibot.site import LoginStatus from pywikibot.tools import suppress_warnings from tests import join_images_path, patch @@ -45,7 +44,7 @@ def setUp(self): """Initialize the fake requests.""" - super(DryCachedRequestTests, self).setUp() + super().setUp() self.parms = {'action': 'query', 'meta': 'userinfo'} self.req = CachedRequest(expiry=1, site=self.basesite, @@ -147,7 +146,7 @@ class MockSite(pywikibot.site.APISite): - _loginstatus = pywikibot.site.LoginStatus.NOT_ATTEMPTED + _loginstatus = LoginStatus.NOT_ATTEMPTED _namespaces = {2: ['User']} @@ -185,7 +184,7 @@ raise Exception('Attribute {!r} not defined'.format(attr)) self.mocksite = MockSite() - super(MockCachedRequestKeyTests, self).setUp() + super().setUp() def test_cachefile_path_different_users(self): """Test and compare file paths when different usernames are used.""" @@ -194,26 +193,26 @@ anonpath = req._cachefile_path() self.mocksite._userinfo = {'name': 'MyUser'} - self.mocksite._loginstatus = 0 + self.mocksite._loginstatus = LoginStatus.AS_USER req = CachedRequest(expiry=1, site=self.mocksite, parameters={'action': 'query', 'meta': 'siteinfo'}) userpath = req._cachefile_path() self.assertNotEqual(anonpath, userpath) - self.mocksite._userinfo = {'name': 'MySysop'} - self.mocksite._loginstatus = 1 + self.mocksite._userinfo = {'name': 'MyOtherUser'} + self.mocksite._loginstatus = LoginStatus.AS_USER req = CachedRequest(expiry=1, site=self.mocksite, parameters={'action': 'query', 'meta': 'siteinfo'}) - sysoppath = req._cachefile_path() + otherpath = req._cachefile_path() - self.assertNotEqual(anonpath, sysoppath) - self.assertNotEqual(userpath, sysoppath) + self.assertNotEqual(anonpath, otherpath) + self.assertNotEqual(userpath, otherpath) def test_unicode(self): """Test caching with Unicode content.""" self.mocksite._userinfo = {'name': 'محمد الفلسطيني'} - self.mocksite._loginstatus = 0 + self.mocksite._loginstatus = LoginStatus.AS_USER req = CachedRequest(expiry=1, site=self.mocksite, parameters={'action': 'query', 'meta': 'siteinfo'}) @@ -385,7 +384,7 @@ def setUp(self): """Add a real ParamInfo to the DrySite.""" - super(ParamInfoDictTests, self).setUp() + super().setUp() site = self.get_site() site._paraminfo = ParamInfo(site) # Pretend that paraminfo has been loaded -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/627779 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: I5b8cec2ed5a1dea96998c641b422e538b1aa31b8 Gerrit-Change-Number: 627779 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Multichill <maarten(a)mdammers.nl> Gerrit-Reviewer: jenkins-bot Gerrit-CC: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-CC: Russell Blau <russblau(a)imapmail.org> Gerrit-MessageType: merged

3 years, 7 months

[Gerrit] ...core[master]: [L10N] Update languages_by_size

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/628486 ) Change subject: [L10N] Update languages_by_size ...................................................................... [L10N] Update languages_by_size Change-Id: I36e731d8cefe10851675ff6d5698438a9feceb00 --- M pywikibot/families/wikibooks_family.py M pywikibot/families/wikipedia_family.py M pywikibot/families/wikiquote_family.py M pywikibot/families/wikivoyage_family.py M pywikibot/families/wiktionary_family.py 5 files changed, 34 insertions(+), 34 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/families/wikibooks_family.py b/pywikibot/families/wikibooks_family.py index 3dbe217..2add152 100644 --- a/pywikibot/families/wikibooks_family.py +++ b/pywikibot/families/wikibooks_family.py @@ -32,7 +32,7 @@ languages_by_size = [ 'en', 'hu', 'de', 'fr', 'pt', 'ja', 'it', 'es', 'nl', 'pl', 'id', 'he', 'fi', 'zh', 'sq', 'az', 'fa', 'ru', 'vi', 'ca', 'eu', 'da', 'ko', 'ba', - 'sv', 'th', 'gl', 'sr', 'cs', 'hi', 'hr', 'no', 'tr', 'ar', 'sa', 'ta', + 'sv', 'th', 'gl', 'sr', 'hi', 'cs', 'hr', 'no', 'tr', 'ar', 'sa', 'ta', 'uk', 'eo', 'sk', 'is', 'ro', 'bn', 'si', 'mk', 'ka', 'bg', 'ms', 'tt', 'lt', 'el', 'li', 'ur', 'sl', 'km', 'tl', 'la', 'et', 'be', 'kk', 'ia', 'ml', 'oc', 'ne', 'hy', 'tg', 'cv', 'pa', 'te', 'ku', 'fy', 'bs', 'cy', diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index 67319bc..65ae95b 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -29,35 +29,35 @@ languages_by_size = [ 'en', 'ceb', 'sv', 'de', 'fr', 'nl', 'ru', 'it', 'es', 'pl', 'war', - 'vi', 'ja', 'zh', 'arz', 'ar', 'pt', 'uk', 'fa', 'ca', 'sr', 'id', - 'no', 'ko', 'fi', 'hu', 'cs', 'sh', 'ro', 'zh-min-nan', 'eu', 'tr', - 'ms', 'eo', 'ce', 'hy', 'he', 'bg', 'da', 'azb', 'sk', 'kk', 'min', + 'vi', 'ja', 'zh', 'arz', 'ar', 'uk', 'pt', 'fa', 'ca', 'sr', 'no', + 'id', 'ko', 'fi', 'hu', 'cs', 'sh', 'ro', 'zh-min-nan', 'tr', 'eu', + 'ms', 'ce', 'eo', 'he', 'hy', 'bg', 'da', 'azb', 'sk', 'kk', 'min', 'hr', 'et', 'lt', 'be', 'el', 'az', 'simple', 'sl', 'gl', 'ur', 'nn', - 'hi', 'ka', 'th', 'uz', 'tt', 'la', 'cy', 'ta', 'vo', 'mk', 'ast', - 'lv', 'tg', 'zh-yue', 'bn', 'af', 'mg', 'oc', 'bs', 'sq', 'ky', 'nds', - 'new', 'be-tarask', 'ml', 'te', 'tl', 'br', 'pms', 'mr', 'su', 'sw', - 'ht', 'lb', 'sco', 'vec', 'jv', 'pnb', 'ga', 'ba', 'szl', 'is', 'my', - 'fy', 'cv', 'lmo', 'wuu', 'an', 'pa', 'ne', 'yo', 'bar', 'ku', 'diq', + 'hi', 'ka', 'th', 'tt', 'uz', 'la', 'cy', 'ta', 'vo', 'mk', 'ast', + 'lv', 'zh-yue', 'tg', 'bn', 'af', 'mg', 'oc', 'bs', 'sq', 'ky', 'nds', + 'new', 'be-tarask', 'ml', 'te', 'br', 'tl', 'pms', 'vec', 'mr', 'su', + 'sw', 'ht', 'lb', 'jv', 'sco', 'pnb', 'ga', 'ba', 'szl', 'is', 'my', + 'fy', 'cv', 'lmo', 'wuu', 'an', 'pa', 'ne', 'yo', 'ku', 'bar', 'diq', 'io', 'gu', 'als', 'ckb', 'kn', 'scn', 'bpy', 'qu', 'ia', 'mn', - 'bat-smg', 'or', 'nv', 'si', 'cdo', 'ilo', 'gd', 'am', 'yi', 'nap', - 'bug', 'wa', 'xmf', 'sd', 'mai', 'hsb', 'map-bms', 'fo', 'mzn', 'li', + 'bat-smg', 'or', 'nv', 'si', 'cdo', 'ilo', 'gd', 'xmf', 'yi', 'am', + 'nap', 'bug', 'wa', 'sd', 'mai', 'hsb', 'map-bms', 'fo', 'mzn', 'li', 'sah', 'eml', 'os', 'ps', 'sa', 'frr', 'bcl', 'zh-classical', 'ace', - 'mrj', 'mhr', 'hif', 'hak', 'roa-tara', 'avk', 'pam', 'gor', 'hyw', - 'km', 'nso', 'rue', 'se', 'crh', 'bh', 'shn', 'vls', 'as', 'mi', - 'nds-nl', 'nah', 'sc', 'vep', 'gan', 'myv', 'ab', 'glk', 'bo', 'sn', - 'co', 'tk', 'so', 'fiu-vro', 'lrc', 'csb', 'kv', 'ha', 'ie', 'gv', - 'udm', 'pcd', 'ay', 'kab', 'zea', 'nrm', 'sat', 'ug', 'lij', 'kw', - 'lez', 'frp', 'stq', 'lfn', 'zu', 'gn', 'mwl', 'ban', 'gom', 'rm', - 'mt', 'lo', 'lad', 'koi', 'fur', 'olo', 'dty', 'ang', 'dsb', 'bjn', - 'ext', 'ln', 'cbk-zam', 'dv', 'ksh', 'gag', 'pfl', 'tyv', 'pag', 'pi', - 'av', 'awa', 'ary', 'haw', 'bxr', 'xal', 'krc', 'pap', 'za', 'pdc', + 'mrj', 'mhr', 'hif', 'avk', 'hak', 'roa-tara', 'gor', 'pam', 'hyw', + 'km', 'nso', 'rue', 'crh', 'se', 'bh', 'shn', 'as', 'vls', 'mi', + 'nds-nl', 'nah', 'sc', 'vep', 'gan', 'myv', 'ab', 'glk', 'sn', 'bo', + 'co', 'tk', 'so', 'lrc', 'fiu-vro', 'csb', 'kv', 'ha', 'ie', 'gv', + 'udm', 'pcd', 'ay', 'kab', 'zea', 'sat', 'nrm', 'ug', 'lij', 'kw', + 'lez', 'frp', 'zu', 'stq', 'lfn', 'ban', 'gn', 'mwl', 'gom', 'rm', + 'mt', 'lo', 'lad', 'koi', 'fur', 'olo', 'ang', 'dty', 'dsb', 'bjn', + 'ext', 'ln', 'cbk-zam', 'dv', 'ksh', 'gag', 'tyv', 'pfl', 'pag', 'ary', + 'pi', 'av', 'awa', 'haw', 'bxr', 'xal', 'krc', 'pap', 'za', 'pdc', 'kaa', 'rw', 'szy', 'arc', 'to', 'nov', 'jam', 'tpi', 'kbp', 'kbd', - 'ig', 'na', 'tet', 'inh', 'wo', 'tcy', 'ki', 'jbo', 'atj', 'roa-rup', - 'bi', 'lbe', 'kg', 'ty', 'lg', 'mdf', 'srn', 'xh', 'fj', 'gcr', 'ltg', - 'chr', 'lld', 'ak', 'sm', 'om', 'kl', 'got', 'pih', 'cu', 'ny', 'tn', - 'tw', 'nqo', 'st', 'ts', 'rmy', 'bm', 'mnw', 'chy', 'rn', 'tum', 'ss', - 'ch', 'iu', 'pnt', 'ady', 'ks', 've', 'ee', 'ik', 'ff', 'sg', 'dz', - 'ti', 'cr', 'din', + 'ig', 'na', 'tet', 'inh', 'wo', 'tcy', 'ki', 'atj', 'jbo', 'roa-rup', + 'bi', 'lbe', 'kg', 'ty', 'lg', 'mdf', 'fj', 'srn', 'xh', 'gcr', 'ltg', + 'chr', 'lld', 'ak', 'sm', 'om', 'kl', 'got', 'pih', 'st', 'cu', 'ny', + 'nqo', 'tn', 'tw', 'ts', 'rmy', 'bm', 'mnw', 'chy', 'rn', 'tum', 'ss', + 'ch', 'iu', 'pnt', 'ks', 'ady', 've', 'ee', 'ik', 'ff', 'sg', 'dz', + 'ti', 'din', '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 bc3ff56..1b2aeca 100644 --- a/pywikibot/families/wikiquote_family.py +++ b/pywikibot/families/wikiquote_family.py @@ -29,9 +29,9 @@ languages_by_size = [ 'en', 'it', 'pl', 'ru', 'cs', 'fa', 'de', 'pt', 'es', 'fr', 'uk', 'he', - 'sk', 'bs', 'tr', 'ca', 'fi', 'az', 'sl', 'lt', 'eo', 'zh', 'bg', 'hr', - 'hy', 'ar', 'el', 'su', 'id', 'nn', 'et', 'sv', 'li', 'hu', 'ko', 'nl', - 'ja', 'la', 'ta', 'sah', 'sr', 'gu', 'gl', 'th', 'ur', 'te', 'be', + 'sk', 'bs', 'tr', 'ca', 'fi', 'az', 'sl', 'lt', 'eo', 'zh', 'bg', 'ar', + 'hr', 'hy', 'et', 'el', 'su', 'id', 'nn', 'sv', 'li', 'hu', 'ko', 'nl', + 'ja', 'la', 'ta', 'sah', 'sr', 'gu', 'gl', 'ur', 'th', 'te', 'be', 'cy', 'no', 'ml', 'sq', 'kn', 'ro', 'ku', 'eu', 'uz', 'hi', 'ka', 'da', 'sa', 'is', 'vi', 'br', 'mr', 'af', 'wo', 'ky', ] diff --git a/pywikibot/families/wikivoyage_family.py b/pywikibot/families/wikivoyage_family.py index d99caa9..54ea424 100644 --- a/pywikibot/families/wikivoyage_family.py +++ b/pywikibot/families/wikivoyage_family.py @@ -17,7 +17,7 @@ languages_by_size = [ 'en', 'de', 'pl', 'it', 'fa', 'fr', 'ru', 'zh', 'nl', 'pt', 'es', 'he', - 'vi', 'fi', 'sv', 'el', 'ro', 'uk', 'bn', 'ps', 'ja', 'hi', + 'vi', 'fi', 'sv', 'el', 'ro', 'uk', 'bn', 'ps', 'hi', 'ja', ] category_redirect_templates = { diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index 27f0038..4f2dcd7 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -36,10 +36,10 @@ 'az', 'oc', 'eu', 'uk', 'br', 'da', 'lo', 'hr', 'is', 'simple', 'ast', 'fj', 'la', 'tg', 'ky', 'sk', 'bg', 'ur', 'ps', 'wa', 'cy', 'vo', 'af', 'zh-min-nan', 'he', 'shn', 'scn', 'tl', 'pa', 'sw', 'fy', 'bn', 'nn', - 'lv', 'sq', 'ka', 'co', 'mn', 'pnb', 'sl', 'min', 'lb', 'nds', 'bs', - 'nah', 'sa', 'kk', 'ms', 'km', 'vec', 'tk', 'mk', 'be', 'sm', 'hsb', - 'yue', 'gd', 'shy', 'ga', 'an', 'wo', 'gom', 'ang', 'ia', 'tt', 'mt', - 'sd', 'gn', 'mr', 'ie', 'so', 'fo', 'csb', 'ug', 'st', 'roa-rup', 'si', + 'lv', 'sq', 'ka', 'sl', 'co', 'mn', 'pnb', 'min', 'lb', 'nds', 'bs', + 'nah', 'sa', 'kk', 'yue', 'ms', 'km', 'vec', 'tk', 'mk', 'be', 'sm', + 'hsb', 'shy', 'gd', 'ga', 'an', 'wo', 'gom', 'ang', 'ia', 'tt', 'mt', + 'sd', 'gn', 'mr', 'ie', 'fo', 'so', 'csb', 'ug', 'st', 'roa-rup', 'si', 'hif', 'zu', 'kl', 'su', 'ay', 'mi', 'jbo', 'ln', 'yi', 'gu', 'na', 'gv', 'kw', 'tpi', 'rw', 'ts', 'ne', 'om', 'qu', 'ss', 'ha', 'iu', 'am', 'dv', 'sg', 'ti', 'tn', 'ks', -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/628486 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: I36e731d8cefe10851675ff6d5698438a9feceb00 Gerrit-Change-Number: 628486 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 7 months

[Gerrit] ...core[master]: Update commonscatTemplates for ar, arz, ary

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/628376 ) Change subject: Update commonscatTemplates for ar, arz, ary ...................................................................... Update commonscatTemplates for ar, arz, ary Change-Id: I868f5b32f3a58fb9509c3a8c6f543aad772fbd9c --- M scripts/commonscat.py 1 file changed, 8 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/scripts/commonscat.py b/scripts/commonscat.py index 1a746c0..7cbb639 100755 --- a/scripts/commonscat.py +++ b/scripts/commonscat.py @@ -59,8 +59,14 @@ 'af': ('CommonsKategorie', ['commonscat']), 'an': ('Commonscat', ['Commons cat']), 'ar': ('تصنيف كومنز', - ['Commonscat', 'تصنيف كومونز', 'تك', 'Commons cat', 'CommonsCat']), - 'arz': ('Commons cat', ['Commoncat']), + ['Commonscat', 'تصنيف كومونز', 'Commons cat', 'Commons category', + 'تك', 'Commonscategory', 'Category commons']), + 'ary': ('Commons category', + ['Commoncat', 'تصنيف كومنز', 'Commons cat', 'Commonscategory', + 'Category commons']), + 'arz': ('تصنيف كومونز', + ['تصنيف كومنز', 'Commoncat', 'Commons category', 'Commons cat', + 'Commonscategory', 'Category commons']), 'az': ('CommonsKat', ['Commonscat']), 'bn': ('কমন্সক্যাট', ['Commonscat']), 'ca': ('Commonscat', ['Commons cat', 'Commons category']), -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/628376 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: I868f5b32f3a58fb9509c3a8c6f543aad772fbd9c Gerrit-Change-Number: 628376 Gerrit-PatchSet: 3 Gerrit-Owner: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: SonarQube Bot <kharlan+sonarqubebot(a)wikimedia.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 7 months

[Gerrit] ...core[master]: [bugfix] Adjust save counter in commonscat.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/628140 ) Change subject: [bugfix] Adjust save counter in commonscat.py ...................................................................... [bugfix] Adjust save counter in commonscat.py Bug: T262772 Change-Id: Icdeba7bbb7ce4120a4ee818604247b3e4f00e639 --- M scripts/commonscat.py 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Meno25: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/commonscat.py b/scripts/commonscat.py index 7b86f31..1a746c0 100755 --- a/scripts/commonscat.py +++ b/scripts/commonscat.py @@ -39,8 +39,6 @@ # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - import re import pywikibot @@ -307,9 +305,11 @@ else: textToAdd = '{{%s|%s}}' % (primaryCommonscat, commonscatLink) - _, _, always = add_text(page, textToAdd, - self.getOption('summary'), - always=self.getOption('always')) + result, _, always = add_text(page, textToAdd, + self.getOption('summary'), + always=self.getOption('always')) + if result is True: + self._save_counter += 1 self.options['always'] = always def changeCommonscat( -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/628140 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: Icdeba7bbb7ce4120a4ee818604247b3e4f00e639 Gerrit-Change-Number: 628140 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 7 months

[Gerrit] ...core[master]: [IMPR] Improvements for match_images.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/628092 ) Change subject: [IMPR] Improvements for match_images.py ...................................................................... [IMPR] Improvements for match_images.py - remove Python 2 code - simplify imageB.resize parameters - simplify creating site object for other_family and other_lang - simplify arg parsing Change-Id: I19049a56ed47efb75dca979866dbeac98409ab09 --- M scripts/match_images.py 1 file changed, 15 insertions(+), 33 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/match_images.py b/scripts/match_images.py index 98cb102..5a69099 100755 --- a/scripts/match_images.py +++ b/scripts/match_images.py @@ -27,8 +27,6 @@ # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - import io import pywikibot @@ -52,9 +50,8 @@ imageA = get_image_from_image_page(imagePageA) imageB = get_image_from_image_page(imagePageB) - (imA_width, imA_height) = imageA.size - - imageB = imageB.resize((imA_width, imA_height)) + imageB = imageB.resize(imageA.size) + imA_width, imA_height = imageA.size imageA_topleft = imageA.crop((0, 0, imA_width // 2, imA_height // 2)) imageB_topleft = imageB.crop((0, 0, imA_width // 2, imA_height // 2)) @@ -142,25 +139,21 @@ def main(*args): """Extracting file page information and initiate matching.""" images = [] - other_family = '' - other_lang = '' # Read commandline parameters. local_args = pywikibot.handle_args(args) + current_site = pywikibot.Site() + other_family = current_site.family.name + other_lang = current_site.code for arg in local_args: - if arg.startswith('-otherfamily:'): - if len(arg) == len('-otherfamily:'): - other_family = pywikibot.input( - 'What family do you want to use?') - else: - other_family = arg[len('-otherfamily:'):] - elif arg.startswith('-otherlang:'): - if len(arg) == len('-otherlang:'): - other_lang = pywikibot.input( - 'What language do you want to use?') - else: - other_lang = arg[len('otherlang:'):] + option, _, value = arg.partition(':') + if option == '-otherfamily': + other_family = value or pywikibot.input( + 'What family do you want to use?') + elif option == '-otherlang': + other_lang = value or pywikibot.input( + 'What language do you want to use?') else: images.append(arg) @@ -174,20 +167,9 @@ additional_text=additional_text): return - imagePageA = pywikibot.page.FilePage(pywikibot.Site(), - images[0]) - if other_lang: - if other_family: - imagePageB = pywikibot.page.FilePage(pywikibot.Site( - other_lang, other_family), - images[1]) - else: - imagePageB = pywikibot.page.FilePage(pywikibot.Site( - other_lang), - images[1]) - else: - imagePageB = pywikibot.page.FilePage(pywikibot.Site(), - images[1]) + other_site = pywikibot.Site(other_lang, other_family) + imagePageA = pywikibot.page.FilePage(current_site, images[0]) + imagePageB = pywikibot.page.FilePage(other_site, images[1]) match_image_pages(imagePageA, imagePageB) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/628092 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: I19049a56ed47efb75dca979866dbeac98409ab09 Gerrit-Change-Number: 628092 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 7 months

[Gerrit] ...i18n[master]: Localisation updates from https://translatewiki.net.

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/628108 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I5dad800967766f557853f5e6255670e07c240f6b --- A blockpageschecker/ckb.json M pywikibot/ne.json A standardize_interwiki/ckb.json 3 files changed, 18 insertions(+), 1 deletion(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/blockpageschecker/ckb.json b/blockpageschecker/ckb.json new file mode 100644 index 0000000..2af3db4 --- /dev/null +++ b/blockpageschecker/ckb.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "ئارام بکر" + ] + }, + "blockpageschecker-summary": "بۆت: سڕینەوەی داڕێژەی کۆن" +} diff --git a/pywikibot/ne.json b/pywikibot/ne.json index 86b6e89..e727aff 100644 --- a/pywikibot/ne.json +++ b/pywikibot/ne.json @@ -1,13 +1,14 @@ { "@metadata": { "authors": [ + "पर्वत सुबेदी", "सरोज कुमार ढकाल" ] }, "pywikibot-enter-category-name": "कृपया श्रेणीको नाम प्रविष्ठ गर्नुहोस् :", "pywikibot-enter-file-links-processing": "फाइल पृष्ठ सम्पादन गर्नु पर्ने लक्ष्यको लिङ्क ?", "pywikibot-enter-finished-browser": "ब्राउजरमा सकिएपछि इन्टर थिच्नुहोला ।", - "pywikibot-enter-namespace-number": "कृपया नेमस्पेस संख्याको रुपमा राख्नुहोला :", + "pywikibot-enter-namespace-number": "कृपया नामपद सङ्ख्याको रुपमा राख्नुहोला :", "pywikibot-enter-new-text": "कृपया नयाँ पाठ प्रविष्ठ गर्नुहोस् :", "pywikibot-enter-page-processing": "कुन पृष्ठमा कार्य गर्ने हो ?", "pywikibot-enter-xml-filename": "कृपया XML dumpको फाइलनाम खुलाउनुहोस्:", diff --git a/standardize_interwiki/ckb.json b/standardize_interwiki/ckb.json new file mode 100644 index 0000000..44a4e21 --- /dev/null +++ b/standardize_interwiki/ckb.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "ئارام بکر" + ] + }, + "standardize_interwiki-comment": "ڕۆبۆت: ستانداردکردنی نێوانویکی" +} -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/628108 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: I5dad800967766f557853f5e6255670e07c240f6b Gerrit-Change-Number: 628108 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

3 years, 7 months

[Gerrit] ...core[master]: [IMPR] Split initializer and put getting whitelist to its own method

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/626849 ) Change subject: [IMPR] Split initializer and put getting whitelist to its own method ...................................................................... [IMPR] Split initializer and put getting whitelist to its own method Decrease code complexity of initializer Change-Id: I7a4245d061a281524e5ba9b5ac619b38566c9e28 --- M scripts/casechecker.py 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved Matěj Suchánek: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/casechecker.py b/scripts/casechecker.py index f744990..4e76a00 100755 --- a/scripts/casechecker.py +++ b/scripts/casechecker.py @@ -194,8 +194,10 @@ .format(ascii=ascii_letters, local=self.localLtr, bad=badPtrnStr)) + self.get_whitelist() - # Get whitelist + def get_whitelist(self): + """Get whitelist.""" self.knownWords = set() self.seenUnresolvedLinks = set() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/626849 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: I7a4245d061a281524e5ba9b5ac619b38566c9e28 Gerrit-Change-Number: 626849 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 7 months

[Gerrit] ...core[master]: Implement test stubs for remaning collection classes

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/626878 ) Change subject: Implement test stubs for remaning collection classes ...................................................................... Implement test stubs for remaning collection classes Change-Id: Ib55a2e043c9495acdd789a7db7f0df64b9df5401 --- M tests/wikibase_tests.py 1 file changed, 23 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index 810cf41..13a028c 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -16,6 +16,7 @@ from pywikibot import pagegenerators from pywikibot.page import ( WikibasePage, ItemPage, PropertyPage, Page, LanguageDict, AliasesDict, + ClaimCollection, SiteLinkCollection, ) from pywikibot.site import Namespace, NamespacesDict from pywikibot.tools import MediaWikiVersion, suppress_warnings @@ -1974,6 +1975,28 @@ self._test_new_empty() +class TestClaimCollection(DataCollectionTestCase): + + """Test cases covering ClaimCollection methods.""" + + collection_class = ClaimCollection + + def test_new_empty(self): + """Test that new_empty method returns empty collection.""" + self._test_new_empty() + + +class TestSiteLinkCollection(DataCollectionTestCase): + + """Test cases covering SiteLinkCollection methods.""" + + collection_class = SiteLinkCollection + + def test_new_empty(self): + """Test that new_empty method returns empty collection.""" + self._test_new_empty() + + class TestWriteNormalizeData(TestCase): """Test cases for routines that normalize data for writing to Wikidata. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/626878 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: Ib55a2e043c9495acdd789a7db7f0df64b9df5401 Gerrit-Change-Number: 626878 Gerrit-PatchSet: 2 Gerrit-Owner: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 7 months

[Gerrit] ...core[master]: Use ignore_discard for login cookie container

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/626911 ) Change subject: Use ignore_discard for login cookie container ...................................................................... Use ignore_discard for login cookie container Allow saving and loading cookies with the discard flag (ie. session cookies). This allows saving bot password sessions, which did not work before (normal sessions did since they can fall back on the user_token cookie which is non-session). Since session cookies do not have an expiry, the login will be valid as long as the session exists on the server (e.g. for Wikimedia servers this is nowadays 24 hours). Bug: T261066 Change-Id: I1519fd7cde847ab82f378758e04024619410922f --- M pywikibot/comms/http.py M pywikibot/data/api.py 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index 165d4c8..74e5f98 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -61,7 +61,7 @@ file_mode_checker(cookie_file_path, create=True) cookie_jar = cookiejar.LWPCookieJar(cookie_file_path) try: - cookie_jar.load() + cookie_jar.load(ignore_discard=True) except cookiejar.LoadError: debug('Loading cookies failed.', _logger) else: diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 4c896fd..db15452 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -3154,7 +3154,7 @@ def storecookiedata(self, data): """Ignore data; cookies are set by threadedhttp module.""" - http.cookie_jar.save() + http.cookie_jar.save(ignore_discard=True) def get_login_token(self) -> str: """Fetch login token from action=query&meta=tokens. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/626911 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: I1519fd7cde847ab82f378758e04024619410922f Gerrit-Change-Number: 626911 Gerrit-PatchSet: 2 Gerrit-Owner: Gergő Tisza <gtisza(a)wikimedia.org> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Isaacandy <isaac(a)iznd.xyz> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Siebrand <siebrand(a)kitano.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 7 months

← Newer
1
...
4
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits September 2020