Pywikibot-commits January 2023

pywikibot-commits@lists.wikimedia.org

1 participants
84 discussions

[Gerrit] ...core[master]: [8.0] Publish Pywikibot 8

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/881999 ) Change subject: [8.0] Publish Pywikibot 8 ...................................................................... [8.0] Publish Pywikibot 8 - Update version - update ROADMAP.rst - update languages_by_size - update WbTime.fromTimestamp documentation Bug: T308258 Change-Id: Ie809c74ba8954a432b60ff1b561d9e220a0e6ee6 --- M pywikibot/__init__.py M ROADMAP.rst M pywikibot/__metadata__.py M pywikibot/families/wikiquote_family.py M pywikibot/families/wiktionary_family.py M pywikibot/families/wikipedia_family.py 6 files changed, 57 insertions(+), 37 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/ROADMAP.rst b/ROADMAP.rst index 77eb8a1..a1ed684 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -4,6 +4,7 @@ Improvements ^^^^^^^^^^^^ +* Allow copying timezone from timestamp in :class:`pywikibot.WbTime` (:phab:`T325864`) * Support federated Wikibase (:phab:`T173195`) * Improve warning if a Non-JSON response was received from server (:phab:`T326046`) * Allow normalization of :class:`pywikibot.WbTime` objects (:phab:`T123888`) diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 25c39d2..c9a2149 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -570,38 +570,42 @@ precision, before, after, timezone, calendarmodel, site) @classmethod - def fromTimestamp(cls: Type['WbTime'], timestamp: 'Timestamp', + def fromTimestamp(cls: Type['WbTime'], + timestamp: 'Timestamp', precision: Union[int, str] = 14, - before: int = 0, after: int = 0, - timezone: int = 0, calendarmodel: Optional[str] = None, + before: int = 0, + after: int = 0, + timezone: int = 0, + calendarmodel: Optional[str] = None, site: Optional[DataSite] = None, copy_timezone: bool = False) -> 'WbTime': - """ - Create a new WbTime object from a pywikibot.Timestamp. + """Create a new WbTime object from a pywikibot.Timestamp. + + .. versionchanged:: 8.0 + Added *copy_timezone* parameter. :param timestamp: Timestamp - :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 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. If not provided, retrieves the data - repository from the default site from user-config.py. + :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. - :param copy_timezone: Whether to copy the timezone from the Timestamp - if it has timezone information. Defaults to False to maintain - backwards compatibility. If a timezone is given, timezone - information is discarded. + :param copy_timezone: Whether to copy the timezone from the + timestamp if it has timezone information. Defaults to False + to maintain backwards compatibility. If a timezone is given, + timezone information is discarded. """ if not timezone and timestamp.tzinfo and copy_timezone: timezone = int(timestamp.utcoffset().total_seconds() / 60) return cls.fromTimestr(timestamp.isoformat(), precision=precision, - before=before, after=after, - timezone=timezone, calendarmodel=calendarmodel, - site=site) + before=before, after=after, timezone=timezone, + calendarmodel=calendarmodel, site=site) def normalize(self) -> 'WbTime': """Normalizes the WbTime object to account for precision. diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py index 152253c..a9e6e99 100644 --- a/pywikibot/__metadata__.py +++ b/pywikibot/__metadata__.py @@ -11,7 +11,7 @@ __name__ = 'pywikibot' -__version__ = '8.0.0.dev0' +__version__ = '8.0.0' __description__ = 'Python MediaWiki Bot Framework' __maintainer__ = 'The Pywikibot team' __maintainer_email__ = 'pywikibot(a)lists.wikimedia.org' diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index dbb42ae..0a0603e 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -30,32 +30,32 @@ 'ja', 'zh', 'vi', 'war', 'uk', 'ar', 'pt', 'fa', 'ca', 'sr', 'id', 'ko', 'no', 'fi', 'tr', 'hu', 'cs', 'ce', 'tt', 'sh', 'ro', 'zh-min-nan', 'eu', 'ms', 'eo', 'he', 'hy', 'da', 'bg', 'cy', 'sk', - 'azb', 'et', 'kk', 'be', 'min', 'simple', 'uz', 'el', 'hr', 'lt', 'gl', + 'azb', 'et', 'kk', 'be', 'simple', 'min', 'uz', 'el', 'hr', 'lt', 'gl', 'az', 'ur', 'sl', 'ka', 'nn', 'hi', 'th', 'ta', 'la', 'bn', 'mk', 'ast', 'zh-yue', 'lv', 'tg', 'af', 'my', 'mg', 'bs', 'mr', 'oc', 'sq', 'nds', 'ml', 'ky', 'be-tarask', 'te', 'br', 'sw', 'new', 'jv', 'lld', 'vec', 'ht', 'pnb', 'pms', 'ba', 'lb', 'su', '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', + 'vo', 'yo', 'ne', 'gu', 'als', 'kn', 'ia', 'bar', 'avk', 'scn', 'bpy', 'qu', 'crh', 'mn', 'nv', 'ha', 'xmf', 'si', 'ban', 'bat-smg', 'ps', 'frr', 'os', 'or', 'sah', 'gd', 'bug', 'cdo', 'yi', 'ilo', 'sd', 'am', - 'nap', 'li', 'fo', 'hsb', 'gor', 'map-bms', 'mai', 'mzn', 'ig', 'bcl', + 'nap', 'li', 'gor', 'fo', 'hsb', 'map-bms', 'mai', 'mzn', 'ig', 'bcl', 'eml', 'ace', 'shn', 'zh-classical', 'sa', 'wa', 'ie', 'lij', 'as', 'zu', 'mhr', 'mrj', 'hyw', 'hif', 'bjn', 'mni', 'sn', 'hak', 'km', 'roa-tara', 'so', 'pam', 'rue', 'nso', 'bh', 'tum', 'se', 'sat', 'mi', - 'myv', 'vls', 'nds-nl', 'nah', 'sc', 'vep', 'kw', 'kab', 'tk', 'gan', + 'myv', 'vls', 'nds-nl', 'nah', 'sc', 'kw', 'vep', 'kab', 'tk', 'gan', 'co', 'glk', 'dag', 'fiu-vro', 'ary', 'bo', 'ab', 'gv', 'frp', 'zea', 'skr', 'ug', 'kv', 'pcd', 'udm', 'csb', 'mt', 'gn', 'ay', 'smn', 'nrm', 'lez', 'lfn', 'stq', 'olo', 'lo', 'rw', 'mwl', 'ang', 'fur', 'rm', 'lad', 'gom', 'koi', 'ext', 'tyv', 'dsb', 'av', 'dty', 'ln', 'cbk-zam', 'pap', 'kaa', 'dv', 'ksh', 'gag', 'bxr', 'pfl', 'ks', 'pag', 'pi', - 'szy', 'haw', 'mdf', 'tw', 'awa', 'tay', 'za', 'blk', 'inh', 'krc', + 'tw', 'mdf', 'szy', 'haw', 'awa', 'tay', 'za', 'blk', 'inh', 'krc', 'xal', 'pdc', 'atj', 'to', 'arc', 'tcy', 'lg', 'mnw', 'kbp', 'jam', 'na', 'wo', 'kbd', 'nia', 'nov', 'ki', 'bi', 'nqo', 'tpi', 'tet', 'shi', 'jbo', 'roa-rup', 'fj', 'lbe', 'kg', 'xh', 'ty', 'cu', 'om', - 'guw', 'trv', 'srn', 'sm', 'gcr', 'alt', 'chr', 'ltg', 'tn', 'ny', - 'st', 'pih', 'mad', 'got', 'ami', 'rmy', 'bm', 've', 'ts', 'ff', 'chy', - 'ss', 'rn', 'kcg', 'ak', 'iu', 'ch', 'ee', 'pnt', 'ik', 'ady', 'pcm', + 'guw', 'trv', 'srn', 'sm', 'gcr', 'alt', 'chr', 'tn', 'ltg', 'ny', + 'st', 'mad', 'pih', 'got', 'ami', 'rmy', 'bm', 've', 'ts', 'ff', 'chy', + 'ss', 'rn', 'kcg', 'ak', 'iu', 'ee', 'ch', 'pnt', 'ik', 'ady', 'pcm', 'sg', 'pwn', 'din', 'ti', 'kl', 'dz', 'cr', ] diff --git a/pywikibot/families/wikiquote_family.py b/pywikibot/families/wikiquote_family.py index 249561a..8f93dcc 100644 --- a/pywikibot/families/wikiquote_family.py +++ b/pywikibot/families/wikiquote_family.py @@ -30,7 +30,7 @@ 'it', 'en', 'pl', 'ru', 'cs', 'et', 'pt', 'fa', 'uk', 'de', 'he', 'fr', 'es', 'eo', 'tr', 'sk', 'bs', 'az', 'ca', 'fi', 'sr', 'sl', 'zh', 'lt', 'ar', 'bg', 'hy', 'hr', 'su', 'el', 'nn', 'id', 'sv', 'li', 'hu', 'ko', - 'nl', 'sah', 'ja', 'la', 'ta', 'gl', 'gu', 'ur', 'hi', 'ig', 'be', + 'nl', 'sah', 'ja', 'la', 'ta', 'gl', 'gu', 'hi', 'ur', 'ig', 'be', 'te', 'guw', 'tl', 'vi', 'cy', 'no', 'sq', 'ml', 'bn', 'kn', 'ro', 'eu', 'ku', 'as', 'uz', 'ka', 'da', 'sa', 'is', 'bcl', 'br', 'mr', 'af', 'th', 'wo', 'ky', diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index b8ab714..45ba4d9 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -37,16 +37,16 @@ 'pt', 'kn', 'vi', 'sr', 'th', 'hi', 'ro', 'no', 'id', 'et', 'cs', 'ml', 'my', 'skr', 'uz', 'li', 'or', 'eo', 'te', 'fa', 'gl', 'ar', 'oc', 'jv', 'az', 'eu', 'uk', 'ast', 'br', 'is', 'sg', 'bn', 'da', 'lo', - 'simple', 'mnw', 'la', 'hr', 'fj', 'shn', 'sk', 'tg', 'ky', 'bg', 'wa', - 'ur', 'ps', 'cy', 'vo', 'he', 'om', 'lmo', 'sl', 'af', 'zh-min-nan', + 'simple', 'mnw', 'la', 'hr', 'shn', 'fj', 'sk', 'tg', 'ky', 'bg', 'wa', + 'ur', 'ps', 'cy', 'vo', 'he', 'lmo', 'om', 'sl', 'af', 'zh-min-nan', 'scn', 'tl', 'pa', 'ms', 'fy', 'sw', 'nn', 'ka', 'lv', 'min', 'sq', 'nds', 'lb', 'co', 'mn', 'pnb', 'bs', 'nah', 'yue', 'sa', 'kk', 'km', 'vec', 'be', 'diq', 'tk', 'mk', 'nia', 'sm', 'hsb', 'ks', 'shy', 'su', - 'gd', 'ga', 'bcl', 'an', 'gom', 'mr', 'wo', 'mni', 'ia', 'ang', 'bjn', - 'mt', 'fo', 'sd', 'tt', 'gn', 'so', 'ie', 'mi', 'csb', 'ug', 'si', - 'ha', 'st', 'roa-rup', 'hif', 'guw', 'tpi', 'jbo', 'kl', 'zu', 'ay', - 'yi', 'ln', 'gu', 'na', 'gv', 'kw', 'am', 'ne', 'rw', 'ts', 'ig', 'qu', - 'ss', 'iu', 'chr', 'gor', 'dv', 'ti', 'tn', + 'gd', 'ga', 'bcl', 'an', 'gom', 'mr', 'gor', 'wo', 'mni', 'ia', 'ang', + 'bjn', 'mt', 'fo', 'sd', 'tt', 'gn', 'so', 'ie', 'mi', 'csb', 'ug', + 'si', 'ha', 'st', 'roa-rup', 'hif', 'guw', 'tpi', 'jbo', 'kl', 'zu', + 'ay', 'yi', 'ln', 'gu', 'na', 'gv', 'kw', 'am', 'ne', 'rw', 'ts', 'ig', + 'qu', 'ss', 'iu', 'chr', 'dv', 'ti', 'tn', ] category_redirect_templates = { -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/881999 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: Ie809c74ba8954a432b60ff1b561d9e220a0e6ee6 Gerrit-Change-Number: 881999 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 2 months

[Gerrit] ...core[master]: Access match object by name

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/881415 ) Change subject: Access match object by name ...................................................................... Access match object by name Bug: T308261 Change-Id: I604964e4fa0d3885cd511308658cdc255f2a3582 --- M pywikibot/time.py 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/time.py b/pywikibot/time.py index 656b5f4..da10ecb 100644 --- a/pywikibot/time.py +++ b/pywikibot/time.py @@ -143,7 +143,7 @@ raise ValueError( f'time data {timestr!r} does not match ISO8601 format.') - strpfmt = '%Y-%m-%d{sep}%H:%M:%S'.format(sep=m.group('sep')) + strpfmt = f'%Y-%m-%d{m["sep"]}%H:%M:%S' strpstr = timestr[:19] if m['u']: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/881415 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: I604964e4fa0d3885cd511308658cdc255f2a3582 Gerrit-Change-Number: 881415 Gerrit-PatchSet: 2 Gerrit-Owner: Ayush Anand33 <ayushanand_mc21a11_34(a)dtu.ac.in> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 3 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/+/881583 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: Ib63fb1ef0b253a79f0305e35460661a4886b3af1 --- M category/de.json 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/category/de.json b/category/de.json index 86906d3..5763868 100644 --- a/category/de.json +++ b/category/de.json @@ -12,7 +12,7 @@ }, "category-adding": "Bot: Ergänze Kategorie [[:Category:%(newcat)s|%(newcat)s]]", "category-also-in": "(auch in %(alsocat)s)", - "category-clean": "Bot: Entfernen der Kategorie %(category)s, die bereits in %(child)s enthalten ist", + "category-clean": "Bot: Entferne Kategorie %(category)s, weil sie bereits unter %(child)s ist", "category-listifying": "Bot: Liste aus %(fromcat)s ({{PLURAL:num|1 Eintrag|%(num)d Einträge}})", "category-removing": "Bot: Entferne aus %(oldcat)s", "category-renamed": "Bot: Verschoben von %(oldcat)s. Autoren: %(authors)s", -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/881583 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: Ib63fb1ef0b253a79f0305e35460661a4886b3af1 Gerrit-Change-Number: 881583 Gerrit-PatchSet: 1 Gerrit-Owner: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 3 months

[Gerrit] ...core[master]: [bugfix] Fix setup.read_desc() regex

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/880881 ) Change subject: [bugfix] Fix setup.read_desc() regex ...................................................................... [bugfix] Fix setup.read_desc() regex If a space was behind a sphinx link and the link was different from the label, the link was removed but the alignment does not match the previous line. Modify the regex pattern to remove a following space in such case. Also test the long_description created by setup.py in make_dist.py script Bug: T327056 Change-Id: Ie71c4f9feb38e4ba822330b6978d19f506304c95 --- M setup.py M make_dist.py 2 files changed, 25 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/make_dist.py b/make_dist.py index 4c75e43..d58c8f5 100755 --- a/make_dist.py +++ b/make_dist.py @@ -45,7 +45,7 @@ import shutil import sys from pathlib import Path -from subprocess import check_call +from subprocess import check_call, run import setup from pywikibot import __version__, error, info, input_yn, warning @@ -109,6 +109,10 @@ finally: self.cleanup() + # check description + if run('twine check dist/*', shell=True).returncode: + return + if self.local: check_call('pip uninstall pywikibot -y', shell=True) check_call( diff --git a/setup.py b/setup.py index 961cec2..081dbab 100755 --- a/setup.py +++ b/setup.py @@ -184,7 +184,7 @@ Combine included restructured text files which must be done before uploading because the source isn't available after creating the package. """ - pattern = r'\:\w+\:`([^`]+?)(?:<.+>)?`', r'\1' + pattern = r'(?:\:\w+\:`([^`]+?)(?:<.+>)?` *)', r'\1' desc = [] with open(filename) as f: for line in f: @@ -219,7 +219,7 @@ version=version, description=metadata.__description__, long_description=read_desc('README.rst'), - # long_description_content_type + long_description_content_type='text/x-rst', # author # author_email maintainer=metadata.__maintainer__, -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/880881 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: Ie71c4f9feb38e4ba822330b6978d19f506304c95 Gerrit-Change-Number: 880881 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-CC: KBach <kbach(a)wikimedia.org> Gerrit-MessageType: merged

1 year, 3 months

[Gerrit] ...core[master]: [Feature] Allow copying timezone from Timestamp

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/878200 ) Change subject: [Feature] Allow copying timezone from Timestamp ...................................................................... [Feature] Allow copying timezone from Timestamp Bug: T325864 Change-Id: Ib6aa3c8d96baa21f21bd21030ced0719c2eaa5e2 --- M pywikibot/__init__.py M tests/wikibase_tests.py 2 files changed, 25 insertions(+), 1 deletion(-) Approvals: Matěj Suchánek: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 8aea5a8..22c7b38 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -574,7 +574,8 @@ precision: Union[int, str] = 14, before: int = 0, after: int = 0, timezone: int = 0, calendarmodel: Optional[str] = None, - site: Optional[DataSite] = None) -> 'WbTime': + site: Optional[DataSite] = None, + copy_timezone: bool = False) -> 'WbTime': """ Create a new WbTime object from a pywikibot.Timestamp. @@ -590,7 +591,13 @@ :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. + :param copy_timezone: Whether to copy the timezone from the Timestamp + if it has timezone information. Defaults to False to maintain + backwards compatibility. If a timezone is given, timezone + information is discarded. """ + if not timezone and timestamp.tzinfo and copy_timezone: + timezone = int(timestamp.utcoffset().total_seconds() / 60) return cls.fromTimestr(timestamp.isoformat(), precision=precision, before=before, after=after, timezone=timezone, calendarmodel=calendarmodel, diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index 3bb61e5..6173dd3 100755 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -490,6 +490,13 @@ self.assertEqual(t.toTimestamp(), timestamp) self.assertEqual( t, pywikibot.WbTime.fromTimestamp(timestamp, site=repo)) + timezone = datetime.timezone(datetime.timedelta(hours=-5)) + ts = pywikibot.Timestamp(2020, 1, 1, 12, 43, 0, tzinfo=timezone) + t = pywikibot.WbTime.fromTimestamp(ts, site=repo, copy_timezone=True) + self.assertEqual(t.timezone, -5 * 60) + t = pywikibot.WbTime.fromTimestamp(ts, site=repo, copy_timezone=True, + timezone=60) + self.assertEqual(t.timezone, 60) def test_WbTime_errors(self): """Test WbTime precision errors.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/878200 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: Ib6aa3c8d96baa21f21bd21030ced0719c2eaa5e2 Gerrit-Change-Number: 878200 Gerrit-PatchSet: 2 Gerrit-Owner: RPI2026F1 <sarkaraoyan+rpi2026f1(a)gmail.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 3 months

[Gerrit] ...core[master]: [flake8] Ignore flake8-bugbear 23.1.14

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/881261 ) Change subject: [flake8] Ignore flake8-bugbear 23.1.14 ...................................................................... [flake8] Ignore flake8-bugbear 23.1.14 The bugbear B028 introduced with 23.1.14 was removed in 23.1.17. The https://github.com/PyCQA/flake8-bugbear/issues/329 issue was solved upstream Change-Id: I308b766fe62ca9007c802b0728a07b1acbd6c01e --- M setup.py M tox.ini 2 files changed, 15 insertions(+), 3 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/setup.py b/setup.py index 961cec2..66fac58 100755 --- a/setup.py +++ b/setup.py @@ -57,7 +57,7 @@ 'flake8>=5.0.4', 'darglint', 'pydocstyle>=6.2.3', - 'flake8-bugbear', + 'flake8-bugbear!=23.1.14', 'flake8-coding', 'flake8-comprehensions', 'flake8-docstrings>=1.4.0', diff --git a/tox.ini b/tox.ini index a55b81b..a5f454b 100644 --- a/tox.ini +++ b/tox.ini @@ -109,7 +109,6 @@ [flake8] # The following are intentionally ignored, possibly pending consensus -# B028: False positive, see https://github.com/PyCQA/flake8-bugbear/issues/329 # D105: Missing docstring in magic method # D211: No blank lines allowed before class docstring # FI1: __future__ import "x" missing @@ -132,7 +131,7 @@ # DARXXX: Darglint docstring issues to be solved -ignore = B007,B028,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,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 enable-extensions = H203,H204,H205,N818 color = always -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/881261 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: I308b766fe62ca9007c802b0728a07b1acbd6c01e Gerrit-Change-Number: 881261 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 3 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/+/880446 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I354e3435dc33f5f62c422395994fa69446c8c674 --- M solve_disambiguation/sl.json M category/nl.json M category/ia.json 3 files changed, 17 insertions(+), 7 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/category/ia.json b/category/ia.json index 29105db..ee7b362 100644 --- a/category/ia.json +++ b/category/ia.json @@ -6,7 +6,7 @@ }, "category-adding": "Robot: Addition del categoria [[:Category:%(newcat)s|%(newcat)s]]", "category-also-in": "(equalmente in %(alsocat)s)", - "category-clean": "Robot: Remove le categoria %(category)s que es ja in %(child)s", + "category-clean": "Robot: Remove le categoria %(category)s perque illo es ja sub %(child)s", "category-listifying": "Robot: Face lista de articulos in %(fromcat)s ({{PLURAL:%(num)d|1 entrata|%(num)d entratas}})", "category-removing": "Robot: Removite de %(oldcat)s", "category-renamed": "Robot: Transferite de %(oldcat)s. Autores: %(authors)s", diff --git a/category/nl.json b/category/nl.json index 06b86fa..17736c8 100644 --- a/category/nl.json +++ b/category/nl.json @@ -9,6 +9,7 @@ }, "category-adding": "Robot: categorie [[:Category:%(newcat)s|%(newcat)s]] toegevoegd", "category-also-in": "(ook in %(alsocat)s)", + "category-clean": "Robot: Verwijdering van categorie %(category)s omdat deze al onder %(child)s staat", "category-listifying": "Robot: lijst van %(fromcat)s (%(num)d pagina's)", "category-removing": "Robot: verwijderd uit %(oldcat)s", "category-renamed": "Robot: hernoemd van %(oldcat)s. Auteurs: %(authors)s", diff --git a/solve_disambiguation/sl.json b/solve_disambiguation/sl.json index 3fd5bc1..797c229 100644 --- a/solve_disambiguation/sl.json +++ b/solve_disambiguation/sl.json @@ -5,11 +5,11 @@ "Eleassar" ] }, - "solve_disambiguation-adding-dn-template": "Razločitev s pomočjo robota: %(from)s – Označeno kot potrebno pozornosti strokovnjaka", - "solve_disambiguation-links-removed": "Razločitev s pomočjo robota: %(from)s – odstranitev povezav", - "solve_disambiguation-links-resolved": "Razločitev s pomočjo robota: %(from)s – Sprememba povezav v %(to)s", - "solve_disambiguation-redirect-adding-dn-template": "Razločitev s pomočjo robota: %(from)s – Označeno kot potrebno pozornosti strokovnjaka", - "solve_disambiguation-redirect-removed": "Razločitev s pomočjo robota: %(from)s – odstranitev povezav", - "solve_disambiguation-redirect-resolved": "Razločitev s pomočjo robota: %(from)s – Sprememba povezav v %(to)s", + "solve_disambiguation-adding-dn-template": "Razločitev s pomočjo bota: %(from)s – označeno kot potrebno pozornosti strokovnjaka", + "solve_disambiguation-links-removed": "Razločitev s pomočjo bota: %(from)s – odstranitev povezav(e).", + "solve_disambiguation-links-resolved": "Razločitev s pomočjo bota: %(from)s – sprememba povezav(e) v %(to)s", + "solve_disambiguation-redirect-adding-dn-template": "Razločitev s pomočjo bota: %(from)s – označeno kot potrebno pozornosti strokovnjaka", + "solve_disambiguation-redirect-removed": "Razločitev s pomočjo bota: %(from)s – odstranitev povezav(e)", + "solve_disambiguation-redirect-resolved": "Razločitev s pomočjo bota: %(from)s – sprememba povezav(e) v %(to)s", "solve_disambiguation-unknown-page": "(neznano)" } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/880446 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: I354e3435dc33f5f62c422395994fa69446c8c674 Gerrit-Change-Number: 880446 Gerrit-PatchSet: 1 Gerrit-Owner: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 3 months

[Gerrit] ...core[master]: [doc] Update copyright year

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/880434 ) Change subject: [doc] Update copyright year ...................................................................... [doc] Update copyright year Change-Id: I01281c7efeb7b7fadb02f8b1100482da4a6d3233 --- M pywikibot/data/memento.py M tests/generate_user_files_tests.py M tests/harvest_template_tests.py M tests/aspects.py M tests/tools_tests.py M pywikibot/scripts/wrapper.py M scripts/clean_sandbox.py M tests/gui_tests.py M tests/tests_tests.py M pywikibot/tools/itertools.py M pywikibot/site_detect.py M tests/make_dist_tests.py M pywikibot/flow.py M pywikibot/page/__init__.py M tests/wikiblame_tests.py M pywikibot/site/_tokenwallet.py M pywikibot/data/api/__init__.py M pywikibot/page/_toolforge.py M pywikibot/__metadata__.py M scripts/replicate_wiki.py M tests/site_generators_tests.py M scripts/create_isbn_edition.py M pywikibot/comms/http.py M scripts/archivebot.py M tests/interwikimap_tests.py M make_dist.py M pywikibot/xmlreader.py M tests/cache_tests.py M tests/dry_api_tests.py M tests/flow_thanks_tests.py M pywikibot/site/_apisite.py M pywikibot/site/_basesite.py M scripts/delinker.py M tests/checkimages_tests.py M pywikibot/userinterfaces/gui.py M tests/api_tests.py 36 files changed, 45 insertions(+), 36 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/make_dist.py b/make_dist.py index 01308c2..4c75e43 100755 --- a/make_dist.py +++ b/make_dist.py @@ -37,7 +37,7 @@ - `nodist` option was added """ # -# (C) Pywikibot team, 2022 +# (C) Pywikibot team, 2022-2023 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py index fb25171..152253c 100644 --- a/pywikibot/__metadata__.py +++ b/pywikibot/__metadata__.py @@ -3,7 +3,7 @@ .. versionadded:: 4.0 """ # -# (C) Pywikibot team, 2020-2022 +# (C) Pywikibot team, 2020-2023 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index 9531757..7828acf 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -26,7 +26,7 @@ Cookies are lazy loaded when logging to site. """ # -# (C) Pywikibot team, 2007-2022 +# (C) Pywikibot team, 2007-2023 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/data/api/__init__.py b/pywikibot/data/api/__init__.py index 81f5c26..75e0351 100644 --- a/pywikibot/data/api/__init__.py +++ b/pywikibot/data/api/__init__.py @@ -1,6 +1,6 @@ """Interface to Mediawiki's api.php.""" # -# (C) Pywikibot team, 2014-2022 +# (C) Pywikibot team, 2014-2023 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/data/memento.py b/pywikibot/data/memento.py index 14244a0..af2c085 100644 --- a/pywikibot/data/memento.py +++ b/pywikibot/data/memento.py @@ -9,7 +9,7 @@ # Parts of MementoClient class codes are # licensed under the BSD open source software license. # -# (C) Pywikibot team, 2015-2022 +# (C) Pywikibot team, 2015-2023 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/flow.py b/pywikibot/flow.py index 1af55ad..76b090f 100644 --- a/pywikibot/flow.py +++ b/pywikibot/flow.py @@ -1,6 +1,6 @@ """Objects representing Flow entities, like boards, topics, and posts.""" # -# (C) Pywikibot team, 2015-2022 +# (C) Pywikibot team, 2015-2023 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index bd9c70f..96b37aa 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -1,6 +1,6 @@ """Interface of various types of MediaWiki pages.""" # -# (C) Pywikibot team, 2022 +# (C) Pywikibot team, 2022-2023 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/page/_toolforge.py b/pywikibot/page/_toolforge.py index 503e670..85654cc 100644 --- a/pywikibot/page/_toolforge.py +++ b/pywikibot/page/_toolforge.py @@ -3,7 +3,7 @@ .. versionadded:: 7.7 """ # -# (C) Pywikibot team, 2022 +# (C) Pywikibot team, 2022-2023 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/scripts/wrapper.py b/pywikibot/scripts/wrapper.py index 93ad965..abb5d5c 100755 --- a/pywikibot/scripts/wrapper.py +++ b/pywikibot/scripts/wrapper.py @@ -38,7 +38,7 @@ renamed to wrapper.py """ # -# (C) Pywikibot team, 2012-2022 +# (C) Pywikibot team, 2012-2023 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index 59a1522..01ee1ac 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -1,6 +1,6 @@ """Objects representing API interface to MediaWiki site.""" # -# (C) Pywikibot team, 2008-2022 +# (C) Pywikibot team, 2008-2023 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/site/_basesite.py b/pywikibot/site/_basesite.py index 4b6e296..92b79d7 100644 --- a/pywikibot/site/_basesite.py +++ b/pywikibot/site/_basesite.py @@ -1,6 +1,6 @@ """Objects with site methods independent of the communication interface.""" # -# (C) Pywikibot team, 2008-2022 +# (C) Pywikibot team, 2008-2023 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/site/_tokenwallet.py b/pywikibot/site/_tokenwallet.py index 1e1de18..5ffd72f 100644 --- a/pywikibot/site/_tokenwallet.py +++ b/pywikibot/site/_tokenwallet.py @@ -1,6 +1,6 @@ """Objects representing api tokens.""" # -# (C) Pywikibot team, 2008-2022 +# (C) Pywikibot team, 2008-2023 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/site_detect.py b/pywikibot/site_detect.py index bb44038..8a266d2 100644 --- a/pywikibot/site_detect.py +++ b/pywikibot/site_detect.py @@ -1,6 +1,6 @@ """Classes for detecting a MediaWiki site.""" # -# (C) Pywikibot team, 2010-2022 +# (C) Pywikibot team, 2010-2023 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/tools/itertools.py b/pywikibot/tools/itertools.py index 36f916d..56e09ad 100644 --- a/pywikibot/tools/itertools.py +++ b/pywikibot/tools/itertools.py @@ -4,7 +4,7 @@ in :mod:`backports` """ # -# (C) Pywikibot team, 2008-2022 +# (C) Pywikibot team, 2008-2023 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/userinterfaces/gui.py b/pywikibot/userinterfaces/gui.py index 5640915..4aab52a 100644 --- a/pywikibot/userinterfaces/gui.py +++ b/pywikibot/userinterfaces/gui.py @@ -5,7 +5,7 @@ .. note:: tkinter module is required """ # -# (C) Pywikibot team, 2003-2022 +# (C) Pywikibot team, 2003-2023 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/xmlreader.py b/pywikibot/xmlreader.py index 4195a79..1b4c92d 100644 --- a/pywikibot/xmlreader.py +++ b/pywikibot/xmlreader.py @@ -11,7 +11,7 @@ vulnerable XML attacks. *defusedxml* 0.7.1 or higher is recommended. """ # -# (C) Pywikibot team, 2005-2022 +# (C) Pywikibot team, 2005-2023 # # Distributed under the terms of the MIT license. # diff --git a/scripts/archivebot.py b/scripts/archivebot.py index e57e547..be3ab17 100755 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -116,7 +116,7 @@ `-sort` and `-async` options were added. """ # -# (C) Pywikibot team, 2006-2022 +# (C) Pywikibot team, 2006-2023 # # Distributed under the terms of the MIT license. # diff --git a/scripts/clean_sandbox.py b/scripts/clean_sandbox.py index 1cb6f34..bd92d9d 100755 --- a/scripts/clean_sandbox.py +++ b/scripts/clean_sandbox.py @@ -43,7 +43,7 @@ delay: 7 """ # -# (C) Pywikibot team, 2006-2022 +# (C) Pywikibot team, 2006-2023 # # Distributed under the terms of the MIT license. # diff --git a/scripts/create_isbn_edition.py b/scripts/create_isbn_edition.py index 9849520..29ef0b1 100755 --- a/scripts/create_isbn_edition.py +++ b/scripts/create_isbn_edition.py @@ -251,7 +251,7 @@ .. versionadded:: 7.7 """ # noqa: E501, W605 # -# (C) Pywikibot team, 2022 +# (C) Pywikibot team, 2022-2023 # # Distributed under the terms of the MIT license. # diff --git a/scripts/delinker.py b/scripts/delinker.py index e9a5fb4..cd26a57 100755 --- a/scripts/delinker.py +++ b/scripts/delinker.py @@ -30,7 +30,7 @@ This script is completely rewriten from compat branch. """ # -# (C) Pywikibot team, 2006-2022 +# (C) Pywikibot team, 2006-2023 # # Distributed under the terms of the MIT license. # diff --git a/scripts/replicate_wiki.py b/scripts/replicate_wiki.py index f128eee..7655fed 100755 --- a/scripts/replicate_wiki.py +++ b/scripts/replicate_wiki.py @@ -38,7 +38,7 @@ destination_wiki destination wiki(s) """ # -# (C) Pywikibot team, 2012-2022 +# (C) Pywikibot team, 2012-2023 # # Distributed under the terms of the MIT license. # diff --git a/tests/api_tests.py b/tests/api_tests.py index a4a2343..af90c82 100755 --- a/tests/api_tests.py +++ b/tests/api_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 """API test module.""" # -# (C) Pywikibot team, 2007-2022 +# (C) Pywikibot team, 2007-2023 # # Distributed under the terms of the MIT license. # diff --git a/tests/aspects.py b/tests/aspects.py index a85fea0..5ab221c 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -5,7 +5,7 @@ such as API result caching and excessive test durations. """ # -# (C) Pywikibot team, 2014-2022 +# (C) Pywikibot team, 2014-2023 # # Distributed under the terms of the MIT license. # diff --git a/tests/cache_tests.py b/tests/cache_tests.py index b538fe2..0e650db 100755 --- a/tests/cache_tests.py +++ b/tests/cache_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 """API Request cache tests.""" # -# (C) Pywikibot team, 2012-2022 +# (C) Pywikibot team, 2012-2023 # # Distributed under the terms of the MIT license. # diff --git a/tests/checkimages_tests.py b/tests/checkimages_tests.py index d4a4cfd..1bfb9ed 100755 --- a/tests/checkimages_tests.py +++ b/tests/checkimages_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 """Unit tests for checkimages script.""" # -# (C) Pywikibot team, 2015-2022 +# (C) Pywikibot team, 2015-2023 # # Distributed under the terms of the MIT license. # diff --git a/tests/dry_api_tests.py b/tests/dry_api_tests.py index 889770d..d1d6797 100755 --- a/tests/dry_api_tests.py +++ b/tests/dry_api_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 """API tests which do not interact with a site.""" # -# (C) Pywikibot team, 2012-2022 +# (C) Pywikibot team, 2012-2023 # # Distributed under the terms of the MIT license. # diff --git a/tests/flow_thanks_tests.py b/tests/flow_thanks_tests.py index 64d2077..47fd61c 100755 --- a/tests/flow_thanks_tests.py +++ b/tests/flow_thanks_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 """Tests for thanks-related code.""" # -# (C) Pywikibot team, 2016-2022 +# (C) Pywikibot team, 2016-2023 # # Distributed under the terms of the MIT license. # diff --git a/tests/generate_user_files_tests.py b/tests/generate_user_files_tests.py index 10a78d4..763ee86 100755 --- a/tests/generate_user_files_tests.py +++ b/tests/generate_user_files_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 """Test generate_user_files script.""" # -# (C) Pywikibot team, 2018-2022 +# (C) Pywikibot team, 2018-2023 # # Distributed under the terms of the MIT license. # diff --git a/tests/gui_tests.py b/tests/gui_tests.py index 0e4188e..f68dd9a 100755 --- a/tests/gui_tests.py +++ b/tests/gui_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 """Tests for the Tk UI.""" # -# (C) Pywikibot team, 2008-2022 +# (C) Pywikibot team, 2008-2023 # # Distributed under the terms of the MIT license. # diff --git a/tests/harvest_template_tests.py b/tests/harvest_template_tests.py index 72941f6..e1ef8ca 100755 --- a/tests/harvest_template_tests.py +++ b/tests/harvest_template_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 """Tests for scripts/harvest_template.py.""" # -# (C) Pywikibot team, 2022 +# (C) Pywikibot team, 2022-2023 # # Distributed under the terms of the MIT license. # diff --git a/tests/interwikimap_tests.py b/tests/interwikimap_tests.py index 1b7f0b8..01212cb 100755 --- a/tests/interwikimap_tests.py +++ b/tests/interwikimap_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 """Tests for the site module.""" # -# (C) Pywikibot team, 2018-2022 +# (C) Pywikibot team, 2018-2023 # # Distributed under the terms of the MIT license. # diff --git a/tests/make_dist_tests.py b/tests/make_dist_tests.py index fc70a34..6d7cfbf 100755 --- a/tests/make_dist_tests.py +++ b/tests/make_dist_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 """Tests for fixes module.""" # -# (C) Pywikibot team, 2022 +# (C) Pywikibot team, 2022-2023 # # Distributed under the terms of the MIT license. # diff --git a/tests/site_generators_tests.py b/tests/site_generators_tests.py index dc251f9..e538ab7 100755 --- a/tests/site_generators_tests.py +++ b/tests/site_generators_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 """Tests for generators of the site module.""" # -# (C) Pywikibot team, 2008-2022 +# (C) Pywikibot team, 2008-2023 # # Distributed under the terms of the MIT license. # diff --git a/tests/tests_tests.py b/tests/tests_tests.py index 3f3f9c5..caaaaad 100755 --- a/tests/tests_tests.py +++ b/tests/tests_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 """Tests for the tests package.""" # -# (C) Pywikibot team, 2014-2022 +# (C) Pywikibot team, 2014-2023 # # Distributed under the terms of the MIT license. import unittest diff --git a/tests/tools_tests.py b/tests/tools_tests.py index bc898c8..825833c 100755 --- a/tests/tools_tests.py +++ b/tests/tools_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 """Test tools package alone which don't fit into other tests.""" # -# (C) Pywikibot team, 2015-2022 +# (C) Pywikibot team, 2015-2023 # # Distributed under the terms of the MIT license. import decimal diff --git a/tests/wikiblame_tests.py b/tests/wikiblame_tests.py index 647af79..c6b0054 100644 --- a/tests/wikiblame_tests.py +++ b/tests/wikiblame_tests.py @@ -1,6 +1,6 @@ """Tests for the WikiHistoryMixin.""" # -# (C) Pywikibot team, 2022 +# (C) Pywikibot team, 2022-2023 # # Distributed under the terms of the MIT license. # -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/880434 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: I01281c7efeb7b7fadb02f8b1100482da4a6d3233 Gerrit-Change-Number: 880434 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 3 months

[Gerrit] ...core[master]: sort imports with isort

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/879965 ) Change subject: sort imports with isort ...................................................................... sort imports with isort Change-Id: I1fe160b12296bba6faa6e2968e340b4996feb09e --- M pywikibot/data/memento.py M tests/generate_user_files_tests.py M scripts/commons_information.py M tests/harvest_template_tests.py M tests/aspects.py M tests/tools_tests.py M pywikibot/scripts/wrapper.py M tests/gui_tests.py M tests/tests_tests.py M pywikibot/tools/itertools.py M pywikibot/site_detect.py M tests/make_dist_tests.py M pywikibot/flow.py M pywikibot/page/__init__.py M tests/wikiblame_tests.py M pywikibot/textlib.py M pywikibot/site/_tokenwallet.py M pywikibot/data/api/__init__.py M tests/time_tests.py M pywikibot/page/_toolforge.py M pywikibot/comms/http.py M tests/interwikimap_tests.py M make_dist.py M pywikibot/xmlreader.py M tests/cache_tests.py M tests/dry_api_tests.py M tests/flow_thanks_tests.py M pywikibot/site/_apisite.py M pywikibot/site/_basesite.py M tests/checkimages_tests.py M pywikibot/userinterfaces/gui.py M tests/api_tests.py 32 files changed, 47 insertions(+), 57 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/make_dist.py b/make_dist.py index 84685e5..01308c2 100755 --- a/make_dist.py +++ b/make_dist.py @@ -44,12 +44,12 @@ import abc import shutil import sys -from subprocess import check_call from pathlib import Path +from subprocess import check_call +import setup from pywikibot import __version__, error, info, input_yn, warning from pywikibot.backports import Tuple -import setup class SetupBase(abc.ABC): diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index 56518b3..9531757 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -48,9 +48,9 @@ from pywikibot.backports import Tuple from pywikibot.exceptions import ( FatalServerError, - ServerError, Server414Error, Server504Error, + ServerError, ) from pywikibot.logging import critical, debug, error, log, warning from pywikibot.tools import file_mode_checker diff --git a/pywikibot/data/api/__init__.py b/pywikibot/data/api/__init__.py index c7e6db9..81f5c26 100644 --- a/pywikibot/data/api/__init__.py +++ b/pywikibot/data/api/__init__.py @@ -10,8 +10,8 @@ from pywikibot.comms import http from pywikibot.data.api._generators import ( - APIGeneratorBase, APIGenerator, + APIGeneratorBase, ListGenerator, LogEntryListGenerator, PageGenerator, @@ -19,12 +19,13 @@ QueryGenerator, update_page, ) -from pywikibot.data.api._paraminfo import ParamInfo from pywikibot.data.api._optionset import OptionSet +from pywikibot.data.api._paraminfo import ParamInfo from pywikibot.data.api._requests import CachedRequest, Request, encode_url from pywikibot.family import SubdomainFamily from pywikibot.tools import ModuleDeprecationWrapper + __all__ = ( 'APIGeneratorBase', 'APIGenerator', diff --git a/pywikibot/data/memento.py b/pywikibot/data/memento.py index cf7ed11..14244a0 100644 --- a/pywikibot/data/memento.py +++ b/pywikibot/data/memento.py @@ -16,14 +16,14 @@ from datetime import datetime from typing import Optional +import requests from memento_client.memento_client import MementoClient as OldMementoClient from memento_client.memento_client import MementoClientException - -import requests from requests.exceptions import InvalidSchema, MissingSchema from pywikibot import config, debug, sleep, warning + __all__ = ( 'MementoClient', 'MementoClientException', diff --git a/pywikibot/flow.py b/pywikibot/flow.py index ff95165..1af55ad 100644 --- a/pywikibot/flow.py +++ b/pywikibot/flow.py @@ -6,12 +6,12 @@ # import abc import datetime -from typing import Any, Type, Optional, Union +from typing import Any, Optional, Type, Union from urllib.parse import parse_qs, urlparse import pywikibot -from pywikibot.backports import Dict, Iterator, List, Mapping from pywikibot import config +from pywikibot.backports import Dict, Iterator, List, Mapping from pywikibot.exceptions import ( LockedPageError, NoPageError, diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index f320c74..bd9c70f 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -15,14 +15,14 @@ from pywikibot.page._wikibase import ( Claim, ItemPage, + LexemeForm, + LexemePage, + LexemeSense, MediaInfo, Property, PropertyPage, WikibaseEntity, WikibasePage, - LexemePage, - LexemeForm, - LexemeSense, ) from pywikibot.site import BaseSite as _BaseSite from pywikibot.tools import deprecated, issue_deprecation_warning diff --git a/pywikibot/page/_toolforge.py b/pywikibot/page/_toolforge.py index 4dccfdb..503e670 100644 --- a/pywikibot/page/_toolforge.py +++ b/pywikibot/page/_toolforge.py @@ -9,11 +9,9 @@ # import collections import re - from typing import Optional import pywikibot - from pywikibot import config diff --git a/pywikibot/scripts/wrapper.py b/pywikibot/scripts/wrapper.py index 6e64d15..93ad965 100755 --- a/pywikibot/scripts/wrapper.py +++ b/pywikibot/scripts/wrapper.py @@ -322,7 +322,7 @@ def find_alternates(filename, script_paths): """Search for similar filenames in the given script paths.""" - from pywikibot import config, input_choice, error, info, warning + from pywikibot import config, error, info, input_choice, warning from pywikibot.bot import QuitKeyboardInterrupt, ShowingListOption assert config.pwb_close_matches > 0, \ diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index 3811df2..59a1522 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -14,17 +14,10 @@ from typing import Any, Iterable, Optional, Type, TypeVar, Union import pywikibot -from pywikibot.backports import ( - DefaultDict, - Dict, - List, - Match, - Pattern, - Set, - Tuple, - removesuffix, -) +from pywikibot import login +from pywikibot.backports import DefaultDict, Dict, List, Match from pywikibot.backports import OrderedDict as OrderedDictType +from pywikibot.backports import Pattern, Set, Tuple, removesuffix from pywikibot.comms import http from pywikibot.data import api from pywikibot.exceptions import ( @@ -53,7 +46,6 @@ TitleblacklistError, UnknownExtensionError, ) -from pywikibot import login from pywikibot.site._basesite import BaseSite from pywikibot.site._decorators import need_right, need_version from pywikibot.site._extensions import ( diff --git a/pywikibot/site/_basesite.py b/pywikibot/site/_basesite.py index 643628d..4b6e296 100644 --- a/pywikibot/site/_basesite.py +++ b/pywikibot/site/_basesite.py @@ -22,9 +22,9 @@ from pywikibot.site._namespace import Namespace, NamespacesDict from pywikibot.throttle import Throttle from pywikibot.tools import ( - cached, ComparableMixin, SelfCallString, + cached, first_upper, normalize_username, ) diff --git a/pywikibot/site/_tokenwallet.py b/pywikibot/site/_tokenwallet.py index 1ec829d..1e1de18 100644 --- a/pywikibot/site/_tokenwallet.py +++ b/pywikibot/site/_tokenwallet.py @@ -5,10 +5,11 @@ # Distributed under the terms of the MIT license. # from collections.abc import Container -from typing import Any, Optional, TYPE_CHECKING +from typing import TYPE_CHECKING, Any, Optional from pywikibot.backports import Dict, List -from pywikibot.tools import issue_deprecation_warning, deprecated +from pywikibot.tools import deprecated, issue_deprecation_warning + if TYPE_CHECKING: from pywikibot.site import APISite diff --git a/pywikibot/site_detect.py b/pywikibot/site_detect.py index 45f269d..bb44038 100644 --- a/pywikibot/site_detect.py +++ b/pywikibot/site_detect.py @@ -15,8 +15,8 @@ from requests.exceptions import RequestException import pywikibot -from pywikibot.comms.http import fetch from pywikibot.backports import removesuffix +from pywikibot.comms.http import fetch from pywikibot.exceptions import ServerError from pywikibot.tools import MediaWikiVersion diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index b3f4aa1..3079c22 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -32,6 +32,7 @@ ) from pywikibot.userinterfaces.transliteration import NON_LATIN_DIGITS + try: import wikitextparser except ImportError: diff --git a/pywikibot/tools/itertools.py b/pywikibot/tools/itertools.py index 50fb740..36f916d 100644 --- a/pywikibot/tools/itertools.py +++ b/pywikibot/tools/itertools.py @@ -10,7 +10,6 @@ # import collections import itertools - from contextlib import suppress from itertools import chain, zip_longest from typing import Any diff --git a/pywikibot/userinterfaces/gui.py b/pywikibot/userinterfaces/gui.py index 53c7272..5640915 100644 --- a/pywikibot/userinterfaces/gui.py +++ b/pywikibot/userinterfaces/gui.py @@ -9,18 +9,18 @@ # # Distributed under the terms of the MIT license. # -from typing import Optional - from idlelib import replace as ReplaceDialog # noqa: N812 from idlelib import search as SearchDialog # noqa: N812 from idlelib.config import idleConf from idlelib.configdialog import ConfigDialog from idlelib.multicall import MultiCallCreator +from typing import Optional import pywikibot from pywikibot.backports import Tuple from pywikibot.tools import PYTHON_VERSION + try: import tkinter except ImportError as e: diff --git a/pywikibot/xmlreader.py b/pywikibot/xmlreader.py index d619d9f..4195a79 100644 --- a/pywikibot/xmlreader.py +++ b/pywikibot/xmlreader.py @@ -18,8 +18,9 @@ import re from typing import Optional + try: - from defusedxml.ElementTree import iterparse, ParseError + from defusedxml.ElementTree import ParseError, iterparse except ImportError: from xml.etree.ElementTree import iterparse, ParseError diff --git a/scripts/commons_information.py b/scripts/commons_information.py index cd7f746..de812e3 100755 --- a/scripts/commons_information.py +++ b/scripts/commons_information.py @@ -13,6 +13,7 @@ from pywikibot import i18n, pagegenerators from pywikibot.bot import ExistingPageBot, SingleSiteBot + try: import langdetect except ImportError: diff --git a/tests/api_tests.py b/tests/api_tests.py index 5f13c04..a4a2343 100755 --- a/tests/api_tests.py +++ b/tests/api_tests.py @@ -18,12 +18,11 @@ from pywikibot.exceptions import APIError, NoUsernameError from pywikibot.throttle import Throttle from pywikibot.tools import suppress_warnings - from tests.aspects import ( - require_version, DefaultDrySiteTestCase, DefaultSiteTestCase, TestCase, + require_version, ) from tests.utils import FakeLoginManager diff --git a/tests/aspects.py b/tests/aspects.py index e8ba489..a85fea0 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -25,7 +25,7 @@ import pywikibot from pywikibot import Site, config -from pywikibot.backports import removeprefix, removesuffix, List +from pywikibot.backports import List, removeprefix, removesuffix from pywikibot.comms import http from pywikibot.data.api import Request as _original_Request from pywikibot.exceptions import ( @@ -35,8 +35,8 @@ ) from pywikibot.family import WikimediaFamily from pywikibot.site import BaseSite -from pywikibot.tools import suppress_warnings from pywikibot.tools import MediaWikiVersion # noqa: F401 (used by f-string) +from pywikibot.tools import suppress_warnings from tests import ( WARN_SITE_CODE, patch_request, diff --git a/tests/cache_tests.py b/tests/cache_tests.py index 7ddb229..b538fe2 100755 --- a/tests/cache_tests.py +++ b/tests/cache_tests.py @@ -7,11 +7,9 @@ # import unittest -from pywikibot.site import BaseSite -from pywikibot.login import LoginStatus - import scripts.maintenance.cache as cache - +from pywikibot.login import LoginStatus +from pywikibot.site import BaseSite from tests import join_cache_path from tests.aspects import TestCase diff --git a/tests/checkimages_tests.py b/tests/checkimages_tests.py index 2666052..d4a4cfd 100755 --- a/tests/checkimages_tests.py +++ b/tests/checkimages_tests.py @@ -8,7 +8,6 @@ import unittest from pywikibot import FilePage - from scripts import checkimages from tests.aspects import DefaultSiteTestCase, TestCase diff --git a/tests/dry_api_tests.py b/tests/dry_api_tests.py index a110d8a..889770d 100755 --- a/tests/dry_api_tests.py +++ b/tests/dry_api_tests.py @@ -19,7 +19,7 @@ from pywikibot.exceptions import Error from pywikibot.family import Family from pywikibot.login import LoginStatus -from pywikibot.tools import suppress_warnings, PYTHON_VERSION +from pywikibot.tools import PYTHON_VERSION, suppress_warnings from tests import join_images_path from tests.aspects import ( DefaultDrySiteTestCase, diff --git a/tests/flow_thanks_tests.py b/tests/flow_thanks_tests.py index acdd8cb..64d2077 100755 --- a/tests/flow_thanks_tests.py +++ b/tests/flow_thanks_tests.py @@ -9,7 +9,6 @@ from contextlib import suppress from pywikibot.flow import Topic - from tests.aspects import TestCase diff --git a/tests/generate_user_files_tests.py b/tests/generate_user_files_tests.py index 770ace4..10a78d4 100755 --- a/tests/generate_user_files_tests.py +++ b/tests/generate_user_files_tests.py @@ -7,11 +7,9 @@ # import re import unittest - from contextlib import suppress from pywikibot.scripts import generate_user_files as guf - from tests.aspects import TestCase diff --git a/tests/gui_tests.py b/tests/gui_tests.py index a908542..0e4188e 100755 --- a/tests/gui_tests.py +++ b/tests/gui_tests.py @@ -67,6 +67,7 @@ global EditBoxWindow, Tkdialog, tkinter import tkinter + from pywikibot.userinterfaces.gui import EditBoxWindow, Tkdialog diff --git a/tests/harvest_template_tests.py b/tests/harvest_template_tests.py index 1d35e39..72941f6 100755 --- a/tests/harvest_template_tests.py +++ b/tests/harvest_template_tests.py @@ -10,7 +10,6 @@ from pywikibot import ItemPage, WbTime from scripts.harvest_template import HarvestRobot - from tests.aspects import ScriptMainTestCase diff --git a/tests/interwikimap_tests.py b/tests/interwikimap_tests.py index fec9d2b..1b7f0b8 100755 --- a/tests/interwikimap_tests.py +++ b/tests/interwikimap_tests.py @@ -6,12 +6,10 @@ # Distributed under the terms of the MIT license. # import unittest - from contextlib import suppress import pywikibot from pywikibot.tools import suppress_warnings - from tests import WARN_SITE_CODE from tests.aspects import TestCase diff --git a/tests/make_dist_tests.py b/tests/make_dist_tests.py index 430cb9d..fc70a34 100755 --- a/tests/make_dist_tests.py +++ b/tests/make_dist_tests.py @@ -9,9 +9,8 @@ import sys import unittest -from pywikibot import __version__ from make_dist import handle_args - +from pywikibot import __version__ from tests.aspects import TestCase diff --git a/tests/tests_tests.py b/tests/tests_tests.py index 47c1974..3f3f9c5 100755 --- a/tests/tests_tests.py +++ b/tests/tests_tests.py @@ -7,8 +7,8 @@ import unittest from contextlib import suppress -from tests.aspects import TestCase from tests import utils +from tests.aspects import TestCase class HttpServerProblemTestCase(TestCase): diff --git a/tests/time_tests.py b/tests/time_tests.py index c074b7e..bd3e95e 100755 --- a/tests/time_tests.py +++ b/tests/time_tests.py @@ -11,7 +11,7 @@ from contextlib import suppress from datetime import datetime, timedelta -from pywikibot.time import parse_duration, str2timedelta, Timestamp +from pywikibot.time import Timestamp, parse_duration, str2timedelta from tests.aspects import TestCase diff --git a/tests/tools_tests.py b/tests/tools_tests.py index a372d50..bc898c8 100755 --- a/tests/tools_tests.py +++ b/tests/tools_tests.py @@ -28,7 +28,6 @@ islice_with_ellipsis, roundrobin_generators, ) - from tests import join_xml_data_path from tests.aspects import TestCase from tests.utils import skipping diff --git a/tests/wikiblame_tests.py b/tests/wikiblame_tests.py index 06f59b2..647af79 100644 --- a/tests/wikiblame_tests.py +++ b/tests/wikiblame_tests.py @@ -5,11 +5,9 @@ # Distributed under the terms of the MIT license. # import unittest - from contextlib import suppress import pywikibot - from tests.aspects import TestCase -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/879965 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: I1fe160b12296bba6faa6e2968e340b4996feb09e Gerrit-Change-Number: 879965 Gerrit-PatchSet: 1 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 3 months

[Gerrit] ...core[master]: update syntax with pyupgrade

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/879962 ) Change subject: update syntax with pyupgrade ...................................................................... update syntax with pyupgrade Change-Id: Id9e51cc688c717f7c9f2c191fb84f05962f0ac64 --- M scripts/category_graph.py M scripts/replicate_wiki.py M pywikibot/scripts/wrapper.py M scripts/clean_sandbox.py M scripts/dataextend.py M scripts/archivebot.py 6 files changed, 16 insertions(+), 8 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/scripts/wrapper.py b/pywikibot/scripts/wrapper.py index d996f02..6e64d15 100755 --- a/pywikibot/scripts/wrapper.py +++ b/pywikibot/scripts/wrapper.py @@ -250,7 +250,7 @@ # print the minimal requirement _print_requirements( ['setuptools>=20.8.1'], None, - 'outdated ({})'.format(setuptools.__version__)) + f'outdated ({setuptools.__version__})') return False raise e @@ -330,7 +330,7 @@ assert 0.0 < config.pwb_cut_off < 1.0, \ 'config.pwb_cut_off must be a float in range [0, 1]' - error('{} not found! Misspelling?'.format(filename)) + error(f'{filename} not found! Misspelling?') scripts = {} diff --git a/scripts/archivebot.py b/scripts/archivebot.py index ec9e4db..e57e547 100755 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -649,7 +649,7 @@ keep_threads = [] threads_per_archive = defaultdict(list) whys = set() - pywikibot.info('Processing {} threads'.format(len(self.page.threads))) + pywikibot.info(f'Processing {len(self.page.threads)} threads') fields = self.get_params(self.now, 0).keys() # dummy parameters regex = re.compile(r'%(\((?:{})\))d'.format('|'.join(fields))) stringpattern = regex.sub(r'%\1s', pattern) diff --git a/scripts/category_graph.py b/scripts/category_graph.py index 42cca2d..14f0d1c 100755 --- a/scripts/category_graph.py +++ b/scripts/category_graph.py @@ -41,7 +41,6 @@ # Distributed under the terms of the MIT license. # import argparse -import io from collections import defaultdict import pywikibot @@ -192,7 +191,7 @@ 'src="https://unpkg.com/panzoom@9.4.0/dist/panzoom.min.js" ' 'query="#graph0" name="pz"></script>\n' '<style> svg { height:100%; width:100%; } </style>\n') - with io.open(self.to + '.html', mode='wb') as o: + with open(self.to + '.html', mode='wb') as o: o.write(header.encode()) o.write(self.dot.create('dot', 'svg', encoding='utf-8')) diff --git a/scripts/clean_sandbox.py b/scripts/clean_sandbox.py index 2beb82b..1cb6f34 100755 --- a/scripts/clean_sandbox.py +++ b/scripts/clean_sandbox.py @@ -307,7 +307,7 @@ "can't be provided at the same time") return try: - with open(textfile_opt, 'r', encoding='utf-8') as textfile: + with open(textfile_opt, encoding='utf-8') as textfile: opts['text'] = textfile.read() except OSError as e: pywikibot.error(f'Error loading {opts["textfile"]}: {e}') diff --git a/scripts/dataextend.py b/scripts/dataextend.py index 713299f..6799f31 100755 --- a/scripts/dataextend.py +++ b/scripts/dataextend.py @@ -455,7 +455,7 @@ for claim in claims[prop]: if claim.type == 'wikibase-item': if claim.getTarget() is None: - pywikibot.info('{}: unknown'.format(self.label(prop))) + pywikibot.info(f'{self.label(prop)}: unknown') else: pywikibot.info( '{}: {}' diff --git a/scripts/replicate_wiki.py b/scripts/replicate_wiki.py index 12191e4..f128eee 100755 --- a/scripts/replicate_wiki.py +++ b/scripts/replicate_wiki.py @@ -125,7 +125,7 @@ if self.options.namespace: pywikibot.info(str(self.options.namespace)) namespaces = [int(self.options.namespace)] - pywikibot.info('Checking these namespaces: {}\n'.format((namespaces,))) + pywikibot.info(f'Checking these namespaces: {namespaces}\n') for ns in namespaces: self.check_namespace(ns) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/879962 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: Id9e51cc688c717f7c9f2c191fb84f05962f0ac64 Gerrit-Change-Number: 879962 Gerrit-PatchSet: 2 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 3 months

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits January 2023