Pywikibot-commits July 2022

pywikibot-commits@lists.wikimedia.org

1 participants
127 discussions

[Gerrit] ...core[master]: [IMPR] PEP8 updates
by jenkins-bot (Code Review) 11 Jul '22

11 Jul '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/812894 ) Change subject: [IMPR] PEP8 updates ...................................................................... [IMPR] PEP8 updates Bug: T305859 Change-Id: Id02144a8ac47085d07a17690252ef248f707669b --- M scripts/dataextend.py 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/dataextend.py b/scripts/dataextend.py index 4dbbda0..23ba6d4 100644 --- a/scripts/dataextend.py +++ b/scripts/dataextend.py @@ -15095,31 +15095,37 @@ section = self.getvalue('Life dates', html) if section: return self.findbyre(r'(\d{4}) - ', section) + return None def finddeathdate(self, html): section = self.getvalue('Life dates', html) if section: return self.findbyre(r'(\d{4})\s*$', section) + return None def findbirthplace(self, html): section = self.getvalue('Life dates', html) if section: return self.findbyre(r'(.*?), \d{4} - ', section, 'city') + return None def finddeathplace(self, html): section = self.getvalue('Life dates', html) if section: return self.findbyre(r', \d{4} - (.*), \d{4}', section, 'city') + return None def findworkplaces(self, html): section = self.getvalue('Locations', html) if section: return self.findallbyre('([A-Z][^<>]*)', section, 'city') + return None def findgenres(self, html): section = self.getvalue('Genres / subject matter', html) if section: return self.findallbyre('[^<>]+', section, 'art-genre', alt=['genre']) + return None def findmixedrefs(self, html): return self.finddefaultmixedrefs(html, includesocial=False) @@ -15131,6 +15137,7 @@ section = self.getvalue('Affiliated entity', html) if section: return self.findallbyre('<a [^<>]*>(.*?)<', section, 'organization') + return None class NationalTrustAnalyzer(UrlAnalyzer): @@ -15154,21 +15161,25 @@ section = self.finddatesection(html) if section: return self.findbyre(r'^([\w\s]*?) [\-\d]', section, 'city') + return None def findbirthdate(self, html): section = self.finddatesection(html) if section: return self.findbyre(r' (\d*) -', section) + return None def finddeathplace(self, html): section = self.finddatesection(html) if section: return self.findbyre(r' - ([\w\s]*?)(?: \d|\))', section, 'city') + return None def finddeathdate(self, html): section = self.finddatesection(html) if section: return self.findbyre(r' (\d*)\s*\)', section) + return None def findincollections(self, html): return self.findallbyre(r'(?s)<label for="[^<>"]+">([^<>]*)</label>\s*<span class="item-bubble">[1-9]', html, @@ -15274,6 +15285,7 @@ section = self.findbyre(r'"birthPlace":{(.*?)}', html) if section: return self.findbyre(r'"name":"(.*?)"', section, 'city') + return None def finddeathdate(self, html): return self.findbyre(r'"deathDate":"(.*?)"', html) @@ -15343,6 +15355,7 @@ subsection = self.findbyre(r'(?s)<div class="media-body">(.*?)<', section) if subsection: return self.findallbyre(r'([^,]*)', subsection, 'occupation') + return None def findresidences(self, html): section = self.findbyre(r'(?s)<li class="media residences">(.*?)</li>', html) @@ -15350,6 +15363,7 @@ subsection = self.findbyre(r'(?s)<div class="media-body">(.*?)<', section) if subsection: return self.findallbyre(r'([^,]*)', subsection, 'city') + return None class BacklinkAnalyzer(Analyzer): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/812894 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: Id02144a8ac47085d07a17690252ef248f707669b Gerrit-Change-Number: 812894 Gerrit-PatchSet: 3 Gerrit-Owner: Vivian Rook <vrook(a)wikimedia.org> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...i18n[master]: Localisation updates from https://translatewiki.net.
by jenkins-bot (Code Review) 11 Jul '22

11 Jul '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/812847 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I2d8c71af43359a5128c822a1ea0bd1ab51ed7983 --- M category/tly.json M category_redirect/tly.json A delinker/frr.json 3 files changed, 13 insertions(+), 4 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/category/tly.json b/category/tly.json index 45e20da..1ec7353 100644 --- a/category/tly.json +++ b/category/tly.json @@ -14,6 +14,6 @@ "category-replacing": "Робот: %(oldcat)s бә %(newcat)s әвәз карде", "category-section-title": "Сәһифә тарихи че канәку %(oldcat)s", "category-version-history": "Робот: Тарихи чы kanə версијәку огәте %(oldcat)s", - "category-was-disbanded": "Робот: категоријә ләғв кардә быә", - "category-was-moved": "Робот: категоријә тожәдан ном ноә быә [[:Category:%(newcat)s|%(title)s]]" + "category-was-disbanded": "Bot: Kateqoriya ләғв кардә быә", + "category-was-moved": "Bot: Kateqoriya тожәдан ном ноә быә [[:Category:%(newcat)s|%(title)s]]" } diff --git a/category_redirect/tly.json b/category_redirect/tly.json index ba57595..136036a 100644 --- a/category_redirect/tly.json +++ b/category_redirect/tly.json @@ -1,11 +1,12 @@ { "@metadata": { "authors": [ + "Patriot Kur", "Гусейн" ] }, - "category_redirect-add-template": "Робот: Унвони дәгиш кардә категоријә ғәлиби зијод кардеј бо мыбәти", - "category_redirect-change-category": "Робот: унвони дәгиш кардә категоријә дәгиш кардеј чымәдәку [[:%(oldCatLink)s|%(oldCatTitle)s]] бә [[:%(newCatLink)s|%(newCatTitle)s]]", + "category_redirect-add-template": "Робот: Унвони дәгиш кардә kateqoriya ғәлиби зијод кардеј бо мыбәти", + "category_redirect-change-category": "Bot: унвони дәгиш кардә kateqoriya дәгиш кардеј чымәдәку [[:%(oldCatLink)s|%(oldCatTitle)s]] бә [[:%(newCatLink)s|%(newCatTitle)s]]", "category_redirect-comment": "Категоријон унвони дәгиш кардә хыдмәтәкә бот", "category_redirect-edit-request": "Омәнинә мыдофијә быә сәһифон тәләб кардејдән ын категоријон ситотон тожә кардеј: %(itemlist)s", "category_redirect-edit-request-item": "* %(title)s, %(oldcat)s'әдәј, унвони дәгиш кардејеј %(newcat)s'ку", diff --git a/delinker/frr.json b/delinker/frr.json new file mode 100644 index 0000000..58e0f65 --- /dev/null +++ b/delinker/frr.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Murma174" + ] + }, + "delinker-delink": "Bot: Det datei [[%(title)s]] as wechnimen wurden, auer hat stregen wurden as faan [[:User:%(user)s]]: ''%(comment)s''." +} -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/812847 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: I2d8c71af43359a5128c822a1ea0bd1ab51ed7983 Gerrit-Change-Number: 812847 Gerrit-PatchSet: 1 Gerrit-Owner: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] Move tzoneFixedOffset class to time module
by jenkins-bot (Code Review) 10 Jul '22

10 Jul '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/812248 ) Change subject: [IMPR] Move tzoneFixedOffset class to time module ...................................................................... [IMPR] Move tzoneFixedOffset class to time module tzoneFixedOffset was originally implemented in archivebot script by Mpaa and moved to textlib in an early state of Pywikibot 2.0 - rename tzoneFixedOffset to TZoneFixedOffset - use single underscore variables instead of double underscores because name mangling is not necessary here. (Similar to class timezone(tzinfo) https://github.com/python/cpython/blob/3.10/Lib/datetime.py) - deprecate textlib.tzoneFixedOffset Change-Id: I72ef48caa747d39a5b8bfcf521fb3d80ef53fc7c --- M pywikibot/textlib.py M pywikibot/time.py M tests/timestripper_tests.py 3 files changed, 52 insertions(+), 43 deletions(-) Approvals: Mpaa: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index ee70af9..cc94eaf 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -10,7 +10,6 @@ # # Distributed under the terms of the MIT license. # -import datetime import re from collections import OrderedDict, namedtuple from collections.abc import Sequence @@ -25,7 +24,8 @@ from pywikibot.backports import Tuple from pywikibot.exceptions import InvalidTitleError, SiteDefinitionError from pywikibot.family import Family -from pywikibot.tools import deprecated +from pywikibot.time import TZoneFixedOffset +from pywikibot.tools import deprecated, ModuleDeprecationWrapper from pywikibot.userinterfaces.transliteration import NON_LATIN_DIGITS @@ -1829,41 +1829,6 @@ # Time parsing functionality (Archivebot) # --------------------------------------- -class tzoneFixedOffset(datetime.tzinfo): - - """ - Class building tzinfo objects for fixed-offset time zones. - - :param offset: a number indicating fixed offset in minutes east from UTC - :param name: a string with name of the timezone - """ - - def __init__(self, offset: int, name: str) -> None: - """Initializer.""" - self.__offset = datetime.timedelta(minutes=offset) - self.__name = name - - def utcoffset(self, dt): - """Return the offset to UTC.""" - return self.__offset - - def tzname(self, dt): - """Return the name of the timezone.""" - return self.__name - - def dst(self, dt): - """Return no daylight savings time.""" - return datetime.timedelta(0) - - def __repr__(self) -> str: - """Return the internal representation of the timezone.""" - return '{}({}, {})'.format( - self.__class__.__name__, - self.__offset.days * 86400 + self.__offset.seconds, - self.__name - ) - - class TimeStripper: """Find timestamp in page and return it as pywikibot.Timestamp object.""" @@ -1929,7 +1894,7 @@ self._wikilink_pat = re.compile( r'\[\[(?P<link>[^\]\|]*?)(?P<anchor>\|[^\]]*)?\]\]') - self.tzinfo = tzoneFixedOffset(self.site.siteinfo['timeoffset'], + self.tzinfo = TZoneFixedOffset(self.site.siteinfo['timeoffset'], self.site.siteinfo['timezone']) @staticmethod @@ -2108,3 +2073,10 @@ timestamp = None return timestamp + + +wrapper = ModuleDeprecationWrapper(__name__) +wrapper.add_deprecated_attr( + 'tzoneFixedOffset', + replacement_name='pywikibot.time.TZoneFixedOffset', + since='7.5.0') diff --git a/pywikibot/time.py b/pywikibot/time.py index 0e14332..b5240a9 100644 --- a/pywikibot/time.py +++ b/pywikibot/time.py @@ -22,6 +22,7 @@ 'str2timedelta', 'MW_KEYS', 'Timestamp', + 'TZoneFixedOffset' ) #: ..versionadded:: 7.5 @@ -309,6 +310,41 @@ return newdt +class TZoneFixedOffset(datetime.tzinfo): + + """ + Class building tzinfo objects for fixed-offset time zones. + + :param offset: a number indicating fixed offset in minutes east from UTC + :param name: a string with name of the timezone + """ + + def __init__(self, offset: int, name: str) -> None: + """Initializer.""" + self._offset = datetime.timedelta(minutes=offset) + self._name = name + + def utcoffset(self, dt): + """Return the offset to UTC.""" + return self._offset + + def tzname(self, dt): + """Return the name of the timezone.""" + return self._name + + def dst(self, dt): + """Return no daylight savings time.""" + return datetime.timedelta(0) + + def __repr__(self) -> str: + """Return the internal representation of the timezone.""" + return '{}({}, {})'.format( + self.__class__.__name__, + self._offset.days * 86400 + self._offset.seconds, + self._name + ) + + def str2timedelta(string: str, timestamp=None) -> datetime.timedelta: """ Return a timedelta for a shorthand duration. diff --git a/tests/timestripper_tests.py b/tests/timestripper_tests.py index d2ef6d9..b178bac 100755 --- a/tests/timestripper_tests.py +++ b/tests/timestripper_tests.py @@ -9,7 +9,8 @@ import re from contextlib import suppress -from pywikibot.textlib import TimeStripper, tzoneFixedOffset +from pywikibot.textlib import TimeStripper +from pywikibot.time import TZoneFixedOffset from tests.aspects import TestCase, unittest @@ -152,7 +153,7 @@ self.ts.timestripper( '2000 people will attend. --12:12, 14 December 2015 (UTC)'), datetime.datetime( - 2015, 12, 14, 12, 12, tzinfo=tzoneFixedOffset(0, 'UTC'))) + 2015, 12, 14, 12, 12, tzinfo=TZoneFixedOffset(0, 'UTC'))) class TestTimeStripperLanguage(TestCase): @@ -224,7 +225,7 @@ """Test that correct date is matched.""" self.ts = TimeStripper(self.get_site(key)) - tzone = tzoneFixedOffset(self.ts.site.siteinfo['timeoffset'], + tzone = TZoneFixedOffset(self.ts.site.siteinfo['timeoffset'], self.ts.site.siteinfo['timezone']) txt_match = self.sites[key]['match'] @@ -275,7 +276,7 @@ date = '06:57 06 June 2015 (UTC)' fake_date = '05:57 06 June 2015 (UTC)' - tzone = tzoneFixedOffset(0, 'UTC') + tzone = TZoneFixedOffset(0, 'UTC') expected_date = datetime.datetime(2015, 6, 6, 6, 57, tzinfo=tzone) def test_timestripper_match_comment(self): @@ -391,7 +392,7 @@ username = '[[User:DoNotArchiveUntil]]' date = '06:57 06 June 2015 (UTC)' user_and_date = username + ' ' + date - tzone = tzoneFixedOffset(0, 'UTC') + tzone = TZoneFixedOffset(0, 'UTC') def test_timestripper_match(self): """Test that dates in comments are correctly recognised.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/812248 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: I72ef48caa747d39a5b8bfcf521fb3d80ef53fc7c Gerrit-Change-Number: 812248 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [doc] Update ROADMAP.rst and add some documentation changes
by Xqt (Code Review) 10 Jul '22

10 Jul '22

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/812557 ) Change subject: [doc] Update ROADMAP.rst and add some documentation changes ...................................................................... [doc] Update ROADMAP.rst and add some documentation changes Change-Id: I59df93c857039c63ece3e3feafb6bf610aa09193 --- M ROADMAP.rst M pywikibot/site/_datasite.py M pywikibot/site/_generators.py 3 files changed, 12 insertions(+), 3 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/ROADMAP.rst b/ROADMAP.rst index fad8800..ca3bb1b 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,6 +1,11 @@ Current release 7.5.0 ^^^^^^^^^^^^^^^^^^^^^ +* Wrapper method :meth:`parsevalue()<pywikibot.site._datasite.DataSite.parsevalue>` + around wbparsevalue was added (:phab:`T112140`) +* L10N updates +* Fix cp encodings in :func:`get_charset_from_content_type() + <pywikibot.comms.http.get_charset_from_content_type>` (:phab:`T312230`) * New :mod:`pywikibot.time` module with new functions in addition to `Timestamp` * :meth:`Page.revisions()<pywikibot.page.BasePage.revisions>` supports more formats/types for starttime and endtime parameters, in addition to those allowed by diff --git a/pywikibot/site/_datasite.py b/pywikibot/site/_datasite.py index b651cd5..370981d 100644 --- a/pywikibot/site/_datasite.py +++ b/pywikibot/site/_datasite.py @@ -715,9 +715,12 @@ """ Send data values to the wikibase parser for interpretation. - :param datatype: datatype of the values being parsed. Refer to - https://www.wikidata.org/w/api.php?action=help&modules=wbparsevalue - for a valid datatype. + .. versionadded:: 7.5 + .. seealso:: `wbparsevalue API + <https://www.wikidata.org/w/api.php?action=help&modules=wbparsevalue>`_ + + :param datatype: datatype of the values being parsed. Refer the + API for a valid datatype. :param values: list of values to be parsed :param options: any additional options for wikibase parser (for time, 'precision' should be specified) diff --git a/pywikibot/site/_generators.py b/pywikibot/site/_generators.py index 641fd7f..1163760 100644 --- a/pywikibot/site/_generators.py +++ b/pywikibot/site/_generators.py @@ -1243,6 +1243,7 @@ if namespace param contains multiple namespaces, log entries from all namespaces will be fetched from the API and will be filtered later during iteration. + :param start: only iterate entries from and after this Timestamp :type start: Timestamp or ISO date string :param end: only iterate entries up to and through this Timestamp -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/812557 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: I59df93c857039c63ece3e3feafb6bf610aa09193 Gerrit-Change-Number: 812557 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: Add wrapper function around wbparsevalue
by jenkins-bot (Code Review) 10 Jul '22

10 Jul '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/297637 ) Change subject: Add wrapper function around wbparsevalue ...................................................................... Add wrapper function around wbparsevalue Bug: T112140 Change-Id: Ib559b4c9ae541d30866552461e83eefde911ea57 --- M pywikibot/site/_datasite.py M tests/wikibase_tests.py 2 files changed, 89 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site/_datasite.py b/pywikibot/site/_datasite.py index 5375cc7..b651cd5 100644 --- a/pywikibot/site/_datasite.py +++ b/pywikibot/site/_datasite.py @@ -8,7 +8,7 @@ import json import uuid from contextlib import suppress -from typing import Optional +from typing import Any, Dict, List, Optional from warnings import warn import pywikibot @@ -710,6 +710,47 @@ total=total, parameters=parameters) return gen + def parsevalue(self, datatype: str, values: List[str], + options: Dict[str, Any], validate: bool) -> List[Any]: + """ + Send data values to the wikibase parser for interpretation. + + :param datatype: datatype of the values being parsed. Refer to + https://www.wikidata.org/w/api.php?action=help&modules=wbparsevalue + for a valid datatype. + :param values: list of values to be parsed + :param options: any additional options for wikibase parser + (for time, 'precision' should be specified) + :param validate: whether parser should provide data validation as well + as parsing + :return: list of parsed values + :raises ValueError: parsing failed due to some invalid input values + """ + params = { + 'datatype': datatype, + 'values': values, + 'options': json.dumps(options), + 'validate': validate, + } + req = self.simple_request(action='wbparsevalue', **params) + try: + data = req.submit() + except APIError as e: + if e.code == 'wikibase-parse-error-quantity': + raise ValueError(e) from None + raise + if 'results' not in data: + raise ValueError('Parsing via wikibase wbparsevalue failed.') + + results = [] + for result_hash in data['results']: + if 'value' not in result_hash: + raise ValueError( + 'Parsing via wikibase wbparsevalue failed: {}' + .format(result_hash['error-info'])) + results.append(result_hash['value']) + return results + @need_right('edit') def _wbset_action(self, itemdef, action: str, action_data, **kwargs) -> dict: diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index 96b7ad6..0ebcb854 100755 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -630,6 +630,53 @@ pywikibot.WbMonolingualText(text=None, language='sv') +class TestWikibaseParser(WikidataTestCase): + """Test passing various datatypes to wikibase parser.""" + + def test_wbparse_strings(self): + """Test that strings return unchanged.""" + test_list = ['test string', 'second test'] + parsed_strings = self.site.parsevalue('string', test_list, {}, False) + self.assertEqual(parsed_strings, test_list) + + def test_wbparse_time(self): + """Test parsing of a time value.""" + parsed_date = self.site.parsevalue( + 'time', ['1994-02-08'], {'precision': 9}, False)[0] + self.assertEqual(parsed_date['time'], '+1994-02-08T00:00:00Z') + self.assertEqual(parsed_date['precision'], 9) + + def test_wbparse_quantity(self): + """Test parsing of quantity values.""" + parsed_quantities = self.site.parsevalue( + 'quantity', + ['1.90e-9+-0.20e-9', '1000000.00000000054321+-0', '-123+-1', + '2.70e34+-1e32'], {}, False) + self.assertEqual(parsed_quantities[0]['amount'], '+0.00000000190') + self.assertEqual(parsed_quantities[0]['upperBound'], '+0.00000000210') + self.assertEqual(parsed_quantities[0]['lowerBound'], '+0.00000000170') + self.assertEqual(parsed_quantities[1]['amount'], + '+1000000.00000000054321') + self.assertEqual(parsed_quantities[1]['upperBound'], + '+1000000.00000000054321') + self.assertEqual(parsed_quantities[1]['lowerBound'], + '+1000000.00000000054321') + self.assertEqual(parsed_quantities[2]['amount'], '-123') + self.assertEqual(parsed_quantities[2]['upperBound'], '-122') + self.assertEqual(parsed_quantities[2]['lowerBound'], '-124') + self.assertEqual(parsed_quantities[3]['amount'], + '+27000000000000000000000000000000000') + self.assertEqual(parsed_quantities[3]['upperBound'], + '+27100000000000000000000000000000000') + self.assertEqual(parsed_quantities[3]['lowerBound'], + '+26900000000000000000000000000000000') + + def test_wbparse_raises_valueerror(self): + """Test invalid value condition.""" + with self.assertRaises(ValueError): + self.site.parsevalue('quantity', ['Not a quantity'], {}, False) + + class TestWbGeoShapeNonDry(WbRepresentationTestCase): """ -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/297637 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: Ib559b4c9ae541d30866552461e83eefde911ea57 Gerrit-Change-Number: 297637 Gerrit-PatchSet: 14 Gerrit-Owner: ArthurPSmith <arthurpsmith(a)gmail.com> Gerrit-Reviewer: ArthurPSmith <arthurpsmith(a)gmail.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Multichill <maarten(a)mdammers.nl> Gerrit-Reviewer: Tobias47n9e <tobias47n9e(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-CC: Dvorapa <dvorapa(a)seznam.cz> Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [bugfix] Remove assert statement in api.Request.submit()
by jenkins-bot (Code Review) 10 Jul '22

10 Jul '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/812520 ) Change subject: [bugfix] Remove assert statement in api.Request.submit() ...................................................................... [bugfix] Remove assert statement in api.Request.submit() The assertion was introduced 7 years ago with d179b13 but fails with f068eb9 Bug: T312716 Change-Id: I1d5d4029b6b3044a5bac9a0af079d077f73325b3 --- M pywikibot/data/api/_requests.py 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/api/_requests.py b/pywikibot/data/api/_requests.py index f676a4f..08ac721 100644 --- a/pywikibot/data/api/_requests.py +++ b/pywikibot/data/api/_requests.py @@ -1007,8 +1007,6 @@ if key in ('error', 'warnings'): continue assert key not in error - assert isinstance(result[key], str), \ - 'Unexpected {}: {!r}'.format(key, result[key]) error[key] = result[key] if '*' in result['error']: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/812520 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: I1d5d4029b6b3044a5bac9a0af079d077f73325b3 Gerrit-Change-Number: 812520 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [tests] Ignore OSError and ServerErrors from coverage by default
by Xqt (Code Review) 09 Jul '22

09 Jul '22

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/812447 ) Change subject: [tests] Ignore OSError and ServerErrors from coverage by default ...................................................................... [tests] Ignore OSError and ServerErrors from coverage by default Change-Id: I63f6d059181ab000e9f9c2e62852879d2739ca5f --- M .coveragerc M pywikibot/scripts/generate_family_file.py M scripts/interwiki.py 3 files changed, 4 insertions(+), 2 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.coveragerc b/.coveragerc index 7a11b16..e7214d5 100644 --- a/.coveragerc +++ b/.coveragerc @@ -7,7 +7,9 @@ pragma: no cover except ImportError except KeyboardInterrupt + except OSError except pkg_resources + except \w*ServerError except SyntaxError raise NotImplementedError raise unittest\.SkipTest diff --git a/pywikibot/scripts/generate_family_file.py b/pywikibot/scripts/generate_family_file.py index 47c4b8b..e545c89 100755 --- a/pywikibot/scripts/generate_family_file.py +++ b/pywikibot/scripts/generate_family_file.py @@ -118,7 +118,7 @@ for verify in (True, False): try: w = self.Wiki(self.base_url, verify=verify) - except FatalServerError: # pragma: no cover + except FatalServerError: pywikibot.error( pywikibot.comms.http.SSL_CERT_VERIFY_FAILED_MSG) pywikibot.exception() diff --git a/scripts/interwiki.py b/scripts/interwiki.py index c353b17..0510d2f 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -2398,7 +2398,7 @@ bot.run() except KeyboardInterrupt: dump.write_dump(bot.dump_titles, append) - except Exception: + except Exception: # pragma: no cover pywikibot.exception() dump.write_dump(bot.dump_titles, append) else: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/812447 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: I63f6d059181ab000e9f9c2e62852879d2739ca5f Gerrit-Change-Number: 812447 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [doc] comvert CHANGELOG.md to CHANGELOG.rst
by Xqt (Code Review) 08 Jul '22

08 Jul '22

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/812292 ) Change subject: [doc] comvert CHANGELOG.md to CHANGELOG.rst ...................................................................... [doc] comvert CHANGELOG.md to CHANGELOG.rst Markdown cannot be used with sphinx easily. Change-Id: I99474b26865b8d832f06492ae793d7b4a3ab0b3e --- R scripts/CHANGELOG.rst 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/scripts/CHANGELOG.md b/scripts/CHANGELOG.rst similarity index 100% rename from scripts/CHANGELOG.md rename to scripts/CHANGELOG.rst -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/812292 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: I99474b26865b8d832f06492ae793d7b4a3ab0b3e Gerrit-Change-Number: 812292 Gerrit-PatchSet: 1 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 0

[Gerrit] ...core[master]: [doc] convert CHANGELOG.md to CHANGELOG.rst
by Xqt (Code Review) 08 Jul '22

08 Jul '22

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/812291 ) Change subject: [doc] convert CHANGELOG.md to CHANGELOG.rst ...................................................................... [doc] convert CHANGELOG.md to CHANGELOG.rst Markdown cannot be used with sphinx easily. Change-Id: I12f696e0a365a4d32f6578c669daf79e518c8565 --- M scripts/CHANGELOG.rst 1 file changed, 749 insertions(+), 387 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/scripts/CHANGELOG.rst b/scripts/CHANGELOG.rst index 54a01a1..91b1d3d 100644 --- a/scripts/CHANGELOG.rst +++ b/scripts/CHANGELOG.rst @@ -1,611 +1,973 @@ -# Scripts Changelog +Scripts Changelog +================= -## 7.5.0 +7.5.0 +----- + *current release* -### harvest_templates -* Add `-inverse` option for inverse claims (:phab:`T173238`) -* Only follow redirects in harvest_template.py if no wikibase item exists (:phab:`T311883`) +harvest_templates +~~~~~~~~~~~~~~~~~ -## 7.4.0 +* Add ``-inverse`` option for inverse claims (:phab:`T173238`) +* Only follow redirects in harvest_template.py if no wikibase item + exists (:phab:`T311883`) + +7.4.0 +----- + *26 June 2022* -### addtext -* Fix for -createonly option (:phab:`T311173`) +addtext +~~~~~~~ -### harvest_templates -* Add -confirm option which sets 'always' option to False (:phab:`T310356`) -* Do not show a warning if generator is specified later (:phab:`T310418`) +* Fix for -createonly option (:phab:`T311173`) -### interwiki -* Fix regression where interwiki script removes all interwiki links (:phab:`T310964`) -* Assign compareLanguages to be reused and fix process_limit_two call (:phab:`T310908`) +harvest_templates +~~~~~~~~~~~~~~~~~ -### listpages -* Print the page list immediately except pages are preloaded +* Add -confirm option which sets ‘always’ option to False + (:phab:`T310356`) +* Do not show a warning if generator is specified later + (:phab:`T310418`) -### nowcommons -* Use treat_page method (:phab:`T309456`) -* Fix several bugs (:phab:`T309473`) +interwiki +~~~~~~~~~ +* Fix regression where interwiki script removes all interwiki links + (:phab:`T310964`) +* Assign compareLanguages to be reused and fix process_limit_two call + (:phab:`T310908`) -## 7.3.0 +listpages +~~~~~~~~~ + +* Print the page list immediately except pages are preloaded + +nowcommons +~~~~~~~~~~ + +* Use treat_page method (:phab:`T309456`) +* Fix several bugs (:phab:`T309473`) + +7.3.0 +----- + *21 May 2022* -### general -* Call ExistingPageBot.skip_page() first (:phab:`T86491`) +general +~~~~~~~ -### delete -* Count deleted pages and other actions (:phab:`T212040`) +* Call ExistingPageBot.skip_page() first (:phab:`T86491`) -### replace -* A -nopreload option was added +delete +~~~~~~ -### weblinkchecker -* Throttle connections to the same host (:phab:`T152350`) -* Do not kill threads after generator is exhausted (:phab:`T113139`) -* Use Page.extlinks() to get external links (:phab:`T60812`) +* Count deleted pages and other actions (:phab:`T212040`) -### update_script -* update_script script was removed +replace +~~~~~~~ +* A -nopreload option was added -## 7.2.1 +weblinkchecker +~~~~~~~~~~~~~~ + +* Throttle connections to the same host (:phab:`T152350`) +* Do not kill threads after generator is exhausted (:phab:`T113139`) +* Use Page.extlinks() to get external links (:phab:`T60812`) + +update_script +~~~~~~~~~~~~~ + +* update_script script was removed + +7.2.1 +----- + *07 May 2022* -### movepages -* Fix regression of option parsing (:phab:`T307826`) +movepages +~~~~~~~~~ +* Fix regression of option parsing (:phab:`T307826`) -## 7.2.0 +7.2.0 +----- + *26 April 2022* -### general -* Archived scripts were removed +general +~~~~~~~ -### archive -* Fix trailing newlines (:phab:`T306529`) +* Archived scripts were removed -### checkimages -* Use page_from_repository() method to read categoried from wikibase -* Use `itertools.zip_longest` to find the most important image +archive +~~~~~~~ -### dataextend -* A -showonly option was added to only show claims of an ItemPage -* This new script was added. It is able to add properties, identifiers and sources to WikiBase items +* Fix trailing newlines (:phab:`T306529`) -### delinker -* New delinker script was added; it replaces compat's CommonsDelinker (:phab:`T299563`) +checkimages +~~~~~~~~~~~ -### image -* Fix image regex (:phab:`T305226`, :phab:`T305227`) +* Use page_from_repository() method to read categoried from wikibase +* Use ``itertools.zip_longest`` to find the most important image -### reflinks -* Ignore Bloomberg captcha (:phab:`T306304`) -* Fix cp encodings (:phab:`T304830`) +dataextend +~~~~~~~~~~ -### replace -* A -quiet option was added to omit message when no change was made +* A -showonly option was added to only show claims of an ItemPage +* This new script was added. It is able to add properties, identifiers + and sources to WikiBase items +delinker +~~~~~~~~ -## 7.1.1 +* New delinker script was added; it replaces compat’s CommonsDelinker + (:phab:`T299563`) + +image +~~~~~ + +* Fix image regex (:phab:`T305226`, :phab:`T305227`) + +reflinks +~~~~~~~~ + +* Ignore Bloomberg captcha (:phab:`T306304`) +* Fix cp encodings (:phab:`T304830`) + +replace +~~~~~~~ + +* A -quiet option was added to omit message when no change was made + +7.1.1 +----- + *15 April 2022* -### replace -* Fix regression of XmlDumpPageGenerator +replace +~~~~~~~ +* Fix regression of XmlDumpPageGenerator -## 7.1.0 +7.1.0 +----- + *26 March 2022* -### fixing_redirects -* -always option was enabled +fixing_redirects +~~~~~~~~~~~~~~~~ -### reflinks -* Solve UnicodeDecodeError in ReferencesRobot.treat() (:phab:`T304288`) -* Decode pdfinfo if it is bytes content (:phab:`T303731`) +* -always option was enabled +reflinks +~~~~~~~~ -## 7.0.0 +* Solve UnicodeDecodeError in ReferencesRobot.treat() + (:phab:`T304288`) +* Decode pdfinfo if it is bytes content (:phab:`T303731`) + +7.0.0 +----- + *26 February 2022* -### general -* L10N updates -* Provide ConfigParserBot for several scripts (:phab:`T223778`) +general +~~~~~~~ -### add_text -* Provide -create and -createonly options (:phab:`T291354`) -* Deprecated function get_text() was removed in favour of Page.text and BaseBot.skip_page() -* Deprecated function put_text() was removed in favour of BaseBot.userPut() method -* Deprecated function add_text() were remove in favour of textlib.add_text() +* L10N updates +* Provide ConfigParserBot for several scripts (:phab:`T223778`) -### blockpageschecker -* Use different edit comments when adding, changeing or removing templates (:phab:`T291345`) -* Derive CheckerBot from ConfigParserBot (:phab:`T57106`) -* Derive CheckerBot from CurrentPageBot (:phab:`T196851`, :phab:`T171713`) +add_text +~~~~~~~~ -### category -* CleanBot was added which can be invoked by clean action option -* Recurse CategoryListifyRobot with depth -* Show a warning if a pagegenerator option is not enabled (:phab:`T298522`) -* Deprecated code parts were removed +* Provide -create and -createonly options (:phab:`T291354`) +* Deprecated function get_text() was removed in favour of Page.text and + BaseBot.skip_page() +* Deprecated function put_text() was removed in favour of + BaseBot.userPut() method +* Deprecated function add_text() were remove in favour of + textlib.add_text() -### checkimages -* Skip PageSaveRelatedError and ServerError when putting talk page (:phab:`T302174`) +blockpageschecker +~~~~~~~~~~~~~~~~~ -### commonscat -* Ignore InvalidTitleError in CommonscatBot.findCommonscatLink (:phab:`T291783`) +* Use different edit comments when adding, changeing or removing + templates (:phab:`T291345`) +* Derive CheckerBot from ConfigParserBot (:phab:`T57106`) +* Derive CheckerBot from CurrentPageBot (:phab:`T196851`, + :phab:`T171713`) -### cosmetic_changes -* Ignore InvalidTitleError in CosmeticChangesBot.treat_page (:phab:`T293612`) +category +~~~~~~~~ -### djvutext -* pass site arg only once (:phab:`T292367`) +* CleanBot was added which can be invoked by clean action option +* Recurse CategoryListifyRobot with depth +* Show a warning if a pagegenerator option is not enabled + (:phab:`T298522`) +* Deprecated code parts were removed -### fixing_redirects -* Let only put_current show the message "No changes were needed" -* Use concurrent.futures to retrieve redirect or moved targets (:phab:`T298789`) -* Add an option to ignore solving moved targets (:phab:`T298789`) +checkimages +~~~~~~~~~~~ -### imagetransfer -* Add support for chunked uploading (:phab:`T300531`) +* Skip PageSaveRelatedError and ServerError when putting talk page + (:phab:`T302174`) -### newitem -* Do not pass OtherPageSaveRelatedError silently +commonscat +~~~~~~~~~~ -### pagefromfile -* Preload pages instead of reading them one by one before putting changes -* Don't ask for confirmation by default (:phab:`T291757`) +* Ignore InvalidTitleError in CommonscatBot.findCommonscatLink + (:phab:`T291783`) -### redirect -* Use site.maxlimit to determine the highest limit to load (:phab:`T299859`) +cosmetic_changes +~~~~~~~~~~~~~~~~ -### replace -* Enable default behaviour with -mysqlquery (:phab:`T299306`) -* Deprecated "acceptall" and "addedCat" parameters were replaced by "always" and "addcat" +* Ignore InvalidTitleError in CosmeticChangesBot.treat_page + (:phab:`T293612`) -### revertbot -* Add support for translated dates/times (:phab:`T102174`) -* Deprecated "max" parameter was replaced by "total" +djvutext +~~~~~~~~ -### solve_disambiguation -* Remove deprecated properties in favour of DisambiguationRobot.opt options +* pass site arg only once (:phab:`T292367`) -### touch -*Do not pass OtherPageSaveRelatedError silently +fixing_redirects +~~~~~~~~~~~~~~~~ -### unusedfiles -* Use oldest_file_info.user as uploader (:phab:`T301768`) +* Let only put_current show the message “No changes were needed” +* Use concurrent.futures to retrieve redirect or moved targets + (:phab:`T298789`) +* Add an option to ignore solving moved targets (:phab:`T298789`) +imagetransfer +~~~~~~~~~~~~~ -## 6.6.1 +* Add support for chunked uploading (:phab:`T300531`) + +newitem +~~~~~~~ + +* Do not pass OtherPageSaveRelatedError silently + +pagefromfile +~~~~~~~~~~~~ + +* Preload pages instead of reading them one by one before putting + changes +* Don’t ask for confirmation by default (:phab:`T291757`) + +redirect +~~~~~~~~ + +* Use site.maxlimit to determine the highest limit to load + (:phab:`T299859`) + +replace +~~~~~~~ + +* Enable default behaviour with -mysqlquery (:phab:`T299306`) +* Deprecated “acceptall” and “addedCat” parameters were replaced by + “always” and “addcat” + +revertbot +~~~~~~~~~ + +* Add support for translated dates/times (:phab:`T102174`) +* Deprecated “max” parameter was replaced by “total” + +solve_disambiguation +~~~~~~~~~~~~~~~~~~~~ + +* Remove deprecated properties in favour of DisambiguationRobot.opt + options + +touch +~~~~~ + +\*Do not pass OtherPageSaveRelatedError silently + +unusedfiles +~~~~~~~~~~~ + +* Use oldest_file_info.user as uploader (:phab:`T301768`) + +6.6.1 +----- + *21 September 2021* -### category -* Fix -match option +category +~~~~~~~~ +* Fix -match option -## 6.6.0 +6.6.0 +----- + *15 September 2021* -### add_text -* Add -major flag to disable minor edit flag when saving +add_text +~~~~~~~~ +* Add -major flag to disable minor edit flag when saving -## 6.5.0 +6.5.0 +----- + *05 August 2021* -### reflinks -* Don't ignore identical references with newline in ref content (:phab:`T286369`) -* L10N updates +reflinks +~~~~~~~~ +* Don’t ignore identical references with newline in ref content + (:phab:`T286369`) +* L10N updates -## 6.4.0 +6.4.0 +----- + *01 July 2021* -### general -* show a warning if pywikibot.__version__ is behind scripts.__version__ +general +~~~~~~~ -### addtext -* Deprecate get_text, put_text and add_text functions (:phab:`T284388`) -* Use AutomaticTWSummaryBot and NoRedirectPageBot bot class instead of functions (:phab:`T196851`) +* show a warning if pywikibot.__version_\_ is behind + scripts.__version_\_ -### blockpageschecker -* Script was unarchived +addtext +~~~~~~~ -### commonscat -* Enable multiple sites (:phab:`T57083`) -* Use new textlib.add_text function +* Deprecate get_text, put_text and add_text functions + (:phab:`T284388`) +* Use AutomaticTWSummaryBot and NoRedirectPageBot bot class instead of + functions (:phab:`T196851`) -### cosmetic_changes -* set -ignore option to CANCEL.MATCH by default (:phab:`T108446`) +blockpageschecker +~~~~~~~~~~~~~~~~~ -### fixing_redirects -* Add -overwrite option (:phab:`T235219`) +* Script was unarchived -### imagetransfer -* Skip pages which does not exist on source site (:phab:`T284414`) -* Use roundrobin_generators to combine multiple template inclusions -* Allow images existing in the shared repo (:phab:`T267535`) +commonscat +~~~~~~~~~~ -### template -* Do not try to initialze generator twice in TemplateRobot (:phab:`T284534`) +* Enable multiple sites (:phab:`T57083`) +* Use new textlib.add_text function -### update_script -* compat2core script was restored and renamed to update_script +cosmetic_changes +~~~~~~~~~~~~~~~~ -### version -* Show all mandatory dependecies +* set -ignore option to CANCEL.MATCH by default (:phab:`T108446`) +fixing_redirects +~~~~~~~~~~~~~~~~ -## 6.3.0 +* Add -overwrite option (:phab:`T235219`) + +imagetransfer +~~~~~~~~~~~~~ + +* Skip pages which does not exist on source site (:phab:`T284414`) +* Use roundrobin_generators to combine multiple template inclusions +* Allow images existing in the shared repo (:phab:`T267535`) + +template +~~~~~~~~ + +* Do not try to initialze generator twice in TemplateRobot + (:phab:`T284534`) + +update_script +~~~~~~~~~~~~~ + +* compat2core script was restored and renamed to update_script + +version +~~~~~~~ + +* Show all mandatory dependecies + +6.3.0 +----- + *31 May 2021* -### addtext -* -except option was removed in favour of commonly used -grepnot +addtext +~~~~~~~ -### archivebot -* Durations must to have a time unit +* -except option was removed in favour of commonly used -grepnot +archivebot +~~~~~~~~~~ -## 6.2.0 +* Durations must to have a time unit + +6.2.0 +----- + *28 May 2021* -### general -* image.py was restored -* nowcommons.py was restored -* i18n updates -* L10N updates +general +~~~~~~~ -### category -* dry parameter of CategoryAddBot will be removed +* image.py was restored +* nowcommons.py was restored +* i18n updates +* L10N updates -### commonscat -* Ignore InvalidTitleError (:phab:`T267742`) -* exit checkCommonscatLink method if target name is empty (:phab:`T282693`) +category +~~~~~~~~ -### fixing_redirects -* ValueError will be ignored (:phab:`T283403`, :phab:`T111513`) -* InterwikiRedirectPageError will be ignored (:phab:`T137754`) -* InvalidPageError will be ignored (:phab:`T280043`) +* dry parameter of CategoryAddBot will be removed -### reflinks -* Use consecutive reference numbers for autogenerated links +commonscat +~~~~~~~~~~ -### replace -* InvalidPageError will be ignored (:phab:`T280043`) +* Ignore InvalidTitleError (:phab:`T267742`) +* exit checkCommonscatLink method if target name is empty + (:phab:`T282693`) -### upload -* Support async chunked uploads (:phab:`T129216`) +fixing_redirects +~~~~~~~~~~~~~~~~ +* ValueError will be ignored (:phab:`T283403`, :phab:`T111513`) +* InterwikiRedirectPageError will be ignored (:phab:`T137754`) +* InvalidPageError will be ignored (:phab:`T280043`) -## 6.1.0 +reflinks +~~~~~~~~ + +* Use consecutive reference numbers for autogenerated links + +replace +~~~~~~~ + +* InvalidPageError will be ignored (:phab:`T280043`) + +upload +~~~~~~ + +* Support async chunked uploads (:phab:`T129216`) + +6.1.0 +----- + *17 April 2021* -### general -* commonscat.py was restored -* compat2core.py script was archived -* djvutext.py was restored -* interwiki.py was restored -* patrol.py was restored -* watchlist.py was restored +general +~~~~~~~ -### archivebot -* PageArchiver.maxsize must be defined before load_config() (:phab:`T277547`) -* Time period must have a qualifier +* commonscat.py was restored +* compat2core.py script was archived +* djvutext.py was restored +* interwiki.py was restored +* patrol.py was restored +* watchlist.py was restored -### imagetransfer -* Fix usage of -tofamily -tolang options (:phab:`T279232`) +archivebot +~~~~~~~~~~ -### misspelling -* Use the new DisambiguationRobot interface and options +* PageArchiver.maxsize must be defined before load_config() + (:phab:`T277547`) +* Time period must have a qualifier -### reflinks -* Catch urllib3.LocationParseError and skip link (:phab:`T280356`) -* L10N updates -* Avoid dupliate reference names (:phab:`T278040`) +imagetransfer +~~~~~~~~~~~~~ -### solve_disambiguation -* Keyword arguments are recommended if deriving the bot; opt option handler is used. +* Fix usage of -tofamily -tolang options (:phab:`T279232`) -### welcome -* Fix reporting bad account names +misspelling +~~~~~~~~~~~ +* Use the new DisambiguationRobot interface and options -## 6.0.0 +reflinks +~~~~~~~~ + +* Catch urllib3.LocationParseError and skip link (:phab:`T280356`) +* L10N updates +* Avoid dupliate reference names (:phab:`T278040`) + +solve_disambiguation +~~~~~~~~~~~~~~~~~~~~ + +* Keyword arguments are recommended if deriving the bot; opt option + handler is used. + +welcome +~~~~~~~ + +* Fix reporting bad account names + +6.0.0 +----- + *15 March 2021* -### general -* interwikidumps.py, cfd.py and featured.py scripts were deleted (:phab:`T223826`) -* Long time unused scripts were archived (:phab:`T223826`). Ask to recover if needed. -* pagegenerators.handle_args() is used in several scripts +general +~~~~~~~ -### archivebot -* Always take 'maxarticlesize' into account when saving (:phab:`T276937`) -* Remove deprecated parts +* interwikidumps.py, cfd.py and featured.py scripts were deleted + (:phab:`T223826`) +* Long time unused scripts were archived (:phab:`T223826`). Ask to + recover if needed. +* pagegenerators.handle_args() is used in several scripts -### category -* add 'namespaces' option to category 'listify' +archivebot +~~~~~~~~~~ -### commons_information -* New script to wrap Commons file descriptions in language templates +* Always take ‘maxarticlesize’ into account when saving + (:phab:`T276937`) +* Remove deprecated parts -### generate_family_file -* Ignore ssl certificate validation (:phab:`T265210`) +category +~~~~~~~~ -### login -* update help string +* add ‘namespaces’ option to category ‘listify’ -### maintenance -* Add a preload_sites.py script to preload site informations (:phab:`T226157`) +commons_information +~~~~~~~~~~~~~~~~~~~ -### reflinks -* Force pdf file to be closed (:phab:`T276747`) -* Fix http.fetch response data attribute -* Fix treat process flow +* New script to wrap Commons file descriptions in language templates -### replace -* Add replacement description to -summary message +generate_family_file +~~~~~~~~~~~~~~~~~~~~ -### replicate_wiki -* replace pages in all sites (:phab:`T275291`) +* Ignore ssl certificate validation (:phab:`T265210`) -### solve_disambiguation -* Deprecated methods were removed -* Positional arguments of DisambiguationRobot are deprecated, also some keywords were replaced +login +~~~~~ -### unusedfiles -* Update unusedfiles.py to add custom templates +* update help string +maintenance +~~~~~~~~~~~ -## 5.6.0 +* Add a preload_sites.py script to preload site informations + (:phab:`T226157`) + +reflinks +~~~~~~~~ + +* Force pdf file to be closed (:phab:`T276747`) +* Fix http.fetch response data attribute +* Fix treat process flow + +replace +~~~~~~~ + +* Add replacement description to -summary message + +replicate_wiki +~~~~~~~~~~~~~~ + +* replace pages in all sites (:phab:`T275291`) + +solve_disambiguation +~~~~~~~~~~~~~~~~~~~~ + +* Deprecated methods were removed +* Positional arguments of DisambiguationRobot are deprecated, also some + keywords were replaced + +unusedfiles +~~~~~~~~~~~ + +* Update unusedfiles.py to add custom templates + +5.6.0 +----- + *24 January 2021* -### general -* pagegenerators handleArg was renamed to handle_arg (:phab:`T271437`) -* i18n updates +general +~~~~~~~ -### add_text -* bugfix: str.join() expects an iterable not multiple args (:phab:`T272223`) +* pagegenerators handleArg was renamed to handle_arg + (:phab:`T271437`) +* i18n updates -### redirect -* pagegenerators -page option was implemented (:phab:`T100643`) -* pagegenerators namespace filter was implemented (:phab:`T234133`, :phab:`T271116`) +add_text +~~~~~~~~ -## weblinkchecker -* Deprecated LinkChecker class was removed +* bugfix: str.join() expects an iterable not multiple args + (:phab:`T272223`) +redirect +~~~~~~~~ -## 5.5.0 -*12 January 2021 +* pagegenerators -page option was implemented (:phab:`T100643`) +* pagegenerators namespace filter was implemented (:phab:`T234133`, + :phab:`T271116`) -### general -* i18n updates -* L10N updates +weblinkchecker +-------------- -### add_text -* -except option was renamed to -grepnot from pagegenerators +* Deprecated LinkChecker class was removed -### solve_disambiguation -* ignore ValueError when parsing a Link object (:phab:`T111513`) +5.5.0 +----- +\*12 January 2021 -## 5.4.0 +general +~~~~~~~ + +* i18n updates +* L10N updates + +add_text +~~~~~~~~ + +* -except option was renamed to -grepnot from pagegenerators + +solve_disambiguation +~~~~~~~~~~~~~~~~~~~~ + +* ignore ValueError when parsing a Link object (:phab:`T111513`) + +5.4.0 +----- + *2 January 2021* -### general -* i18n updates +general +~~~~~~~ -### replace -* Desupported ReplaceRobot.doReplacements method was removed +* i18n updates +replace +~~~~~~~ -## 5.3.0 +* Desupported ReplaceRobot.doReplacements method was removed + +5.3.0 +----- + *19 December 2020* -### data_ingestion -* Remove deprecated Photo.reader property and Photo.doSingle() method +data_ingestion +~~~~~~~~~~~~~~ -### replicate_wiki -* Remove deprecated namespace function +* Remove deprecated Photo.reader property and Photo.doSingle() method -### template -* remove deprecated XmlDumpTemplatePageGenerator +replicate_wiki +~~~~~~~~~~~~~~ +* Remove deprecated namespace function -## 5.2.0 +template +~~~~~~~~ + +* remove deprecated XmlDumpTemplatePageGenerator + +5.2.0 +----- + *10 December 2020* -### general -* Removed unsupported BadTitle Exception (:phab:`T267768`) -* Replaced PageNotSaved by PageSaveRelatedError (:phab:`T267821`) -* Update scripts to support Python 3.5+ only -* i18n updates -* L10N updates +general +~~~~~~~ -### basic -* Make BasicBot example a ConfigParserBot to explain the usage +* Removed unsupported BadTitle Exception (:phab:`T267768`) +* Replaced PageNotSaved by PageSaveRelatedError (:phab:`T267821`) +* Update scripts to support Python 3.5+ only +* i18n updates +* L10N updates -### clean_sandbox -* Fix TypeError (:phab:`T267717`) +basic +~~~~~ -### fixing_redirects -* Ignore RuntimeError for missing 'redirects' in api response (:phab:`T267567`) +* Make BasicBot example a ConfigParserBot to explain the usage -### imagetransfer -* Implement -tosite command and other improvements -* Do not use UploadRobot.run() with imagetransfer (:phab:`T267579`) +clean_sandbox +~~~~~~~~~~~~~ -### interwiki -* Use textfile for interwiki dumps and enable -restore:all option (:phab:`T74943`, :phab:`T213624`) +* Fix TypeError (:phab:`T267717`) -### makecat -* Use input_choice for options -* New option handling -* Other improvements +fixing_redirects +~~~~~~~~~~~~~~~~ -### revertbot -* Take rollbacktoken to revert (:phab:`T250509`) +* Ignore RuntimeError for missing ‘redirects’ in api response + (:phab:`T267567`) -### solve_disambiguation -* Write ignoring pages as a whole +imagetransfer +~~~~~~~~~~~~~ -### touch -* Fix available_options and purge options (:phab:`T268394`) +* Implement -tosite command and other improvements +* Do not use UploadRobot.run() with imagetransfer (:phab:`T267579`) -### weblinkchecker -* Fix AttributeError of HttpRequest (:phab:`T269821`) +interwiki +~~~~~~~~~ +* Use textfile for interwiki dumps and enable -restore:all option + (:phab:`T74943`, :phab:`T213624`) -## 5.1.0 +makecat +~~~~~~~ + +* Use input_choice for options +* New option handling +* Other improvements + +revertbot +~~~~~~~~~ + +* Take rollbacktoken to revert (:phab:`T250509`) + +solve_disambiguation +~~~~~~~~~~~~~~~~~~~~ + +* Write ignoring pages as a whole + +touch +~~~~~ + +* Fix available_options and purge options (:phab:`T268394`) + +weblinkchecker +~~~~~~~~~~~~~~ + +* Fix AttributeError of HttpRequest (:phab:`T269821`) + +5.1.0 +----- + *1 November 2020* -### general -* i18n updates -* switch to new OptionHandler interface (:phab:`T264721`) +general +~~~~~~~ -### change_pagelang -* New script was added +* i18n updates +* switch to new OptionHandler interface (:phab:`T264721`) -### download_dump -* Make `dumpdate` param work when using the script in Toolforge (:phab:`T266630`) +change_pagelang +~~~~~~~~~~~~~~~ -### imagetransfer -* Remove outdated "followRedirects" parameter from imagelinks(); treat instead of run method (:phab:`T266867`, :phab:`T196851`, :phab:`T171713`) +* New script was added -### interwiki -* Replace deprecated originPage by origin in Subjects +download_dump +~~~~~~~~~~~~~ -### misspelling -* Enable misspelling.py for several sites using wikidata (:phab:`T258859`, :phab:`T94681`) +* Make ``dumpdate`` param work when using the script in Toolforge + (:phab:`T266630`) -### noreferences -* Rename NoReferencesBot.run to treat (:phab:`T196851`, :phab:`T171713`) -* Use wikidata item instead of dropped MediaWiki message for default category (:phab:`T266413`) +imagetransfer +~~~~~~~~~~~~~ -### reflinks -* Derive ReferencesRobot from ExistingPageBot and NoRedirectPageBot -* Use chardet to find a valid encoding (266862) -* Rename ReferencesRobot.run to treat (:phab:`T196851`, :phab:`T171713`) -* Ignore duplication replacements inside templates (:phab:`T266411`) -* Fix edit summary (:phab:`T265968`) -* Add Server414Error in and close file after reading (:phab:`T266000`) -* Call ReferencesRobot.setup() (:phab:`T265928`) +* Remove outdated “followRedirects” parameter from imagelinks(); treat + instead of run method (:phab:`T266867`, :phab:`T196851`, + :phab:`T171713`) -### welcome -* Replace _COLORS and _MSGS dicts by Enum +interwiki +~~~~~~~~~ +* Replace deprecated originPage by origin in Subjects -## 5.0.0 +misspelling +~~~~~~~~~~~ + +* Enable misspelling.py for several sites using wikidata + (:phab:`T258859`, :phab:`T94681`) + +noreferences +~~~~~~~~~~~~ + +* Rename NoReferencesBot.run to treat (:phab:`T196851`, + :phab:`T171713`) +* Use wikidata item instead of dropped MediaWiki message for default + category (:phab:`T266413`) + +reflinks +~~~~~~~~ + +* Derive ReferencesRobot from ExistingPageBot and NoRedirectPageBot +* Use chardet to find a valid encoding (266862) +* Rename ReferencesRobot.run to treat (:phab:`T196851`, + :phab:`T171713`) +* Ignore duplication replacements inside templates (:phab:`T266411`) +* Fix edit summary (:phab:`T265968`) +* Add Server414Error in and close file after reading + (:phab:`T266000`) +* Call ReferencesRobot.setup() (:phab:`T265928`) + +welcome +~~~~~~~ + +* Replace \_COLORS and \_MSGS dicts by Enum + +5.0.0 +----- + *19 October 2020* -### general -* i18n updates -* L10N updates -* Remove deprecated use of fileUrl -* Remove ArgumentDeprecationWarning for several scripts +general +~~~~~~~ -### casechecker +* i18n updates +* L10N updates +* Remove deprecated use of fileUrl +* Remove ArgumentDeprecationWarning for several scripts + +casechecker +~~~~~~~~~~~ + * Split initializer and put getting whitelist to its own method -### checkimages -* Re-enable -sleep parameter (:phab:`T264521`) +checkimages +~~~~~~~~~~~ -### commonscat -* get commons category from wikibase (:phab:`T175207`) -* Adjust save counter (:phab:`T262772`) +* Re-enable -sleep parameter (:phab:`T264521`) -### flickrripper -* Improve option handling +commonscat +~~~~~~~~~~ -### imagecopy_self -* Improvements were made +* get commons category from wikibase (:phab:`T175207`) +* Adjust save counter (:phab:`T262772`) -### imagetransfer -* Do not encode str to bytes (:phab:`T265257`) +flickrripper +~~~~~~~~~~~~ -### match_images -* Improvements +* Improve option handling -### parser_function_count -Porting parser_function_count.py from compat to core/scripts (:phab:`T66878`) +imagecopy_self +~~~~~~~~~~~~~~ -### reflinks +* Improvements were made + +imagetransfer +~~~~~~~~~~~~~ + +* Do not encode str to bytes (:phab:`T265257`) + +match_images +~~~~~~~~~~~~ + +* Improvements + +parser_function_count +~~~~~~~~~~~~~~~~~~~~~ + +Porting parser_function_count.py from compat to core/scripts +(:phab:`T66878`) + +reflinks +~~~~~~~~ + decode byte-like object meta_content.group() (:phab:`T264575`) -### speedy_delete -* port speedy_delete.py to core (:phab:`T66880`) +speedy_delete +~~~~~~~~~~~~~ -### weblinkchecker -* Use ThreadList with weblinkchecker +* port speedy_delete.py to core (:phab:`T66880`) -### maintenance -* new maintenance script sorting_order was added -* new maintenance script update_linktrails was added +weblinkchecker +~~~~~~~~~~~~~~ +* Use ThreadList with weblinkchecker -## 4.3.0 +maintenance +~~~~~~~~~~~ + +* new maintenance script sorting_order was added +* new maintenance script update_linktrails was added + +4.3.0 +----- + *2 September 2020* -### general -* i18n updates +general +~~~~~~~ +* i18n updates -## 4.2.0 +4.2.0 +----- + *28 August 2020* -### general -* i18n updates +general +~~~~~~~ -### archivebot -* Determine whether counter matters only once +* i18n updates +archivebot +~~~~~~~~~~ -## 4.1.1 +* Determine whether counter matters only once + +4.1.1 +----- + *18 August 2020* -### general -* Add missing commas in string contants +general +~~~~~~~ +* Add missing commas in string contants -## 4.1.0 +4.1.0 +----- + *16 August 2020* -### general -* i18n updates +general +~~~~~~~ -### download_dump -* Move this script to script folder (:phab:`T123885`, :phab:`T184033`) +* i18n updates -## replace -* Show a FutureWarning for deprecated doReplacements method +download_dump +~~~~~~~~~~~~~ -## replicate_wiki -* Show a FutureWarning for deprecated namespace function +* Move this script to script folder (:phab:`T123885`, + :phab:`T184033`) -## template -* Show a FutureWarning for deprecated XmlDumpTemplatePageGenerator class +replace +------- +* Show a FutureWarning for deprecated doReplacements method -## 4.0.0 +replicate_wiki +-------------- + +* Show a FutureWarning for deprecated namespace function + +template +-------- + +* Show a FutureWarning for deprecated XmlDumpTemplatePageGenerator + class + +4.0.0 +----- + *4 August 2020* -### general -* Remove Python 2 related code (:phab:`T257399`) -* i18n updates -* L10N updates +general +~~~~~~~ -### archivebot -* Only mention archives where something was really archived -* Reset counter when "era" changes (:phab:`T215247`) -* Code improvements and cleanups -* Fix ShouldArchive type -* Refactor PageArchiver's main loop -* Move archiving logic to PageArchiver -* Fix str2size to allow space separators +* Remove Python 2 related code (:phab:`T257399`) +* i18n updates +* L10N updates -### cfd -* Script was archived and is no longer supported (:phab:`T223826`) +archivebot +~~~~~~~~~~ -### delete +* Only mention archives where something was really archived +* Reset counter when “era” changes (:phab:`T215247`) +* Code improvements and cleanups +* Fix ShouldArchive type +* Refactor PageArchiver’s main loop +* Move archiving logic to PageArchiver +* Fix str2size to allow space separators + +cfd +~~~ + +* Script was archived and is no longer supported (:phab:`T223826`) + +delete +~~~~~~ + * Use Dict in place of DefaultDict (:phab:`T257770`) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/812291 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: I12f696e0a365a4d32f6578c669daf79e518c8565 Gerrit-Change-Number: 812291 Gerrit-PatchSet: 4 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 0

[Gerrit] ...core[master]: [bugfix] Improve _get_option_with_fallback logic in harvest_template.py
by jenkins-bot (Code Review) 08 Jul '22

08 Jul '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/810938 ) Change subject: [bugfix] Improve _get_option_with_fallback logic in harvest_template.py ...................................................................... [bugfix] Improve _get_option_with_fallback logic in harvest_template.py Do not return False but True if local and default boolean options are True. Because the local option cannot be overridden by a False value it is surely intended to return True if the default is True even the local option was still False. Change-Id: I0384adb0b7529696fa29ddc4216177f80b38b6bf --- M scripts/harvest_template.py 1 file changed, 1 insertion(+), 5 deletions(-) Approvals: Matěj Suchánek: Looks good to me, approved Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/harvest_template.py b/scripts/harvest_template.py index 7bf679c..ab03f1b 100755 --- a/scripts/harvest_template.py +++ b/scripts/harvest_template.py @@ -258,11 +258,7 @@ .. seealso:: :class:`OptionHandler` """ - default = self.opt[option] - local = handler.opt[option] - if isinstance(default, bool) and isinstance(local, bool): - return default is not local - return local or default + return handler.opt[option] or self.opt[option] def treat_page_and_item(self, page: pywikibot.page.BasePage, -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/810938 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: I0384adb0b7529696fa29ddc4216177f80b38b6bf Gerrit-Change-Number: 810938 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

← Newer
1
...
6
7
8
9
10
11
12
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits July 2022