Pywikibot-commits September 2020

pywikibot-commits@lists.wikimedia.org

1 participants
110 discussions

[Gerrit] ...core[master]: [cleanup] Remove unicodecsv check in wikistats_tests.py
by jenkins-bot (Code Review) 05 Sep '20

05 Sep '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/621876 ) Change subject: [cleanup] Remove unicodecsv check in wikistats_tests.py ...................................................................... [cleanup] Remove unicodecsv check in wikistats_tests.py Also reorder imports in wikistats.py Change-Id: I791f5fb6c2ce6ffca8c9109d918a9ee956220ef6 --- M pywikibot/data/wikistats.py M tests/wikistats_tests.py 2 files changed, 9 insertions(+), 15 deletions(-) Approvals: Matěj Suchánek: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/wikistats.py b/pywikibot/data/wikistats.py index 5c2f0f4..b163d62 100644 --- a/pywikibot/data/wikistats.py +++ b/pywikibot/data/wikistats.py @@ -4,10 +4,10 @@ # (C) Pywikibot team, 2014-2020 # # Distributed under the terms of the MIT license. -import csv - from collections import defaultdict +from csv import DictReader from io import BytesIO, StringIO +from xml.etree import ElementTree import pywikibot from pywikibot.comms import http @@ -130,7 +130,7 @@ raw = self.raw_cached(table, 'csv') f = StringIO(raw.decode('utf8')) - reader = csv.DictReader(f) + reader = DictReader(f) data = list(reader) self._data['csv'][table] = data @@ -146,8 +146,6 @@ if table in self._data['xml']: return self._data['xml'][table] - from xml.etree import ElementTree - raw = self.raw_cached(table, 'xml') f = BytesIO(raw) tree = ElementTree.parse(f) diff --git a/tests/wikistats_tests.py b/tests/wikistats_tests.py index a68926e..5f67c0c 100644 --- a/tests/wikistats_tests.py +++ b/tests/wikistats_tests.py @@ -7,7 +7,9 @@ # import sys -from pywikibot.data.wikistats import WikiStats, csv +from contextlib import suppress + +from pywikibot.data.wikistats import WikiStats from tests.aspects import unittest, TestCase @@ -62,8 +64,6 @@ def test_csv(self): """Test CSV.""" - if not csv: - self.skipTest('unicodecsv not installed.') ws = WikiStats() data = ws.get_dict('wikipedia', 'csv') self.assertIsInstance(data, dict) @@ -72,8 +72,7 @@ self.assertGreater(int(data['en']['total']), int(data['en']['good'])) data = data['en'] self.assertTrue(all(isinstance(key, str) - for key in data.keys() - if key is not None)) + for key in data.keys() if key is not None)) self.assertIsInstance(data['total'], str) self.assertIn('prefix', data) self.assertIn('total', data) @@ -88,15 +87,12 @@ self.assertGreater(int(data['fr']['total']), int(data['fr']['good'])) data = data['fr'] self.assertTrue(all(isinstance(key, str) - for key in data.keys() - if key is not None)) + for key in data.keys() if key is not None)) self.assertIsInstance(data['total'], str) self.assertIn('prefix', data) self.assertIn('total', data) if __name__ == '__main__': # pragma: no cover - try: + with suppress(SystemExit): unittest.main() - except SystemExit: - pass -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/621876 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: I791f5fb6c2ce6ffca8c9109d918a9ee956220ef6 Gerrit-Change-Number: 621876 Gerrit-PatchSet: 2 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: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] Allow multiple types of contributors parameter given for revis...
by jenkins-bot (Code Review) 05 Sep '20

05 Sep '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/621881 ) Change subject: [IMPR] Allow multiple types of contributors parameter given for revision_count() ...................................................................... [IMPR] Allow multiple types of contributors parameter given for revision_count() - Currently contributors parameter of Page.revision_count() is either None or an iterable of username string. Now a single pywikibot.User or an iterable of pywikibot.User may be given as well as a single string as username. - Some tests added - Show a FutureWarning with contributingUsers because the result is not as described and the method is deprecated for 5 years already Change-Id: If7ef18690a9ab42c76cb22e28676fd2aaf8136a2 --- M pywikibot/page/__init__.py M tests/page_tests.py 2 files changed, 24 insertions(+), 12 deletions(-) Approvals: Matěj Suchánek: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index a286f29..bed8745 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -1834,7 +1834,7 @@ self.revisions(total=total, starttime=starttime, endtime=endtime)) - @deprecated('contributors()', since='20150206') + @deprecated('contributors().keys()', since='20150206', future_warning=True) @deprecated_args(step=True) def contributingUsers(self, total=None): """ @@ -1842,25 +1842,31 @@ @param total: iterate no more than this number of revisions in total - @rtype: set + @rtype: dict_keys """ return self.contributors(total=total).keys() - def revision_count(self, contributors=None): - """ - Determine number of edits from a set of contributors. + def revision_count(self, contributors=None) -> int: + """Determine number of edits from contributors. @param contributors: contributor usernames - @type contributors: iterable of str - + @type contributors: iterable of str or pywikibot.User, + a single pywikibot.User, a str or None @return: number of edits for all provided usernames - @rtype: int """ - if not contributors: - return len(list(self.revisions())) - cnt = self.contributors() - return sum(cnt[username] for username in contributors) + + if not contributors: + return sum(cnt.values()) + + if isinstance(contributors, User): + contributors = contributors.username + + if isinstance(contributors, str): + return cnt[contributors] + + return sum(cnt[user.username] if isinstance(user, User) else cnt[user] + for user in contributors) @deprecated('oldest_revision', since='20140421', future_warning=True) def getCreator(self): diff --git a/tests/page_tests.py b/tests/page_tests.py index e10dc23..c1b3900 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -932,6 +932,12 @@ cnt = mp.contributors() self.assertEqual(rev_count, sum(cnt.values())) + user, count = cnt.most_common(1)[0] + self.assertEqual(mp.revision_count([user]), count) + self.assertEqual(mp.revision_count(user), count) + self.assertEqual(mp.revision_count(pywikibot.User(self.site, user)), + count) + top_two = cnt.most_common(2) self.assertIsInstance(top_two, list) self.assertLength(top_two, 2) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/621881 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: If7ef18690a9ab42c76cb22e28676fd2aaf8136a2 Gerrit-Change-Number: 621881 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [py3] remove Python 2 code from tests/__init__.py
by jenkins-bot (Code Review) 05 Sep '20

05 Sep '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/621865 ) Change subject: [py3] remove Python 2 code from tests/__init__.py ...................................................................... [py3] remove Python 2 code from tests/__init__.py Change-Id: I98672b75dd0f4b935f71a176e5c1fb3b5682ee35 --- M tests/__init__.py 1 file changed, 19 insertions(+), 29 deletions(-) Approvals: Matěj Suchánek: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/__init__.py b/tests/__init__.py index 628cfe0..b6fd569 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -5,40 +5,35 @@ # # Distributed under the terms of the MIT license. # -from __future__ import (absolute_import, division, - print_function, unicode_literals) - __all__ = ( 'requests', 'unittest', 'TestRequest', 'patch_request', 'unpatch_request', 'mock', 'Mock', 'MagicMock', 'patch') import functools -from itertools import chain import os import unittest -from unittest.util import safe_repr import warnings +from contextlib import suppress +from itertools import chain +from unittest import mock +from unittest.mock import MagicMock, Mock, patch +from unittest.util import safe_repr + # Verify that the unit tests have a base working environment: # - requests is mandatory # however if unavailable this will fail on use; see pywikibot/tools.py # - mwparserfromhell is optional, so is only imported in textlib_tests import requests -from pywikibot import config import pywikibot.data.api + +from pywikibot import config from pywikibot.data.api import CachedRequest from pywikibot.data.api import Request as _original_Request from pywikibot.tools import PYTHON_VERSION -try: - import unittest.mock as mock - from unittest.mock import MagicMock, Mock, patch -except ImportError: - import mock - from mock import MagicMock, Mock, patch - assert safe_repr # pyflakes workaround _root_dir = os.path.split(os.path.split(__file__)[0])[0] @@ -292,7 +287,7 @@ def __init__(self, *args, **kwargs): """Initializer.""" - super(TestRequest, self).__init__(0, *args, **kwargs) + super().__init__(0, *args, **kwargs) @classmethod def create_simple(cls, **kwargs): @@ -306,25 +301,22 @@ def _load_cache(self): """Return whether the cache can be used.""" - if not super(TestRequest, self)._load_cache(): - global cache_misses + global cache_hits + global cache_misses + + if not super()._load_cache(): cache_misses += 1 return False # tokens need careful management in the cache # and can't be aggressively cached. # FIXME: remove once 'badtoken' is reliably handled in api.py - if 'intoken' in self._uniquedescriptionstr(): - self._data = None - return False + for desc in ('intoken', 'lgpassword'): + if desc in self._uniquedescriptionstr(): + self._data = None + return False - if 'lgpassword' in self._uniquedescriptionstr(): - self._data = None - return False - - global cache_hits cache_hits += 1 - return True def _write_cache(self, data): @@ -335,7 +327,7 @@ if 'lgpassword' in self._uniquedescriptionstr(): return - return super(TestRequest, self)._write_cache(data) + return super()._write_cache(data) original_expired = None @@ -356,7 +348,5 @@ if __name__ == '__main__': # pragma: no cover - try: + with suppress(SystemExit): unittest.main() - except SystemExit: - pass -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/621865 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: I98672b75dd0f4b935f71a176e5c1fb3b5682ee35 Gerrit-Change-Number: 621865 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [cleanup] Remove desupported UnicodeMixin and IteratorMixin
by jenkins-bot (Code Review) 05 Sep '20

05 Sep '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/620498 ) Change subject: [cleanup] Remove desupported UnicodeMixin and IteratorMixin ...................................................................... [cleanup] Remove desupported UnicodeMixin and IteratorMixin Also remove py2_encode_utf_8 previously used by UnicodeMixin Change-Id: I0dd16f4d6e8e3a6cb35e61cd3cdee5267e25739d --- M pywikibot/__init__.py M pywikibot/tools/__init__.py 2 files changed, 9 insertions(+), 39 deletions(-) Approvals: Matěj Suchánek: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 563e91d..2e99c51 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -65,7 +65,6 @@ MediaWikiVersion as _MediaWikiVersion, redirect_func, ModuleDeprecationWrapper as _ModuleDeprecationWrapper, - _UnicodeMixin as UnicodeMixin, ) from pywikibot.tools.formatter import color_format @@ -93,15 +92,15 @@ 'InvalidTitle', 'IsNotRedirectPage', 'IsRedirectPage', 'ItemPage', 'Link', 'LockedNoPage', 'LockedPage', 'log', 'NoCreateError', 'NoMoveTarget', 'NoPage', 'NoSuchSite', 'NoUsername', 'NoWikibaseEntity', - 'OtherPageSaveError', 'output', - 'Page', 'PageCreatedConflict', 'PageDeletedConflict', 'PageNotSaved', - 'PageRelatedError', 'PageSaveRelatedError', 'PropertyPage', - 'QuitKeyboardInterrupt', 'SectionError', 'Server504Error', 'ServerError', - 'showHelp', 'Site', 'SiteDefinitionError', 'SiteLink', - 'SpamblacklistError', 'stdout', 'TitleblacklistError', 'translate', 'ui', - 'unicode2html', 'UnicodeMixin', 'UnknownExtension', 'UnknownFamily', - 'UnknownSite', 'UnsupportedPage', 'UploadWarning', 'url2unicode', 'User', - 'UserBlocked', 'warning', 'WikiBaseError', 'WikidataBot', + 'OtherPageSaveError', 'output', 'Page', 'PageCreatedConflict', + 'PageDeletedConflict', 'PageNotSaved', 'PageRelatedError', + 'PageSaveRelatedError', 'PropertyPage', 'QuitKeyboardInterrupt', + 'SectionError', 'Server504Error', 'ServerError', 'showHelp', 'Site', + 'SiteDefinitionError', 'SiteLink', 'SpamblacklistError', 'stdout', + 'TitleblacklistError', 'translate', 'ui', 'unicode2html', + 'UnknownExtension', 'UnknownFamily', 'UnknownSite', 'UnsupportedPage', + 'UploadWarning', 'url2unicode', 'User', 'UserBlocked', 'warning', + 'WikiBaseError', 'WikidataBot', ) __all__ += textlib_methods @@ -1429,5 +1428,3 @@ wrapper._add_deprecated_attr('__release__', __version__, replacement_name='pywikibot.__version__', since='20200707') -wrapper._add_deprecated_attr('UnicodeMixin', replacement_name='', - since='20200723', future_warning=True) diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index 0fe224e..a58c064 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -1782,22 +1782,6 @@ return open_archive(filename, use_extension=use_extension) -class IteratorNextMixin(Iterator): - - """DEPRECATED. Backwards compatibility for Iterators.""" - - pass - - -class _UnicodeMixin: - - """DEPRECATED. Mixin class to add __str__ method in Python 2 or 3.""" - - def __str__(self): - """Return the unicode representation as the str representation.""" - return self.__unicode__() - - @deprecated('bot_choice.Option and its subclasses', since='20181217') def concat_options(message, line_length, options): """DEPRECATED. Concatenate options.""" @@ -1822,18 +1806,7 @@ return '{0} ({1}):'.format(message, option_msg) -@deprecated(since='20200723', future_warning=True) -def py2_encode_utf_8(func): - """Decorator to optionally encode the string result of func on Python 2.""" - return func - - wrapper = ModuleDeprecationWrapper(__name__) -wrapper._add_deprecated_attr('UnicodeMixin', _UnicodeMixin, - replacement_name='', - since='20200723', future_warning=True) -wrapper._add_deprecated_attr('IteratorNextMixin', replacement_name='', - since='20200723', future_warning=True) wrapper._add_deprecated_attr('getargspec', inspect.getargspec, since='20200712', future_warning=True) wrapper._add_deprecated_attr('ArgSpec', inspect.ArgSpec, -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/620498 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: I0dd16f4d6e8e3a6cb35e61cd3cdee5267e25739d Gerrit-Change-Number: 620498 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Huji <huji.huji(a)gmail.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [4.3.1] Prepare next release
by jenkins-bot (Code Review) 02 Sep '20

02 Sep '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/623801 ) Change subject: [4.3.1] Prepare next release ...................................................................... [4.3.1] Prepare next release Change-Id: I0397e2c9febf570a45597eebb95bbafcef4e9990 --- M HISTORY.rst M ROADMAP.rst M pywikibot/__metadata__.py 3 files changed, 13 insertions(+), 5 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/HISTORY.rst b/HISTORY.rst index fef1f28..288065f 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,6 +1,17 @@ Release history =============== +4.3.0 +----- + +*2 September 2020* + +* Don't check for valid Family/Site if running generate_user_files.py (T261771) +* Remove socket_timeout fix in config2.py introduced with T103069 +* Prevent huge traceback from underlying python libraries (T253236) +* Localisation updates + + 4.2.0 ----- diff --git a/ROADMAP.rst b/ROADMAP.rst index f2ac9ee..9561aaa 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,10 +1,7 @@ Current release changes ~~~~~~~~~~~~~~~~~~~~~~~ -* Don't check for valid Family/Site if running generate_user_files.py (T261771) -* Remove socket_timeout fix in config2.py introduced with T103069 -* Prevent huge traceback from underlying python libraries (T253236) -* Localisation updates +* (no changes yet) Future release notes diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py index 9d869c7..c87a503 100644 --- a/pywikibot/__metadata__.py +++ b/pywikibot/__metadata__.py @@ -6,7 +6,7 @@ # Distributed under the terms of the MIT license. # __name__ = 'pywikibot' -__version__ = '4.3.0' +__version__ = '4.3.1.dev0' __description__ = 'Python MediaWiki Bot Framework' __maintainer__ = 'The Pywikibot team' __maintainer_email__ = 'pywikibot(a)lists.wikimedia.org' -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/623801 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: I0397e2c9febf570a45597eebb95bbafcef4e9990 Gerrit-Change-Number: 623801 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[stable]: Merge branch 'master' into stable
by jenkins-bot (Code Review) 02 Sep '20

02 Sep '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/623799 ) Change subject: Merge branch 'master' into stable ...................................................................... Merge branch 'master' into stable Change-Id: I843bebfbbe698e478bd0e7b54db6f7c4cf76d08e --- 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/623799 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: stable Gerrit-Change-Id: I843bebfbbe698e478bd0e7b54db6f7c4cf76d08e Gerrit-Change-Number: 623799 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [4.3] Publish 4.3.0 due to T261771
by jenkins-bot (Code Review) 02 Sep '20

02 Sep '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/623794 ) Change subject: [4.3] Publish 4.3.0 due to T261771 ...................................................................... [4.3] Publish 4.3.0 due to T261771 Change-Id: I989ac35922137f964c38e6adb4f23647e7ea2771 --- M ROADMAP.rst M pywikibot/__metadata__.py M pywikibot/families/wikinews_family.py M pywikibot/families/wikipedia_family.py M pywikibot/families/wikiquote_family.py M pywikibot/families/wikisource_family.py M pywikibot/families/wikivoyage_family.py M pywikibot/families/wiktionary_family.py 8 files changed, 20 insertions(+), 17 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/ROADMAP.rst b/ROADMAP.rst index 9561aaa..f2ac9ee 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,7 +1,10 @@ Current release changes ~~~~~~~~~~~~~~~~~~~~~~~ -* (no changes yet) +* Don't check for valid Family/Site if running generate_user_files.py (T261771) +* Remove socket_timeout fix in config2.py introduced with T103069 +* Prevent huge traceback from underlying python libraries (T253236) +* Localisation updates Future release notes diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py index 6eb790e..9d869c7 100644 --- a/pywikibot/__metadata__.py +++ b/pywikibot/__metadata__.py @@ -6,7 +6,7 @@ # Distributed under the terms of the MIT license. # __name__ = 'pywikibot' -__version__ = '4.2.1.dev0' +__version__ = '4.3.0' __description__ = 'Python MediaWiki Bot Framework' __maintainer__ = 'The Pywikibot team' __maintainer_email__ = 'pywikibot(a)lists.wikimedia.org' diff --git a/pywikibot/families/wikinews_family.py b/pywikibot/families/wikinews_family.py index 8b704ba..f5ee8f4 100644 --- a/pywikibot/families/wikinews_family.py +++ b/pywikibot/families/wikinews_family.py @@ -21,7 +21,7 @@ ] languages_by_size = [ - 'sr', 'ru', 'fr', 'en', 'pt', 'pl', 'de', 'zh', 'es', 'it', 'ar', 'cs', + 'ru', 'sr', 'fr', 'en', 'pt', 'pl', 'de', 'zh', 'es', 'it', 'ar', 'cs', 'ca', 'nl', 'el', 'ta', 'sv', 'uk', 'fa', 'fi', 'ro', 'li', 'tr', 'ja', 'eo', 'sq', 'no', 'ko', 'bg', 'bs', 'he', ] diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index d16460d..67319bc 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -33,28 +33,28 @@ 'no', 'ko', 'fi', 'hu', 'cs', 'sh', 'ro', 'zh-min-nan', 'eu', 'tr', 'ms', 'eo', 'ce', 'hy', 'he', 'bg', 'da', 'azb', 'sk', 'kk', 'min', 'hr', 'et', 'lt', 'be', 'el', 'az', 'simple', 'sl', 'gl', 'ur', 'nn', - 'hi', 'ka', 'th', 'uz', 'la', 'cy', 'ta', 'tt', 'vo', 'mk', 'ast', - 'lv', 'tg', 'zh-yue', 'bn', 'mg', 'af', 'oc', 'bs', 'sq', 'ky', 'nds', - 'new', 'be-tarask', 'ml', 'te', 'tl', 'br', 'pms', 'su', 'mr', 'sw', + 'hi', 'ka', 'th', 'uz', 'tt', 'la', 'cy', 'ta', 'vo', 'mk', 'ast', + 'lv', 'tg', 'zh-yue', 'bn', 'af', 'mg', 'oc', 'bs', 'sq', 'ky', 'nds', + 'new', 'be-tarask', 'ml', 'te', 'tl', 'br', 'pms', 'mr', 'su', 'sw', 'ht', 'lb', 'sco', 'vec', 'jv', 'pnb', 'ga', 'ba', 'szl', 'is', 'my', 'fy', 'cv', 'lmo', 'wuu', 'an', 'pa', 'ne', 'yo', 'bar', 'ku', 'diq', 'io', 'gu', 'als', 'ckb', 'kn', 'scn', 'bpy', 'qu', 'ia', 'mn', 'bat-smg', 'or', 'nv', 'si', 'cdo', 'ilo', 'gd', 'am', 'yi', 'nap', - 'bug', 'wa', 'xmf', 'sd', 'hsb', 'mai', 'map-bms', 'fo', 'mzn', 'li', + 'bug', 'wa', 'xmf', 'sd', 'mai', 'hsb', 'map-bms', 'fo', 'mzn', 'li', 'sah', 'eml', 'os', 'ps', 'sa', 'frr', 'bcl', 'zh-classical', 'ace', 'mrj', 'mhr', 'hif', 'hak', 'roa-tara', 'avk', 'pam', 'gor', 'hyw', 'km', 'nso', 'rue', 'se', 'crh', 'bh', 'shn', 'vls', 'as', 'mi', 'nds-nl', 'nah', 'sc', 'vep', 'gan', 'myv', 'ab', 'glk', 'bo', 'sn', - 'co', 'so', 'tk', 'fiu-vro', 'lrc', 'csb', 'kv', 'ha', 'ie', 'gv', - 'udm', 'pcd', 'ay', 'zea', 'kab', 'nrm', 'sat', 'ug', 'lij', 'kw', - 'lez', 'stq', 'frp', 'lfn', 'zu', 'gn', 'mwl', 'gom', 'rm', 'ban', + 'co', 'tk', 'so', 'fiu-vro', 'lrc', 'csb', 'kv', 'ha', 'ie', 'gv', + 'udm', 'pcd', 'ay', 'kab', 'zea', 'nrm', 'sat', 'ug', 'lij', 'kw', + 'lez', 'frp', 'stq', 'lfn', 'zu', 'gn', 'mwl', 'ban', 'gom', 'rm', 'mt', 'lo', 'lad', 'koi', 'fur', 'olo', 'dty', 'ang', 'dsb', 'bjn', 'ext', 'ln', 'cbk-zam', 'dv', 'ksh', 'gag', 'pfl', 'tyv', 'pag', 'pi', - 'av', 'awa', 'haw', 'bxr', 'ary', 'xal', 'krc', 'pap', 'za', 'pdc', + 'av', 'awa', 'ary', 'haw', 'bxr', 'xal', 'krc', 'pap', 'za', 'pdc', 'kaa', 'rw', 'szy', 'arc', 'to', 'nov', 'jam', 'tpi', 'kbp', 'kbd', 'ig', 'na', 'tet', 'inh', 'wo', 'tcy', 'ki', 'jbo', 'atj', 'roa-rup', - 'bi', 'lbe', 'kg', 'ty', 'lg', 'mdf', 'srn', 'xh', 'gcr', 'ltg', 'fj', - 'chr', 'ak', 'sm', 'lld', 'kl', 'om', 'got', 'pih', 'cu', 'ny', 'tn', + 'bi', 'lbe', 'kg', 'ty', 'lg', 'mdf', 'srn', 'xh', 'fj', 'gcr', 'ltg', + 'chr', 'lld', 'ak', 'sm', 'om', 'kl', 'got', 'pih', 'cu', 'ny', 'tn', 'tw', 'nqo', 'st', 'ts', 'rmy', 'bm', 'mnw', 'chy', 'rn', 'tum', 'ss', 'ch', 'iu', 'pnt', 'ady', 'ks', 've', 'ee', 'ik', 'ff', 'sg', 'dz', 'ti', 'cr', 'din', diff --git a/pywikibot/families/wikiquote_family.py b/pywikibot/families/wikiquote_family.py index 1f2c29a..bc3ff56 100644 --- a/pywikibot/families/wikiquote_family.py +++ b/pywikibot/families/wikiquote_family.py @@ -29,7 +29,7 @@ languages_by_size = [ 'en', 'it', 'pl', 'ru', 'cs', 'fa', 'de', 'pt', 'es', 'fr', 'uk', 'he', - 'sk', 'bs', 'tr', 'ca', 'fi', 'sl', 'az', 'lt', 'eo', 'zh', 'bg', 'hr', + 'sk', 'bs', 'tr', 'ca', 'fi', 'az', 'sl', 'lt', 'eo', 'zh', 'bg', 'hr', 'hy', 'ar', 'el', 'su', 'id', 'nn', 'et', 'sv', 'li', 'hu', 'ko', 'nl', 'ja', 'la', 'ta', 'sah', 'sr', 'gu', 'gl', 'th', 'ur', 'te', 'be', 'cy', 'no', 'ml', 'sq', 'kn', 'ro', 'ku', 'eu', 'uz', 'hi', 'ka', 'da', diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index 221f3c9..ba329cb 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -28,7 +28,7 @@ languages_by_size = [ 'pl', 'en', 'ru', 'de', 'fr', 'zh', 'he', 'it', 'es', 'ar', 'uk', 'cs', 'mul', 'pt', 'gu', 'sr', 'fa', 'hu', 'sv', 'ml', 'bn', 'ko', 'sa', - 'hy', 'sl', 'te', 'el', 'ta', 'ro', 'fi', 'ja', 'th', 'nap', 'vi', + 'sl', 'hy', 'te', 'ta', 'el', 'ro', 'fi', 'ja', 'th', 'nap', 'vi', 'az', 'tr', 'br', 'la', 'ca', 'nl', 'kn', 'hr', 'eo', 'no', 'is', 'vec', 'pms', 'et', 'be', 'da', 'id', 'lij', 'mk', 'yi', 'hi', 'mr', 'bg', 'as', 'li', 'lt', 'eu', 'or', 'pa', 'gl', 'bs', 'sah', 'sk', diff --git a/pywikibot/families/wikivoyage_family.py b/pywikibot/families/wikivoyage_family.py index 54ea424..d99caa9 100644 --- a/pywikibot/families/wikivoyage_family.py +++ b/pywikibot/families/wikivoyage_family.py @@ -17,7 +17,7 @@ languages_by_size = [ 'en', 'de', 'pl', 'it', 'fa', 'fr', 'ru', 'zh', 'nl', 'pt', 'es', 'he', - 'vi', 'fi', 'sv', 'el', 'ro', 'uk', 'bn', 'ps', 'hi', 'ja', + 'vi', 'fi', 'sv', 'el', 'ro', 'uk', 'bn', 'ps', 'ja', 'hi', ] category_redirect_templates = { diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index c49271d..27f0038 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -38,7 +38,7 @@ 'zh-min-nan', 'he', 'shn', 'scn', 'tl', 'pa', 'sw', 'fy', 'bn', 'nn', 'lv', 'sq', 'ka', 'co', 'mn', 'pnb', 'sl', 'min', 'lb', 'nds', 'bs', 'nah', 'sa', 'kk', 'ms', 'km', 'vec', 'tk', 'mk', 'be', 'sm', 'hsb', - 'yue', 'gd', 'ga', 'shy', 'an', 'wo', 'gom', 'ang', 'ia', 'tt', 'mt', + 'yue', 'gd', 'shy', 'ga', 'an', 'wo', 'gom', 'ang', 'ia', 'tt', 'mt', 'sd', 'gn', 'mr', 'ie', 'so', 'fo', 'csb', 'ug', 'st', 'roa-rup', 'si', 'hif', 'zu', 'kl', 'su', 'ay', 'mi', 'jbo', 'ln', 'yi', 'gu', 'na', 'gv', 'kw', 'tpi', 'rw', 'ts', 'ne', 'om', 'qu', 'ss', 'ha', 'iu', -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/623794 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: I989ac35922137f964c38e6adb4f23647e7ea2771 Gerrit-Change-Number: 623794 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] category redirect: use "→" (→) instead of "->"
by jenkins-bot (Code Review) 02 Sep '20

02 Sep '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/623555 ) Change subject: [IMPR] category_redirect: use "→" (→) instead of "->" ...................................................................... [IMPR] category_redirect: use "→" (→) instead of "->" Looks better in wiki pages. Change-Id: I504144c9b5a10886902253ea17afc6910b7d37ec --- M scripts/category_redirect.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ammarpad: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py index 6e9b208..0931e60 100755 --- a/scripts/category_redirect.py +++ b/scripts/category_redirect.py @@ -354,7 +354,7 @@ # make sure every redirect has a record entry record[cat_title] = {today: None} try: - newredirs.append('*# {} -> {}'.format( + newredirs.append('*# {} → {}'.format( cat.title(as_link=True, textlink=True), cat.getCategoryRedirectTarget().title( as_link=True, textlink=True))) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/623555 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: I504144c9b5a10886902253ea17afc6910b7d37ec Gerrit-Change-Number: 623555 Gerrit-PatchSet: 3 Gerrit-Owner: MarcoAurelio <maurelio(a)tools.wmflabs.org> Gerrit-Reviewer: Ammarpad <ammarpad(a)yahoo.com> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Legoktm <legoktm(a)member.fsf.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [bugfix] Don't check for valid Family/Site if running generate_user_f...
by jenkins-bot (Code Review) 02 Sep '20

02 Sep '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/623647 ) Change subject: [bugfix] Don't check for valid Family/Site if running generate_user_files.py ...................................................................... [bugfix] Don't check for valid Family/Site if running generate_user_files.py Bug: T261771 Change-Id: Id1579a9f11423bd52385a9899be57841cc5f8e1a --- M pywikibot/bot.py 1 file changed, 6 insertions(+), 5 deletions(-) Approvals: BryanDavis: Looks good to me, but someone else must approve Matěj Suchánek: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index dad67ad..8b1675a 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -874,11 +874,12 @@ # argument not global -> specific bot script will take care non_global_args.append(arg) - try: - pywikibot.Site() - except (UnknownFamily, UnknownSite): - pywikibot.exception() - sys.exit(1) + if calledModuleName() != 'generate_user_files': # T261771 + try: + pywikibot.Site() + except (UnknownFamily, UnknownSite): + pywikibot.exception() + sys.exit(1) if username: config.usernames[config.family][config.mylang] = username -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/623647 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: Id1579a9f11423bd52385a9899be57841cc5f8e1a Gerrit-Change-Number: 623647 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: BryanDavis <bdavis(a)wikimedia.org> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [bugfix] Remove socket_timeout fix in config2.py
by jenkins-bot (Code Review) 01 Sep '20

01 Sep '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/623592 ) Change subject: [bugfix] Remove socket_timeout fix in config2.py ...................................................................... [bugfix] Remove socket_timeout fix in config2.py requests >= 2.20.1 is required and using requests < 2.4.0 is on bot owner's own risk. The version is checked since March 2020 and it is no longer needed to fix socket_timeout value for compatibility with this very outdated requests version published before August 2014. Removing this fix should solve T261748 probably. Bug: T261748 Change-Id: I644efed987a1e102b9fb0fc62d7f510a49bc1232 --- M pywikibot/config2.py 1 file changed, 1 insertion(+), 10 deletions(-) Approvals: Matěj Suchánek: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/config2.py b/pywikibot/config2.py index 3fd95a6..a6ef6ef 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -45,10 +45,8 @@ import sys import types -from distutils.version import StrictVersion from locale import getdefaultlocale from os import getenv, environ -from requests import __version__ as requests_version from textwrap import fill from warnings import warn @@ -784,7 +782,7 @@ # DO NOT set to None to disable timeouts. Otherwise this may freeze your # script. # You may assign either a tuple of two int or float values for connection and -# read timeout, or a single value for both in a tuple (since requests 2.4.0). +# read timeout, or a single value for both in a tuple. socket_timeout = (6.05, 45) @@ -1131,13 +1129,6 @@ "Defaulting to family='wikipedia' and mylang='test'.") mylang = 'test' -# Fix up socket_timeout -# Older requests library expect a single value whereas newer versions also -# accept a tuple (connect timeout, read timeout). -if (isinstance(socket_timeout, tuple) - and StrictVersion(requests_version) < StrictVersion('2.4.0')): - socket_timeout = max(socket_timeout) - # SECURITY WARNINGS if (not ignore_file_security_warnings and private_files_permission & (stat.S_IRWXG | stat.S_IRWXO) != 0): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/623592 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: I644efed987a1e102b9fb0fc62d7f510a49bc1232 Gerrit-Change-Number: 623592 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits September 2020