Pywikibot-commits September 2022

pywikibot-commits@lists.wikimedia.org

1 participants
125 discussions

[Gerrit] ...core[master]: [tests] create DISPLAY environment variable to run tkinter tests

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/831091 ) Change subject: [tests] create DISPLAY environment variable to run tkinter tests ...................................................................... [tests] create DISPLAY environment variable to run tkinter tests Change-Id: I912d9a5ad72231033c1fb6fddcfd773b359ec74f --- M tests/tk_tests.py 1 file changed, 25 insertions(+), 5 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/tk_tests.py b/tests/tk_tests.py index 58a283d..f94dffd 100755 --- a/tests/tk_tests.py +++ b/tests/tk_tests.py @@ -5,6 +5,7 @@ # # Distributed under the terms of the MIT license. # +import os import unittest from contextlib import suppress @@ -12,12 +13,33 @@ from tests.aspects import DefaultSiteTestCase, TestCase, require_modules -class TestTkdialog(TestCase): +class TkinterTestsBase(TestCase): - """Test Tkdialog.""" + """TestCase base for Tkinter tests.""" net = True + @classmethod + def setUpClass(cls): + """Set virtual display environment.""" + super().setUpClass() + cls.env = os.environ.get('DISPLAY') + os.environ['DISPLAY'] = ':0.0' + + @classmethod + def tearDownClass(cls): + """Restore the display environment value.""" + if not cls.env: + del os.environ['DISPLAY'] + else: + os.environ['DISPLAY'] = cls.env + super().tearDownClass() + + +class TestTkdialog(TkinterTestsBase): + + """Test Tkdialog.""" + def testTkdialog(self): """Test Tk dialog.""" try: @@ -27,12 +49,10 @@ pywikibot.warning(e) -class TestTkinter(DefaultSiteTestCase): +class TestTkinter(TkinterTestsBase, DefaultSiteTestCase): """Test Tkinter.""" - net = True - def testTkinter(self): """Test Tkinter window.""" root = tkinter.Tk() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/831091 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: I912d9a5ad72231033c1fb6fddcfd773b359ec74f Gerrit-Change-Number: 831091 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 8 months

[Gerrit] ...core[master]: [tests] Remove PYWIKIBOT_TEST_GUI variable

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/831065 ) Change subject: [tests] Remove PYWIKIBOT_TEST_GUI variable ...................................................................... [tests] Remove PYWIKIBOT_TEST_GUI variable Remove PYWIKIBOT_TEST_GUI variable which isn't used by any test. Skip tests if tkinter module is not installed. Change-Id: I092214361bda86f5adb6fb425a6486f1c151b36e --- M tests/tk_tests.py 1 file changed, 6 insertions(+), 11 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/tk_tests.py b/tests/tk_tests.py index a746cee..58a283d 100755 --- a/tests/tk_tests.py +++ b/tests/tk_tests.py @@ -5,18 +5,11 @@ # # Distributed under the terms of the MIT license. # -import os import unittest from contextlib import suppress import pywikibot -from tests.aspects import DefaultSiteTestCase, TestCase - - -if os.environ.get('PYWIKIBOT_TEST_GUI', '0') == '1': - import tkinter - - from pywikibot.userinterfaces.gui import EditBoxWindow, Tkdialog +from tests.aspects import DefaultSiteTestCase, TestCase, require_modules class TestTkdialog(TestCase): @@ -53,10 +46,12 @@ self.assertIsNone(v) +@require_modules('tkinter') def setUpModule(): - """Skip Travis tests if PYWIKIBOT_TEST_GUI variable is not set.""" - if os.environ.get('PYWIKIBOT_TEST_GUI', '0') != '1': - raise unittest.SkipTest('Tkinter tests are disabled on Travis-CI') + """Skip tests if tkinter is not installed. Otherwise import it.""" + global EditBoxWindow, Tkdialog, tkinter + import tkinter + from pywikibot.userinterfaces.gui import EditBoxWindow, Tkdialog if __name__ == '__main__': # pragma: no cover -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/831065 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: I092214361bda86f5adb6fb425a6486f1c151b36e Gerrit-Change-Number: 831065 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 8 months

[Gerrit] ...core[master]: [doc] Add description for PYWIKIBOT_TEST_AUTORUN and PYWIKIBOT_TEST_M...

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/831060 ) Change subject: [doc] Add description for PYWIKIBOT_TEST_AUTORUN and PYWIKIBOT_TEST_MODULES ...................................................................... [doc] Add description for PYWIKIBOT_TEST_AUTORUN and PYWIKIBOT_TEST_MODULES Change-Id: Iae2b53210eebc3183f578603649cfe20232f7a9b --- M tests/README.rst M tests/script_tests.py 2 files changed, 20 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/README.rst b/tests/README.rst index f53fdd6..cbaee97 100644 --- a/tests/README.rst +++ b/tests/README.rst @@ -105,11 +105,29 @@ Environment variables ===================== +**PYWIKIBOT_TEST_AUTORUN** + Enable script tests running automatically without specifying a generator. + The scripts are listed in :attr:`tests.script_tests.auto_run_script_list`. + Currently only *deeptest* uses it. + +**PYWIKIBOT_TEST_MODULES** + Only run tests given with this environment variable. Multiple tests must be + separated by a ``,`` without any white space. Available library tests are + listed in :ref:`Library tests` and script tests can be found in + :ref:`Script tests`. To enable only :mod:`tests.site_tests` and + :mod:`tests.wikibase_tests` set the environment variable as:: + + PYWIKIBOT_TEST_MODULES=site,wikibase + + .. note:: test names must be given without subsequent ``_tests``. + **PYWIKIBOT_TEST_RUNNING** This environment variable skips tests instead of raising :exc:`exceptions.MaxlagTimeoutError` when maximum retries attempted due to maxlag without success. It is also used by :mod:`tests.script_tests` for code - coverage. Github actions and Appveyor tests activate this variable. + coverage. Github actions and Appveyor tests activate this variable:: + + PYWIKIBOT_TEST_RUNNING=1 **PYWIKIBOT_TEST_WRITE** There are also several other 'write' tests which also attempt to perform diff --git a/tests/script_tests.py b/tests/script_tests.py index 7afeb2f..777815b 100755 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -76,6 +76,7 @@ '8/80/Wikipedia-logo-v2.svg\n\n\n', } +#: auto_run_script_list = [ 'archivebot', 'blockpageschecker', -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/831060 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: Iae2b53210eebc3183f578603649cfe20232f7a9b Gerrit-Change-Number: 831060 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 year, 8 months

[Gerrit] ...core[master]: [tests] Rename PYWIKIBOT_TESTS_RUNNING environment variable

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/831052 ) Change subject: [tests] Rename PYWIKIBOT_TESTS_RUNNING environment variable ...................................................................... [tests] Rename PYWIKIBOT_TESTS_RUNNING environment variable - rename PYWIKIBOT_TESTS_RUNNING to PYWIKIBOT_TEST_RUNNING to be consistent with other PYWIKIBOT_TEST_... environment variables - add this environment variable to tests/README.rst and documentation Change-Id: I8d5b4d454ae9662311993898567dddb2e3d17e8b --- M .appveyor.yml M .github/workflows/login_tests-ci.yml M .github/workflows/pywikibot-ci.yml M pywikibot/data/api/_requests.py M tests/README.rst M tests/script_tests.py 6 files changed, 32 insertions(+), 22 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.appveyor.yml b/.appveyor.yml index 75a438e..f534951 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -9,7 +9,7 @@ PYWIKIBOT_PASSWD_FILE: "%appdata%\\Pywikibot\\passwordfile" PYSETUP_TEST_EXTRAS: "1" - PYWIKIBOT_TESTS_RUNNING: "1" + PYWIKIBOT_TEST_RUNNING: "1" matrix: diff --git a/.github/workflows/login_tests-ci.yml b/.github/workflows/login_tests-ci.yml index c6a97f2..55d5246 100644 --- a/.github/workflows/login_tests-ci.yml +++ b/.github/workflows/login_tests-ci.yml @@ -12,7 +12,7 @@ - completed env: - PYWIKIBOT_TESTS_RUNNING: 1 + PYWIKIBOT_TEST_RUNNING: 1 PYWIKIBOT_LOGIN_LOGOUT: 1 PYWIKIBOT_USERNAME: Pywikibot-test diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml index 21be465..ae29edc 100644 --- a/.github/workflows/pywikibot-ci.yml +++ b/.github/workflows/pywikibot-ci.yml @@ -11,7 +11,7 @@ branches: [ master ] env: - PYWIKIBOT_TESTS_RUNNING: 1 + PYWIKIBOT_TEST_RUNNING: 1 PYWIKIBOT_USERNAME: Pywikibot-test jobs: diff --git a/pywikibot/data/api/_requests.py b/pywikibot/data/api/_requests.py index 4d26391..5e1d564 100644 --- a/pywikibot/data/api/_requests.py +++ b/pywikibot/data/api/_requests.py @@ -1110,7 +1110,7 @@ raise RuntimeError(result) msg = 'Maximum retries attempted due to maxlag without success.' - if os.environ.get('PYWIKIBOT_TESTS_RUNNING', '0') == '1': + if os.environ.get('PYWIKIBOT_TEST_RUNNING', '0') == '1': import unittest raise unittest.SkipTest(msg) diff --git a/tests/README.rst b/tests/README.rst index 85d1ea5..f53fdd6 100644 --- a/tests/README.rst +++ b/tests/README.rst @@ -105,29 +105,39 @@ Environment variables ===================== -PYWIKIBOT_TEST_WRITE_FAIL - There are a set of 'edit failure' tests, which attempt to write to the wikis - and **should** fail. If there is a bug in pywikibot or MediaWiki, these - tests **may** actually perform a write operation. +**PYWIKIBOT_TEST_RUNNING** + This environment variable skips tests instead of raising + :exc:`exceptions.MaxlagTimeoutError` when maximum retries attempted due to + maxlag without success. It is also used by :mod:`tests.script_tests` for code + coverage. Github actions and Appveyor tests activate this variable. - These 'edit failure' tests are disabled by default. On Travis they are enabled - by default on builds by any other GitHub account except 'wikimedia'. +**PYWIKIBOT_TEST_WRITE** + There are also several other 'write' tests which also attempt to perform + write operations successfully. These **will** write to the wikis, and they + should always only write to 'test' wikis. - To disable 'edit failure' tests, set PYWIKIBOT_TEST_WRITE_FAIL=0 + These 'write' tests are disabled by default, and currently cannot be + run on Travis or AppVeyor as they require interaction using a terminal. Also + enabling them won't enable 'edit failure' tests. -PYWIKIBOT_TEST_WRITE - There are also several other 'write' tests which also attempt to perform - write operations successfully. These **will** write to the wikis, and they - should always only write to 'test' wikis. + To enable 'write' tests, set:: - These 'write' tests are disabled by default, and currently cannot be - run on Travis or AppVeyor as they require interaction using a terminal. Also - enabling them won't enable 'edit failure' tests. + PYWIKIBOT_TEST_WRITE=1 - To enable 'write' tests, set PYWIKIBOT_TEST_WRITE=1 +**PYWIKIBOT_TEST_WRITE_FAIL** + There are a set of 'edit failure' tests, which attempt to write to the wikis + and **should** fail. If there is a bug in pywikibot or MediaWiki, these + tests **may** actually perform a write operation. -Enabling only 'edit failure' tests or 'write' tests won't enable the other tests -automatically. + These 'edit failure' tests are disabled by default. On Travis they are enabled + by default on builds by any other GitHub account except 'wikimedia'. + + To disable 'edit failure' tests, set:: + + PYWIKIBOT_TEST_WRITE_FAIL=0 + +.. note:: Enabling only 'edit failure' tests or 'write' tests won't enable the other tests + automatically. Decorators ========== diff --git a/tests/script_tests.py b/tests/script_tests.py index d499269..7afeb2f 100755 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -17,7 +17,7 @@ from tests.utils import execute_pwb -ci_test_run = os.environ.get('PYWIKIBOT_TESTS_RUNNING', '0') == '1' +ci_test_run = os.environ.get('PYWIKIBOT_TEST_RUNNING', '0') == '1' scripts_path = join_root_path('scripts') # login scritpt should be the first to test -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/831052 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: I8d5b4d454ae9662311993898567dddb2e3d17e8b Gerrit-Change-Number: 831052 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 year, 8 months

[Gerrit] ...core[master]: [doc] Update test documentation

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/831043 ) Change subject: [doc] Update test documentation ...................................................................... [doc] Update test documentation Add definition list to README.rst for test environment variables Change-Id: I5d402eb4416658b330ef1f1451a0d3b4622dbf22 --- M tests/README.rst 1 file changed, 24 insertions(+), 22 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/tests/README.rst b/tests/README.rst index 9e5e5ee..85d1ea5 100644 --- a/tests/README.rst +++ b/tests/README.rst @@ -105,36 +105,38 @@ Environment variables ===================== -There are a set of 'edit failure' tests, which attempt to write to the wikis -and **should** fail. If there is a bug in pywikibot or MediaWiki, these -tests **may** actually perform a write operation. +PYWIKIBOT_TEST_WRITE_FAIL + There are a set of 'edit failure' tests, which attempt to write to the wikis + and **should** fail. If there is a bug in pywikibot or MediaWiki, these + tests **may** actually perform a write operation. -These 'edit failure' tests are disabled by default. On Travis they are enabled -by default on builds by any other GitHub account except 'wikimedia'. + These 'edit failure' tests are disabled by default. On Travis they are enabled + by default on builds by any other GitHub account except 'wikimedia'. -To disable 'edit failure' tests, set PYWIKIBOT_TEST_WRITE_FAIL=0 + To disable 'edit failure' tests, set PYWIKIBOT_TEST_WRITE_FAIL=0 -There are also several other 'write' tests which also attempt to perform -write operations successfully. These **will** write to the wikis, and they -should always only write to 'test' wikis. +PYWIKIBOT_TEST_WRITE + There are also several other 'write' tests which also attempt to perform + write operations successfully. These **will** write to the wikis, and they + should always only write to 'test' wikis. -These 'write' tests are disabled by default, and currently cannot be -run on Travis or AppVeyor as they require interaction using a terminal. Also -enabling them won't enable 'edit failure' tests. + These 'write' tests are disabled by default, and currently cannot be + run on Travis or AppVeyor as they require interaction using a terminal. Also + enabling them won't enable 'edit failure' tests. -To enable 'write' tests, set PYWIKIBOT_TEST_WRITE=1 + To enable 'write' tests, set PYWIKIBOT_TEST_WRITE=1 Enabling only 'edit failure' tests or 'write' tests won't enable the other tests automatically. Decorators -===================== +========== pywikibot's test suite, including Python's unittest module, provides decorators to modify the behaviour of the test cases. @unittest.skipIf ------------------ +---------------- Skip a test if the condition is true. Refer to unittest's documentation. :: @@ -145,7 +147,7 @@ def test_skipIf(self): @unittest.skipUnless ---------------------- +-------------------- Skip a test unless the condition is true. Refer to unittest's documentation. :: @@ -246,9 +248,9 @@ Other class attributes ---------------------- -- ``net = False`` : test class does not use a site -- ``dry = True`` : test class can use a fake site object -- ``cached = True``: test class may aggressively cache API responses -- ``login = True`` : test class needs to login to site -- ``rights = '<rights>'`` : test class needs specific rights. Multiple rights must be delimited with `,`. -- ``write = True`` : test class needs to write to a site +- ``net = False``: test class does not use a site +- ``dry = True``: test class can use a fake site object +- ``cached = True``: test class may aggressively cache API responses +- ``login = True``: test class needs to login to site +- ``rights = '<rights>'``: test class needs specific rights. Multiple rights must be delimited with ``,``. +- ``write = True``: test class needs to write to a site -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/831043 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: I5d402eb4416658b330ef1f1451a0d3b4622dbf22 Gerrit-Change-Number: 831043 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-MessageType: merged

1 year, 8 months

[Gerrit] ...core[master]: [IMPR] catch ServerError as a whole in reflinks.py

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/830617 ) Change subject: [IMPR] catch ServerError as a whole in reflinks.py ...................................................................... [IMPR] catch ServerError as a whole in reflinks.py All server errors derive from ServerError which can be used to catch them all. https://doc.wikimedia.org/pywikibot/master/api_ref/exceptions.html?highligh… Change-Id: Id355cc666813b090924060815507a896684f6821 --- M scripts/reflinks.py 1 file changed, 2 insertions(+), 8 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/scripts/reflinks.py b/scripts/reflinks.py index 51c0951..7cfba8e 100755 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -64,11 +64,7 @@ from pywikibot.backports import removeprefix from pywikibot.bot import ConfigParserBot, ExistingPageBot, SingleSiteBot from pywikibot.comms.http import get_charset_from_content_type -from pywikibot.exceptions import ( - FatalServerError, - Server414Error, - Server504Error, -) +from pywikibot.exceptions import ServerError from pywikibot.pagegenerators import ( XMLDumpPageGenerator as _XMLDumpPageGenerator, ) @@ -638,9 +634,7 @@ except (ValueError, # urllib3.LocationParseError derives from it OSError, httplib.error, - FatalServerError, - Server414Error, - Server504Error) as e: + ServerError) as e: pywikibot.output( "{err.__class__.__name__}: Can't retrieve url {url}: {err}" .format(url=ref.url, err=e)) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/830617 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: Id355cc666813b090924060815507a896684f6821 Gerrit-Change-Number: 830617 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 8 months

[Gerrit] ...core[master]: [IMPR] Some improvements

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/830572 ) Change subject: [IMPR] Some improvements ...................................................................... [IMPR] Some improvements - allow defusedxml to be used with xmlreader.py - simplify assignments in dataextend.py - always return a list within Analyzer.findclaims() - validate server certificate's hostname in dataextend.py - update ignore-names for pep8-naming to its default Change-Id: I6d9c469450d64ba5e32ca696d1f3790d417adbdb --- M pywikibot/xmlreader.py M scripts/dataextend.py M tox.ini 3 files changed, 27 insertions(+), 19 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/xmlreader.py b/pywikibot/xmlreader.py index 8277b97..69712c1 100644 --- a/pywikibot/xmlreader.py +++ b/pywikibot/xmlreader.py @@ -1,11 +1,14 @@ -""" -XML reading module. +"""XML reading module. Each XmlEntry object represents a page, as read from an XML source The XmlDump class reads a pages_current XML dump (like the ones offered on https://dumps.wikimedia.org/backup-index.html) and offers a generator over XmlEntry objects which can be used by other bots. + +.. versionchanged:: 7.7 + *defusedxml* is used in favour of *xml.etree* if present to prevent + vulnerable XML attacks. *defusedxml* 0.7.1 or higher is recommended. """ # # (C) Pywikibot team, 2005-2022 @@ -14,7 +17,11 @@ # import re from typing import Optional -from xml.etree.ElementTree import iterparse, ParseError + +try: + from defusedxml.ElementTree import iterparse, ParseError +except ImportError: + from xml.etree.ElementTree import iterparse, ParseError from pywikibot.backports import Callable, Type from pywikibot.tools import open_archive diff --git a/scripts/dataextend.py b/scripts/dataextend.py index c234485..ac6b861 100644 --- a/scripts/dataextend.py +++ b/scripts/dataextend.py @@ -67,13 +67,13 @@ from contextlib import suppress from html import unescape from textwrap import shorten -from typing import Tuple +from typing import Optional from urllib.error import HTTPError, URLError from urllib.parse import quote, unquote from urllib.request import urlopen import pywikibot -from pywikibot.backports import List +from pywikibot.backports import List, Tuple from pywikibot.bot import input_yn, SingleSiteBot, suggest_help from pywikibot.data import sparql from pywikibot.exceptions import ( @@ -1242,7 +1242,7 @@ term = term.split('(')[0] if ',' in term: if term.split(',')[1].strip().lower() in ['jr', 'sr']: - term = term + '.' + term += '.' else: if term.strip()[-1] != term.strip()[-1].lower(): term = term.strip() + '.' @@ -1283,14 +1283,13 @@ answer = None return answer - def findclaims(self): - if not self.id: - return + def findclaims(self) -> List[Tuple[str, str, Optional['Analyzer']]]: + if not self.id or not (self.url or self.sparqlquery): + return [] + self.html = '' - if not self.url and not self.sparqlquery: - return newclaims = [] - pywikibot.output() + pywikibot.info() pagerequest = None if not self.skipfirst: try: @@ -1316,7 +1315,6 @@ pywikibot.output('Unable to receive page {} - not unicode?' .format(self.url)) pagerequest = None - self.html = '' if pagerequest: pagebytes = pagerequest.read() @@ -1330,6 +1328,8 @@ pywikibot.output('Getting {}'.format(extraurl)) if 'https' in self.url: context = ssl._create_unverified_context() + # validate server certificate's hostname is recommened + context.check_hostname = True pagerequest = urlopen(extraurl, context=context) else: pagerequest = urlopen(extraurl) @@ -1338,14 +1338,15 @@ else: pagebytes = pagerequest.read() try: - self.html = self.html + '\n' + pagebytes.decode('utf-8') + self.html += '\n' + pagebytes.decode('utf-8') except UnicodeDecodeError: - self.html = self.html + '\n' + str(pagebytes) + self.html += '\n' + str(pagebytes) if self.sparqlquery: self.html = str(sparql.SparqlQuery().select(self.sparqlquery)) + if not self.html: - return + return [] if self.escapeunicode: self.html = self.html.encode().decode('unicode-escape') @@ -5722,11 +5723,11 @@ section = self.findbyre( r'(?s)<div class="detail_label">Artistic Role\(s\):</div>\s*<div class="detail_text">(.*?)<', html) if section: - result = result + self.findallbyre(r'([^,]*)', section, 'occupation') + result += self.findallbyre(r'([^,]*)', section, 'occupation') section = self.findbyre( r'(?s)<div class="detail_label">Other Occupation\(s\):</div>\s*<div class="detail_text">(.*?)<', html) if section: - result = result + self.findallbyre(r'([^,]*)', section, 'occupation') + result += self.findallbyre(r'([^,]*)', section, 'occupation') return result def findresidences(self, html: str): diff --git a/tox.ini b/tox.ini index 3b35408..654e9aa 100644 --- a/tox.ini +++ b/tox.ini @@ -219,7 +219,7 @@ # pep8-naming classmethod-decorators = classmethod,classproperty # required with pep8-naming < 0.13 -ignore-names = setUp,tearDown,setUpClass,tearDownClass,setUpModule,tearDownModule,maxDiff +ignore-names = setUp,tearDown,setUpClass,tearDownClass,setUpModule,tearDownModule,asyncSetUp,asyncTearDown,setUpTestData,failureException,longMessage,maxDiff [isort] atomic = true -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/830572 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: I6d9c469450d64ba5e32ca696d1f3790d417adbdb Gerrit-Change-Number: 830572 Gerrit-PatchSet: 6 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 8 months

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

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/830187 ) Change subject: [IMPR] Improvements for dataextend.py ...................................................................... [IMPR] Improvements for dataextend.py - add typing hints for html parameter - add typing hints for findnames method - always return a list with findnames - update funcnames list in __getattr__ Change-Id: Ie9e84caac4c036ced97a42c9bf6b2139b34f496a --- M scripts/dataextend.py 1 file changed, 2,668 insertions(+), 2,583 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/830187 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: Ie9e84caac4c036ced97a42c9bf6b2139b34f496a Gerrit-Change-Number: 830187 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 8 months

[Gerrit] ...core[master]: [IMPR] Shorten dataextend.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/829744 ) Change subject: [IMPR] Shorten dataextend.py ...................................................................... [IMPR] Shorten dataextend.py Use __getattr__ within Analyzer to return None if a function is not defined in subclass Change-Id: I181b713c09882d560c50f38da32ff5054f152de5 --- M scripts/dataextend.py 1 file changed, 42 insertions(+), 467 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/dataextend.py b/scripts/dataextend.py index d518996..f014c3d 100644 --- a/scripts/dataextend.py +++ b/scripts/dataextend.py @@ -1676,18 +1676,9 @@ result = result.replace('\n\n', '\n') return result.strip() - def findlongtext(self, html): - return None - def finddescriptions(self, html): return [self.finddescription(html)] - def findlanguagedescriptions(self, html): - return None - - def finddescription(self, html): - return None - def getlanguage(self, code): if not code: return self.language @@ -1720,464 +1711,48 @@ for (language, term) in self.findlanguagenames(self.html) or [] if term and term.strip()] \ + self.findwikipedianames(self.html) - def findnames(self, html): - return None - - def findlanguagenames(self, html): - return None - - def findinstanceof(self, html): - return None - - def findgender(self, html): - return None - - def findfather(self, html): - return None - - def findmother(self, html): - return None - - def findspouses(self, html): - return None - - def findpartners(self, html): - return None - - def findreligion(self, html): - return None - - def findreligions(self, html): - return None - - def findchildren(self, html): - return None - - def findsiblings(self, html): - return None - - def findkins(self, html): - return None - - def findcountry(self, html): - return None - - def findcountries(self, html): - return None - - def findorigcountry(self, html): - return None - - def findadminloc(self, html): - return None - - def findlocation(self, html): - return None - - def findformationlocation(self, html): - return None - - def findbirthplace(self, html): - return None - - def finddeathplace(self, html): - return None - - def findburialplace(self, html): - return None - - def findmannerdeath(self, html): - return None - - def findcausedeath(self, html): - return None - - def findchoriginplace(self, html): - return None - - def findchoriginplaces(self, html): - return None - - def findworkplaces(self, html): - return None - - def findresidences(self, html): - return None - - def findnationality(self, html): - return None - - def findethnicity(self, html): - return None - - def findethnicities(self, html): - return None - - def findorientation(self, html): - return None - - def findnationalities(self, html): - return None - - def findsportcountries(self, html): - return None - - def findfirstname(self, html): - return None - - def findlastname(self, html): - return None - - def findfirstnames(self, html): - return None - - def findlastnames(self, html): - return None - - def findaddress(self, html): - return None - - def findhaircolor(self, html): - return None - - def findcoords(self, html): - return None - - def findbirthdate(self, html): - return None - - def finddeathdate(self, html): - return None - - def findbaptismdate(self, html): - return None - - def findburialdate(self, html): - return None - - def findinception(self, html): - return None - - def findpremiere(self, html): - return None - - def finddissolution(self, html): - return None - - def findpubdate(self, html): - return None - - def findpubdates(self, html): - return None - - def findfloruit(self, html): - return None - - def findfloruitstart(self, html): - return None - - def findfloruitend(self, html): - return None - - def findheights(self, html): - return [self.findheight(html)] - - def findheight(self, html): - return None - - def findweights(self, html): - return [self.findweight(html)] - - def findweight(self, html): - return None - - def findoccupations(self, html): - return None - - def findworkfields(self, html): - return None - - def findpositions(self, html): - return None - - def findtitles(self, html): - return None - - def findemployers(self, html): - return None - - def findranks(self, html): - return None - - def findschools(self, html): - return None - - def findcrimes(self, html): - return None - - def findmoviedirectors(self, html): - return None - - def findartdirectors(self, html): - return None - - def findscreenwriters(self, html): - return None - - def findproducers(self, html): - return None - - def finddirectorsphotography(self, html): - return None - - def findmovieeditors(self, html): - return None - - def findproductiondesigners(self, html): - return None - - def findsounddesigners(self, html): - return None - - def findcostumedesigners(self, html): - return None - - def findmakeupartists(self, html): - return None - - def findcomposers(self, html): - return None - - def findarchitects(self, html): - return None - - def findgenres(self, html): - return None - - def findengines(self, html): - return None - - def findgamemodes(self, html): - return None - - def findcast(self, html): - return None - - def findmaterials(self, html): - return None - - def finddevelopers(self, html): - return None - - def findpublishers(self, html): - return None - - def findprodcoms(self, html): - return None - - def finddistcoms(self, html): - return None - - def findoriglanguages(self, html): - return None - - def finddurations(self, html): - return None - - def findprominences(self, html): - return None - - def findisolations(self, html): - return None - - def findlanguagesspoken(self, html): - return None - - def findlanguages(self, html): - return None - - def findnativelanguages(self, html): - return None - - def findcolors(self, html): - return None - - def finduse(self, html): - return None - - def findfloorsabove(self, html): - return None - - def findfloorsbelow(self, html): - return None - - def findelevations(self, html): - return None - - def findmountainrange(self, html): - return None - - def findrelorder(self, html): - return None - - def findwebsite(self, html): - return None - - def findwebpages(self, html): - return None - - def findsources(self, html): - return None - - def findvoice(self, html): - return None - - def findvoices(self, html): - return None - - def findfamily(self, html): - return None - - def findgens(self, html): - return None - - def findpseudonyms(self, html): - return None - - def findparts(self, html): - return None - - def findpartofs(self, html): - return None - - def findinstruments(self, html): - return None - - def findlabels(self, html): - return None - - def findsports(self, html): - return None - - def findawards(self, html): - return None - - def findnominations(self, html): - return None - - def findmemberships(self, html): - return None - - def findsportteams(self, html): - return None - - def findparties(self, html): - return None - - def findbranches(self, html): - return None - - def findconflicts(self, html): - return None - - def findteampositions(self, html): - return None - - def findpolitical(self, html): - return None - - def findstudents(self, html): - return None - - def finddocstudents(self, html): - return None - - def findteachers(self, html): - return None - - def findadvisors(self, html): - return None - - def findinfluences(self, html): - return None - - def finddegrees(self, html): - return None - - def findmajors(self, html): - return None - - def findparticipations(self, html): - return None - - def findviaf(self, html): - return None - - def findisni(self, html): - return None - - def findtwitter(self, html): - return None - - def findfacebook(self, html): - return None - - def findfacebookpage(self, html): - return None - - def findincollections(self, html): - return None - - def findinworks(self, html): - return None - - def findmovements(self, html): - return None - - def findorigcountries(self, html): - return None - - def findchesstitle(self, html): - return None - - def findfeastday(self, html): - return None - - def findbloodtype(self, html): - return None - - def findeyecolor(self, html): - return None - - def findpatronof(self, html): - return None - - def findnotableworks(self, html): - return None - - def findparticipantins(self, html): - return None - - def findplatforms(self, html): - return None - - def findfranchises(self, html): - return None - - def findimage(self, html): - return None - - def findcoatarms(self, html): - return None - - def findsignature(self, html): - return None - - def findlogo(self, html): - return None - - def findmixedrefs(self, html): - return None + def __getattr__(self, name): + """Return None if the function is not defined in subclass.""" + prefix = 'find' + funcnames = { + 'address', 'adminloc', 'advisors', 'architects', 'artdirectors', + 'awards', 'baptismdate', 'birthdate', 'birthplace', 'bloodtype', + 'branches', 'burialdate', 'burialplace', 'cast', 'causedeath', + 'chesstitle', 'children', 'choriginplace', 'choriginplaces', + 'coatarms', 'colors', 'composers', 'conflicts', 'coords', + 'costumedesigners', 'countries', 'country', 'crimes', 'deathdate', + 'deathplace', 'degrees', 'developers', 'directorsphotography', + 'dissolution', 'distcoms', 'docstudents', 'durations', + 'elevations', 'employers', 'engines', 'ethnicities', 'ethnicity', + 'eyecolor', 'facebook', 'facebookpage', 'family', 'father', + 'feastday', 'firstname', 'firstnames', 'floorsabove', + 'floorsbelow', 'floruit', 'floruitend', 'floruitstart', + 'formationlocation', 'franchises', 'gamemodes', 'gender', + 'genres', 'gens', 'haircolor', 'height', 'heights', 'image', + 'inception', 'incollections', 'influences', 'instanceof', + 'instruments', 'inworks', 'isni', 'isolations', 'kins', 'labels', + 'languages', 'languagesspoken', 'lastname', 'lastnames', + 'location', 'logo', 'majors', 'makeupartists', 'mannerdeath', + 'materials', 'memberships', 'mixedrefs', 'mother', 'mountainrange', + 'movements', 'moviedirectors', 'movieeditors', 'nationalities', + 'nationality', 'nativelanguages', 'nominations', 'notableworks', + 'occupations', 'orientation', 'origcountries', 'origcountry', + 'origlanguages', 'participantins', 'participations', 'parties', + 'partners', 'partofs', 'parts', 'patronof', 'platforms', + 'political', 'positions', 'premiere', 'prodcoms', 'producers', + 'productiondesigners', 'prominences', 'pseudonyms', 'pubdate', + 'pubdates', 'publishers', 'ranks', 'religion', 'religions', + 'relorder', 'residences', 'schools', 'screenwriters', 'siblings', + 'signature', 'sounddesigners', 'sources', 'sportcountries', + 'sports', 'sportteams', 'spouses', 'students', 'teachers', + 'teampositions', 'titles', 'twitter', 'use', 'viaf', 'voice', + 'voices', 'webpages', 'website', 'weight', 'weights', 'workfields', + 'workplaces', + } + pre, sep, post = name.partition(prefix) + if not pre and sep == prefix and post in funcnames: + return lambda html: None + return super().__getattribute__(name) def finddefaultmixedrefs(self, html, includesocial=True): defaultmixedrefs = [ -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/829744 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: I181b713c09882d560c50f38da32ff5054f152de5 Gerrit-Change-Number: 829744 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 year, 8 months

[Gerrit] ...core[master]: [L10N] Update interwiki sorting order

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/829136 ) Change subject: [L10N] Update interwiki sorting order ...................................................................... [L10N] Update interwiki sorting order * Update languages_by_size Change-Id: I926c680e5ce1766654a685d16a4a4a28bed87937 --- M pywikibot/families/wikibooks_family.py M pywikibot/families/wikipedia_family.py M pywikibot/families/wikisource_family.py M pywikibot/families/wiktionary_family.py M pywikibot/family.py 5 files changed, 47 insertions(+), 46 deletions(-) Approvals: Meno25: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikibooks_family.py b/pywikibot/families/wikibooks_family.py index 059d624..bf28930 100644 --- a/pywikibot/families/wikibooks_family.py +++ b/pywikibot/families/wikibooks_family.py @@ -31,7 +31,7 @@ languages_by_size = [ 'en', 'hu', 'de', 'vi', 'fr', 'it', 'ja', 'pt', 'es', 'nl', 'pl', 'id', 'he', 'fi', 'zh', 'sq', 'az', 'fa', 'ru', 'ca', 'eu', 'th', 'da', 'ko', - 'ba', 'sv', 'gl', 'cs', 'sr', 'hi', 'uk', 'hr', 'no', 'tr', 'sa', 'ar', + 'ba', 'sv', 'gl', 'cs', 'hi', 'sr', 'uk', 'hr', 'no', 'tr', 'sa', 'ar', 'ta', 'eo', 'sk', 'is', 'bn', 'ro', 'si', 'bg', 'ms', 'ka', 'mk', 'tt', 'lt', 'el', 'li', 'sl', 'tl', 'ur', 'km', 'la', 'mr', 'kk', 'te', 'et', 'be', 'ia', 'ml', 'oc', 'hy', 'ne', 'pa', 'cv', 'tg', 'ku', 'fy', 'af', diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index b931d2c..896fd9b 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -31,32 +31,32 @@ 'ko', 'no', 'fi', 'tr', 'hu', 'cs', 'ce', 'sh', 'ro', 'zh-min-nan', 'tt', 'eu', 'ms', 'eo', 'he', 'hy', 'da', 'bg', 'azb', 'sk', 'kk', 'et', 'min', 'be', 'simple', 'hr', 'el', 'lt', 'gl', 'az', 'sl', 'ur', - 'uz', 'nn', 'ka', 'hi', 'th', 'ta', 'la', 'cy', 'mk', 'ast', 'bn', - 'zh-yue', 'lv', 'tg', 'af', 'my', 'mg', 'bs', 'oc', 'sq', 'mr', 'nds', + 'uz', 'ka', 'nn', 'hi', 'th', 'ta', 'la', 'cy', 'mk', 'ast', 'bn', + 'zh-yue', 'lv', 'tg', 'af', 'my', 'mg', 'bs', 'oc', 'mr', 'sq', 'nds', 'ky', 'ml', 'be-tarask', 'te', 'sw', 'br', 'new', 'jv', 'vec', 'ht', 'pms', 'pnb', 'su', 'lb', 'ba', 'lld', 'ga', 'szl', 'lmo', 'is', 'ku', - 'cv', 'fy', 'tl', 'ckb', 'wuu', 'an', 'vo', 'sco', 'diq', 'pa', 'io', - 'ne', 'yo', 'gu', 'als', 'kn', 'bar', 'scn', 'bpy', 'avk', 'ia', 'qu', - 'mn', 'nv', 'crh', 'xmf', 'si', 'ha', 'bat-smg', 'os', 'frr', 'or', - 'gd', 'ps', 'cdo', 'bug', 'yi', 'ilo', 'ban', 'sd', 'am', 'nap', 'sah', - 'hsb', 'fo', 'map-bms', 'li', 'mai', 'mzn', 'gor', 'eml', 'ace', 'bcl', + 'cv', 'fy', 'tl', 'ckb', 'wuu', 'an', 'sco', 'diq', 'pa', 'io', 'vo', + 'ne', 'yo', 'gu', 'als', 'kn', 'bar', 'scn', 'bpy', 'ia', 'avk', 'qu', + 'mn', 'nv', 'crh', 'xmf', 'ha', 'si', 'bat-smg', 'os', 'frr', 'or', + 'gd', 'ps', 'ban', 'cdo', 'bug', 'yi', 'ilo', 'sd', 'am', 'nap', 'sah', + 'hsb', 'fo', 'li', 'map-bms', 'mai', 'mzn', 'gor', 'eml', 'ace', 'bcl', 'sa', 'shn', 'wa', 'zh-classical', 'ie', 'lij', 'as', 'zu', 'mhr', - 'mrj', 'hif', 'hyw', 'mni', 'km', 'ig', 'hak', 'roa-tara', 'pam', - 'nso', 'sn', 'so', 'rue', 'bh', 'se', 'myv', 'vls', 'nds-nl', 'mi', - 'sat', 'sc', 'nah', 'vep', 'gan', 'kab', 'glk', 'tk', 'fiu-vro', 'co', - 'bo', 'ab', 'gv', 'ary', 'frp', 'kw', 'kv', 'csb', 'pcd', 'ug', 'udm', - 'skr', 'tum', 'zea', 'ay', 'gn', 'nrm', 'mt', 'bjn', 'smn', 'lez', - 'lfn', 'stq', 'lo', 'olo', 'mwl', 'fur', 'rm', 'ang', 'lad', 'gom', - 'koi', 'ext', 'tyv', 'dsb', 'rw', 'dty', 'ln', 'av', 'cbk-zam', 'dv', - 'ksh', 'gag', 'bxr', 'pfl', 'pap', 'pag', 'pi', 'haw', 'awa', 'tay', - 'tw', 'inh', 'krc', 'dag', 'xal', 'szy', 'za', 'mdf', 'kaa', 'pdc', + 'mrj', 'hif', 'hyw', 'mni', 'ig', 'km', 'hak', 'roa-tara', 'pam', 'sn', + 'nso', 'so', 'rue', 'bh', 'se', 'myv', 'vls', 'nds-nl', 'sat', 'mi', + 'sc', 'nah', 'vep', 'gan', 'kab', 'glk', 'tk', 'fiu-vro', 'co', 'bo', + 'ab', 'tum', 'gv', 'ary', 'frp', 'kw', 'kv', 'csb', 'pcd', 'ug', 'skr', + 'udm', 'zea', 'ay', 'gn', 'mt', 'nrm', 'bjn', 'smn', 'lez', 'lfn', + 'stq', 'lo', 'olo', 'mwl', 'fur', 'rm', 'ang', 'lad', 'gom', 'koi', + 'ext', 'tyv', 'rw', 'dsb', 'dty', 'ln', 'av', 'cbk-zam', 'dv', 'ksh', + 'gag', 'bxr', 'pfl', 'pap', 'pag', 'pi', 'haw', 'awa', 'tay', 'ks', + 'tw', 'inh', 'dag', 'krc', 'xal', 'szy', 'za', 'mdf', 'kaa', 'pdc', 'atj', 'to', 'arc', 'tcy', 'kbp', 'jam', 'na', 'wo', 'kbd', 'nia', - 'nov', 'ki', 'tet', 'mnw', 'lg', 'bi', 'tpi', 'nqo', 'jbo', 'roa-rup', - 'fj', 'lbe', 'kg', 'xh', 'ty', 'ks', 'cu', 'shi', 'srn', 'trv', 'om', - 'sm', 'guw', 'gcr', 'alt', 'chr', 'ltg', 'ny', 'pih', 'got', 'mad', - 'st', 'ami', 'blk', 'tn', 'bm', 've', 'rmy', 'ts', 'chy', 'rn', 'iu', - 'ak', 'ss', 'ch', 'ff', 'pnt', 'kcg', 'ady', 'ik', 'ee', 'sg', 'din', - 'pwn', 'kl', 'pcm', 'ti', 'dz', 'cr', + 'nov', 'tet', 'ki', 'mnw', 'lg', 'bi', 'tpi', 'nqo', 'jbo', 'roa-rup', + 'fj', 'lbe', 'kg', 'xh', 'ty', 'cu', 'shi', 'srn', 'trv', 'om', 'guw', + 'sm', 'gcr', 'alt', 'chr', 'ltg', 'ny', 'pih', 'got', 'mad', 'st', + 'blk', 'ami', 'bm', 'tn', 've', 'rmy', 'ts', 'chy', 'rn', 'iu', 'ak', + 'ss', 'ff', 'ch', 'pnt', 'kcg', 'ady', 'ik', 'ee', 'sg', 'din', 'pwn', + 'pcm', 'kl', 'ti', 'dz', 'cr', ] # Sites we want to edit but not count as real languages diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index d9ad208..4450609 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -29,7 +29,7 @@ 'mul', 'gu', 'sr', 'pt', 'fa', 'sv', 'bn', 'hu', 'ko', 'ml', 'sa', 'ta', 'te', 'sl', 'tr', 'hy', 'la', 'el', 'vi', 'ja', 'ro', 'fi', 'nap', 'nl', 'az', 'ca', 'br', 'be', 'kn', 'no', 'hr', 'th', 'id', - 'eo', 'hi', 'is', 'vec', 'pms', 'ban', 'mr', 'da', 'lij', 'cy', 'et', + 'eo', 'hi', 'is', 'vec', 'pms', 'ban', 'mr', 'cy', 'da', 'lij', 'et', 'mk', 'as', 'yi', 'bg', 'li', 'wa', 'lt', 'jv', 'pa', 'eu', 'or', 'gl', 'bs', 'sah', 'sk', 'zh-min-nan', 'fo', ] diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index c7e32a1..ae92023 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -32,15 +32,15 @@ 'pt', 'kn', 'vi', 'sr', 'th', 'hi', 'ro', 'no', 'et', 'id', 'cs', 'ml', 'my', 'uz', 'li', 'or', 'eo', 'te', 'fa', 'skr', 'gl', 'ar', 'oc', 'jv', 'az', 'eu', 'uk', 'br', 'ast', 'is', 'da', 'lo', 'simple', 'bn', - 'la', 'hr', 'sg', 'fj', 'tg', 'sk', 'ky', 'bg', 'wa', 'shn', 'ur', - 'mnw', 'ps', 'cy', 'vo', 'om', 'he', 'sl', 'af', 'zh-min-nan', 'scn', + 'la', 'hr', 'sg', 'fj', 'tg', 'sk', 'ky', 'bg', 'wa', 'shn', 'mnw', + 'ur', 'ps', 'cy', 'vo', 'om', 'he', 'sl', 'af', 'zh-min-nan', 'scn', 'lmo', 'tl', 'pa', 'sw', 'fy', 'ms', 'nn', 'ka', 'lv', 'min', 'sq', 'nds', 'lb', 'co', 'mn', 'pnb', 'bs', 'nah', 'yue', 'sa', 'kk', 'km', 'diq', 'vec', 'be', 'tk', 'mk', 'nia', 'sm', 'hsb', 'ks', 'shy', 'su', 'gd', 'ga', 'bcl', 'mr', 'gom', 'an', 'wo', 'mni', 'ia', 'ang', 'mt', - 'sd', 'fo', 'tt', 'gn', 'ie', 'so', 'csb', 'ug', 'mi', 'si', 'st', + 'sd', 'fo', 'tt', 'gn', 'ie', 'so', 'mi', 'csb', 'ug', 'si', 'st', 'roa-rup', 'tpi', 'hif', 'kl', 'ha', 'zu', 'bjn', 'ay', 'jbo', 'yi', - 'ln', 'gu', 'na', 'gv', 'kw', 'guw', 'am', 'ne', 'rw', 'ts', 'qu', + 'ln', 'gu', 'guw', 'na', 'gv', 'kw', 'am', 'ne', 'rw', 'ts', 'qu', 'ss', 'iu', 'chr', 'dv', 'ti', 'tn', ] diff --git a/pywikibot/family.py b/pywikibot/family.py index 4bccab0..927888a 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -101,14 +101,14 @@ 'my', 'nah', 'na', 'fj', 'nl', 'nds-nl', 'cr', 'ne', 'new', 'nia', 'ja', 'nqo', 'nap', 'ce', 'frr', 'pih', 'no', 'nb', 'nn', 'nrm', 'nov', 'ii', 'oc', 'mhr', 'or', 'om', 'ng', 'hz', 'uz', 'pa', 'pi', 'pfl', - 'pag', 'ami', 'pnb', 'pap', 'ps', 'jam', 'koi', 'km', 'pcd', 'pms', - 'pwn', 'tpi', 'nds', 'pl', 'pnt', 'pt', 'aa', 'kaa', 'crh', 'ty', - 'ksh', 'ro', 'rmy', 'rm', 'qu', 'rue', 'ru', 'sah', 'szy', 'se', 'sm', - 'sa', 'sg', 'sat', 'skr', 'sc', 'sco', 'trv', 'stq', 'st', 'nso', 'tn', - 'sq', 'scn', 'si', 'simple', 'sd', 'ss', 'sk', 'sl', 'cu', 'szl', 'so', - 'ckb', 'srn', 'sr', 'sh', 'su', 'fi', 'sv', 'shi', 'tl', 'shn', 'ta', - 'kab', 'roa-tara', 'tt', 'tay', 'te', 'tet', 'th', 'ti', 'tg', 'to', - 'chr', 'chy', 've', 'tcy', 'tr', 'azb', 'tk', 'tw', 'kcg', 'tyv', + 'pag', 'ami', 'pnb', 'pap', 'ps', 'jam', 'koi', 'km', 'pcd', 'pcm', + 'pms', 'pwn', 'tpi', 'nds', 'pl', 'pnt', 'pt', 'aa', 'kaa', 'crh', + 'ty', 'ksh', 'ro', 'rmy', 'rm', 'qu', 'rue', 'ru', 'sah', 'szy', 'se', + 'sm', 'sa', 'sg', 'sat', 'skr', 'sc', 'sco', 'trv', 'stq', 'st', 'nso', + 'tn', 'sq', 'scn', 'si', 'simple', 'sd', 'ss', 'sk', 'sl', 'cu', 'szl', + 'so', 'ckb', 'srn', 'sr', 'sh', 'su', 'fi', 'sv', 'shi', 'tl', 'shn', + 'ta', 'kab', 'roa-tara', 'tt', 'tay', 'te', 'tet', 'th', 'ti', 'tg', + 'to', 'chr', 'chy', 've', 'tcy', 'tr', 'azb', 'tk', 'tw', 'kcg', 'tyv', 'din', 'udm', 'bug', 'uk', 'ur', 'ug', 'za', 'vec', 'vep', 'vi', 'vo', 'fiu-vro', 'wa', 'zh-classical', 'vls', 'war', 'wo', 'wuu', 'ts', 'yi', 'yo', 'zh-yue', 'diq', 'zea', 'bat-smg', 'zh', 'zh-tw', 'zh-cn', @@ -139,16 +139,17 @@ 'fj', 'nl', 'nds-nl', 'cr', 'ne', 'new', 'ja', 'nqo', 'nap', 'ce', 'frr', 'pih', 'no', 'nb', 'nn', 'nrm', 'nov', 'ii', 'oc', 'mhr', 'or', 'om', 'ng', 'hz', 'uz', 'pa', 'pi', 'pfl', 'pag', 'ami', 'pnb', 'pap', - 'ps', 'jam', 'km', 'pcd', 'pms', 'pwn', 'nds', 'pl', 'pnt', 'pt', 'aa', - 'kaa', 'crh', 'ty', 'ksh', 'ro', 'rmy', 'rm', 'qu', 'ru', 'rue', 'sah', - 'szy', 'se', 'sa', 'sg', 'sat', 'skr', 'sc', 'sco', 'trv', 'stq', 'st', - 'nso', 'tn', 'sq', 'scn', 'si', 'simple', 'sd', 'ss', 'sk', 'sl', 'cu', - 'szl', 'so', 'ckb', 'srn', 'sr', 'sh', 'fi', 'sv', 'shi', 'tl', 'ta', - 'kab', 'kbp', 'roa-tara', 'tt', 'tay', 'te', 'tet', 'th', 'vi', 'ti', - 'tg', 'tpi', 'chr', 'chy', 've', 'tcy', 'tr', 'azb', 'tk', 'tw', 'tyv', - 'din', 'udm', 'uk', 'ur', 'ug', 'za', 'vec', 'vep', 'vo', 'fiu-vro', - 'wa', 'zh-classical', 'vls', 'war', 'wo', 'wuu', 'ts', 'yi', 'yo', - 'zh-yue', 'diq', 'zea', 'bat-smg', 'zh', 'zh-tw', 'zh-cn', + 'ps', 'jam', 'km', 'pcd', 'pcm', 'pms', 'pwn', 'nds', 'pl', 'pnt', + 'pt', 'aa', 'kaa', 'crh', 'ty', 'ksh', 'ro', 'rmy', 'rm', 'qu', 'ru', + 'rue', 'sah', 'szy', 'se', 'sa', 'sg', 'sat', 'skr', 'sc', 'sco', + 'trv', 'stq', 'st', 'nso', 'tn', 'sq', 'scn', 'si', 'simple', 'sd', + 'ss', 'sk', 'sl', 'cu', 'szl', 'so', 'ckb', 'srn', 'sr', 'sh', 'fi', + 'sv', 'shi', 'tl', 'ta', 'kab', 'kbp', 'roa-tara', 'tt', 'tay', 'te', + 'tet', 'th', 'vi', 'ti', 'tg', 'tpi', 'chr', 'chy', 've', 'tcy', 'tr', + 'azb', 'tk', 'tw', 'tyv', 'din', 'udm', 'uk', 'ur', 'ug', 'za', 'vec', + 'vep', 'vo', 'fiu-vro', 'wa', 'zh-classical', 'vls', 'war', 'wo', + 'wuu', 'ts', 'yi', 'yo', 'zh-yue', 'diq', 'zea', 'bat-smg', 'zh', + 'zh-tw', 'zh-cn', ] # Order for fy: alphabetical by code, but y counts as i -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/829136 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: I926c680e5ce1766654a685d16a4a4a28bed87937 Gerrit-Change-Number: 829136 Gerrit-PatchSet: 3 Gerrit-Owner: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 8 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits September 2022