Pywikibot-commits May 2022

pywikibot-commits@lists.wikimedia.org

1 participants
116 discussions

[Gerrit] ...core[master]: [doc] update ROADMAP.rst

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/789085 ) Change subject: [doc] update ROADMAP.rst ...................................................................... [doc] update ROADMAP.rst Change-Id: I16c002047347ba0f315067fc95665db3076d8f52 --- M ROADMAP.rst 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/ROADMAP.rst b/ROADMAP.rst index dfe85ae..422b6af 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,6 +1,12 @@ Current release 7.3.0 ^^^^^^^^^^^^^^^^^^^^^ +* Preserve more workers than families are handled for preload_sites.py +* Close logging handlers before deleting them (:phab:`T91375`, :phab:`T286127`) +* Clear _sites cache if called with pwb wrapper (:phab:`T225594`) +* Enable short creation of a site if family name is equal to site code +* Use `exc_info=True` with pywikibot.exception() by default (:phab:`T306762`) +* Make IndexPage more robust when getting links in Page ns (:phab:`T307280`) * Do not print log header twice in log files (:phab:`T264235`) * Do not delegate logging output to the root logger (:phab:`T281643`) * Add `get_charset_from_content_type` to extract the charset from the content-type response header -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/789085 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: I16c002047347ba0f315067fc95665db3076d8f52 Gerrit-Change-Number: 789085 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, 11 months

[Gerrit] ...core[master]: [bugfix] Preserve more workers than families are handled

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/788701 ) Change subject: [bugfix] Preserve more workers than families are handled ...................................................................... [bugfix] Preserve more workers than families are handled If worker is less than families are handled the script blocks because no future can be added in preload_family function because all workers are busy already. Change-Id: Id6a6819271dcf51f6bb13327dd65e62303f6b668 --- M scripts/maintenance/preload_sites.py 1 file changed, 20 insertions(+), 5 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/maintenance/preload_sites.py b/scripts/maintenance/preload_sites.py index 7e5b051..3c0afcd 100755 --- a/scripts/maintenance/preload_sites.py +++ b/scripts/maintenance/preload_sites.py @@ -16,18 +16,21 @@ """ # -# (C) Pywikibot team, 2022 +# (C) Pywikibot team, 2021-2022 # # Distributed under the terms of the MIT license. # +import os from concurrent.futures import ThreadPoolExecutor, wait from datetime import datetime +from typing import Optional, Union import pywikibot +from pywikibot.backports import List, Set from pywikibot.family import Family -# supported families by this script +#: supported families by this script families_list = [ 'wikibooks', 'wikinews', @@ -43,7 +46,7 @@ } -def preload_family(family, executor): +def preload_family(family: str, executor: ThreadPoolExecutor) -> None: """Preload all sites of a single family file.""" msg = 'Preloading sites of {} family{}' pywikibot.output(msg.format(family, '...')) @@ -64,9 +67,21 @@ pywikibot.output(msg.format(family, ' completed.')) -def preload_families(families, worker): - """Preload all sites of all given family files.""" +def preload_families(families: Union[List[str], Set[str]], + worker: Optional[int]) -> None: + """Preload all sites of all given family files. + + .. versionchanged:: 7.3 + Default of worker is calculated like for Python 3.8 but preserves + at least one worker more than families_list elements to ensure a + worker can be added in :func:`preload_family`. + """ start = datetime.now() + if worker is None: + # Python 3.8 default + worker = min(32, (os.cpu_count() or 1) + 4) + # allow to add futures in preload_family + worker = max(len(families) + 1, worker) with ThreadPoolExecutor(worker) as executor: futures = {executor.submit(preload_family, family, executor) for family in families} -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/788701 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: Id6a6819271dcf51f6bb13327dd65e62303f6b668 Gerrit-Change-Number: 788701 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, 11 months

[Gerrit] ...core[master]: [bugfix] close handlers before deleting them

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/787457 ) Change subject: [bugfix] close handlers before deleting them ...................................................................... [bugfix] close handlers before deleting them Bug: T286127 Bug: T91375 Change-Id: Id8437bae3b82e3c7d1de655e6592db81718a1b29 Signed-off-by: Xqt <info(a)gno.de> --- M pywikibot/bot.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 5183905..febc008 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -387,6 +387,8 @@ warnings.filterwarnings('module') warnings.filterwarnings('once', category=FutureWarning) + for handler in root_logger.handlers: + handler.close() root_logger.handlers.clear() # remove any old handlers root_logger.propagate = False # T281643 -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/787457 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: Id8437bae3b82e3c7d1de655e6592db81718a1b29 Gerrit-Change-Number: 787457 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Russell Blau <russblau(a)imapmail.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 11 months

[Gerrit] ...core[master]: [bugfix] clear _sites cache if called with pwb wrapper

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/787450 ) Change subject: [bugfix] clear _sites cache if called with pwb wrapper ...................................................................... [bugfix] clear _sites cache if called with pwb wrapper Also update tests Bug: T225594 Change-Id: I2a7d5578ae4cc85ff203f9687e500868cc67c8a1 --- M pywikibot/bot.py M tests/__init__.py M tests/reflinks_tests.py M tests/replacebot_tests.py 4 files changed, 20 insertions(+), 31 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 5183905..1f94eca 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -966,6 +966,8 @@ except (UnknownFamilyError, UnknownSiteError): pywikibot.exception() sys.exit(1) + if calledModuleName() == 'pwb': + pywikibot._sites.clear() if username: config.usernames[config.family][config.mylang] = username diff --git a/tests/__init__.py b/tests/__init__.py index 58aac5e..c5295ad 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -35,13 +35,7 @@ _root_dir = os.path.split(os.path.split(__file__)[0])[0] -# common warn() clauses... -# -# WARN_SITE_CODE is from T234147 -# WARN_SITE_OBJ is from T225594 - -WARN_SITE_CODE = r'^Site .*:.* instantiated using different code *' -WARN_SITE_OBJ = 'Site objects have been created before arguments were handled' +WARN_SITE_CODE = '^Site .*:.* instantiated using different code *' # T234147 def join_root_path(*names): diff --git a/tests/reflinks_tests.py b/tests/reflinks_tests.py index 0098d16..f6768e9 100755 --- a/tests/reflinks_tests.py +++ b/tests/reflinks_tests.py @@ -7,9 +7,8 @@ # import unittest -from pywikibot.tools import suppress_warnings from scripts.reflinks import ReferencesRobot, XmlDumpPageGenerator, main -from tests import WARN_SITE_OBJ, join_xml_data_path +from tests import join_xml_data_path from tests.aspects import ScriptMainTestCase, TestCase from tests.utils import empty_sites @@ -126,13 +125,11 @@ def test_xml_multiple_namespace_ids(self): """Test the generator using multiple separate namespaces parameters.""" - with suppress_warnings(WARN_SITE_OBJ, category=UserWarning): - main('-xml:' + join_xml_data_path('dummy-reflinks.xml'), - '-namespace:0', '-namespace:1', '-xmlstart:Fake page') - gen = self.constructor_kwargs['generator'] - self.assertPageTitlesCountEqual(gen, ['Fake page', - 'Talk:Fake page'], - site=self.get_site()) + main('-xml:' + join_xml_data_path('dummy-reflinks.xml'), + '-namespace:0', '-namespace:1', '-xmlstart:Fake page') + gen = self.constructor_kwargs['generator'] + self.assertPageTitlesCountEqual(gen, ['Fake page', 'Talk:Fake page'], + site=self.get_site()) def test_xml_multiple_namespace_ids_2(self): """Test the generator using multiple namespaces in one parameter.""" @@ -152,13 +149,12 @@ filename = '-xml:' + join_xml_data_path('dummy-reflinks.xml') for start in start_variants: - with self.subTest(xmlstart=start): - with suppress_warnings(WARN_SITE_OBJ, category=UserWarning): - main(filename, '-namespace:1', start) - gen = self.constructor_kwargs['generator'] - pages = list(gen) - self.assertPageTitlesEqual(pages, ['Talk:Fake page'], - site=self.site) + with self.subTest(xmlstart=start), empty_sites(): + main(filename, '-namespace:1', start) + gen = self.constructor_kwargs['generator'] + pages = list(gen) + self.assertPageTitlesEqual(pages, ['Talk:Fake page'], + site=self.site) def test_xml_namespace_name(self): """Test the generator using a namespace name.""" diff --git a/tests/replacebot_tests.py b/tests/replacebot_tests.py index a4ac228..203b5e9 100755 --- a/tests/replacebot_tests.py +++ b/tests/replacebot_tests.py @@ -10,9 +10,8 @@ import pywikibot from pywikibot import fixes -from pywikibot.tools import suppress_warnings from scripts import replace -from tests import WARN_SITE_OBJ, join_data_path +from tests import join_data_path from tests.bot_tests import TWNBotTestCase from tests.utils import empty_sites @@ -90,13 +89,11 @@ def _run(self, *args): """Run the :py:obj:`replace.main` with the given args. - It also adds -site and -page parameter. + It also adds -site and -page parameters: + -page to not have an empty generator + -site as it will use Site() otherwise """ - # -page to not have an empty generator - # -site as it will use Site() otherwise - with suppress_warnings(WARN_SITE_OBJ, category=UserWarning): - return replace.main(*(args + ('-site:wikipedia:test', - '-page:TEST'))) + return replace.main(*(args + ('-site:wikipedia:test', '-page:TEST'))) def test_invalid_replacements(self): """Test invalid command line replacement configurations.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/787450 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: I2a7d5578ae4cc85ff203f9687e500868cc67c8a1 Gerrit-Change-Number: 787450 Gerrit-PatchSet: 4 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 year, 11 months

[Gerrit] ...core[master]: [IMPR] Enable short creation of a site if family name is equal to sit...

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/786171 ) Change subject: [IMPR] Enable short creation of a site if family name is equal to site code ...................................................................... [IMPR] Enable short creation of a site if family name is equal to site code Remove assert statement in Family.load because it is tested lated and a meaningful warning is printed in such case. Change-Id: Ie8d36c367715ca45c5bf3572b8f88160f5249622 --- M pywikibot/__init__.py M pywikibot/data/sparql.py M pywikibot/family.py M pywikibot/page/_wikibase.py M pywikibot/site/_apisite.py M pywikibot/specialbots/_upload.py M scripts/checkimages.py M scripts/data_ingestion.py M scripts/harvest_template.py M scripts/illustrate_wikidata.py M scripts/maintenance/sorting_order.py M tests/i18n_tests.py M tests/page_tests.py M tests/site_tests.py M tests/wikibase_edit_tests.py M tests/wikibase_tests.py 16 files changed, 25 insertions(+), 22 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index b94b610..aead197 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -1113,7 +1113,7 @@ Override default family:: - site = pywikibot.Site(family='wikisource') + site = pywikibot.Site(fam='wikisource') Setting a specific site:: @@ -1140,6 +1140,10 @@ **Never create a site object via interface class directly.** Always use this factory method. + .. versionchanged:: 7.3 + Short creation if site code is equal to family name like + `Site('commons')`, `Site('meta')` or `Site('wikidata')`. + :param code: language code (override config.mylang) code may also be a sitename like 'wikipedia:test' :param fam: family name or object (override config.family) @@ -1167,6 +1171,9 @@ 'should be provided') fam, _, code = code.partition(':') else: + if not fam: # try code as family + with suppress(exceptions.UnknownFamilyError): + fam = Family.load(code) # Fallback to config defaults code = code or _config.mylang fam = fam or _config.family diff --git a/pywikibot/data/sparql.py b/pywikibot/data/sparql.py index c3a44ca..d08d323 100644 --- a/pywikibot/data/sparql.py +++ b/pywikibot/data/sparql.py @@ -49,7 +49,7 @@ """ # default to Wikidata if not repo and not endpoint: - repo = Site('wikidata', 'wikidata') + repo = Site('wikidata') if repo: try: diff --git a/pywikibot/family.py b/pywikibot/family.py index 08b02cb..871a36c 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -573,10 +573,6 @@ if fam is None: fam = config.family - assert all(x in NAME_CHARACTERS for x in fam), \ - 'Name of family "{}" must be ASCII letters and digits ' \ - '[a-zA-Z0-9]'.format(fam) - if fam in Family._families: return Family._families[fam] diff --git a/pywikibot/page/_wikibase.py b/pywikibot/page/_wikibase.py index 3042b44..e6fda16 100644 --- a/pywikibot/page/_wikibase.py +++ b/pywikibot/page/_wikibase.py @@ -1304,7 +1304,7 @@ 'wikibase-form': lambda value, site: LexemeForm(site, value['id']), 'wikibase-sense': lambda value, site: LexemeSense(site, value['id']), 'commonsMedia': lambda value, site: - FilePage(pywikibot.Site('commons', 'commons'), value), # T90492 + FilePage(pywikibot.Site('commons'), value), # T90492 'globe-coordinate': pywikibot.Coordinate.fromWikibase, 'geo-shape': pywikibot.WbGeoShape.fromWikibase, 'tabular-data': pywikibot.WbTabularData.fromWikibase, @@ -1882,7 +1882,7 @@ Basic usage sample: >>> import pywikibot - >>> repo = pywikibot.Site('wikidata:wikidata') + >>> repo = pywikibot.Site('wikidata') >>> L2 = pywikibot.LexemePage(repo, 'L2') # create a Lexeme page >>> list(L2.claims.keys()) # access the claims ['P5831', 'P5402'] diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index ce2c893..98c2c81 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -195,7 +195,7 @@ """ # TODO this only works for some WMF sites if not site: - site = pywikibot.Site('meta', 'meta') + site = pywikibot.Site('meta') req = site._request(expiry=datetime.timedelta(days=10), parameters={'action': 'sitematrix'}) data = req.submit() diff --git a/pywikibot/specialbots/_upload.py b/pywikibot/specialbots/_upload.py index 66a81bb..ddffd20 100644 --- a/pywikibot/specialbots/_upload.py +++ b/pywikibot/specialbots/_upload.py @@ -113,7 +113,7 @@ self.force_if_shared = force_if_shared if config.upload_to_commons: - default_site = pywikibot.Site('commons:commons') + default_site = pywikibot.Site('commons') else: default_site = pywikibot.Site() self.target_site = target_site or default_site diff --git a/scripts/checkimages.py b/scripts/checkimages.py index 0c9430e..6bea64c 100755 --- a/scripts/checkimages.py +++ b/scripts/checkimages.py @@ -831,7 +831,7 @@ except NoPageError: return False # Image deleted, no hash found. Skip the image. - site = pywikibot.Site('commons', 'commons') + site = pywikibot.Site('commons') commons_image_with_this_hash = next( iter(site.allimages(sha1=hash_found, total=1)), None) if commons_image_with_this_hash: diff --git a/scripts/data_ingestion.py b/scripts/data_ingestion.py index 28c75ae..c567c05 100755 --- a/scripts/data_ingestion.py +++ b/scripts/data_ingestion.py @@ -139,7 +139,7 @@ self.contents = None if not site: - site = pywikibot.Site('commons:commons') + site = pywikibot.Site('commons') # default title super().__init__(site, self.get_title('%(_filename)s.%(_ext)s')) diff --git a/scripts/harvest_template.py b/scripts/harvest_template.py index e647160..f6b778b 100755 --- a/scripts/harvest_template.py +++ b/scripts/harvest_template.py @@ -335,7 +335,7 @@ continue claim.setTarget(match.group('url')) elif claim.type == 'commonsMedia': - commonssite = pywikibot.Site('commons', 'commons') + commonssite = pywikibot.Site('commons') imagelink = pywikibot.Link( value, source=commonssite, default_namespace=6) image = pywikibot.FilePage(imagelink) diff --git a/scripts/illustrate_wikidata.py b/scripts/illustrate_wikidata.py index 6c8b587..35245ef 100755 --- a/scripts/illustrate_wikidata.py +++ b/scripts/illustrate_wikidata.py @@ -57,7 +57,7 @@ return newclaim = pywikibot.Claim(self.repo, self.wdproperty) - commonssite = pywikibot.Site('commons', 'commons') + commonssite = pywikibot.Site('commons') imagelink = pywikibot.Link(imagename, source=commonssite, default_namespace=6) image = pywikibot.FilePage(imagelink) diff --git a/scripts/maintenance/sorting_order.py b/scripts/maintenance/sorting_order.py index 1d80e2e..06c373f 100755 --- a/scripts/maintenance/sorting_order.py +++ b/scripts/maintenance/sorting_order.py @@ -68,7 +68,7 @@ def main(): """Main entry function.""" - site = pywikibot.Site('meta', 'meta') + site = pywikibot.Site('meta') for list_name, page_name in pages.items(): page = pywikibot.Page(site, page_name, ns=site.namespaces.MEDIAWIKI) update_family(list_name, page) diff --git a/tests/i18n_tests.py b/tests/i18n_tests.py index 9fa1e94..4a17748 100755 --- a/tests/i18n_tests.py +++ b/tests/i18n_tests.py @@ -60,7 +60,7 @@ Test whether the localzation is found either with the Site object or with the site code. """ - site = Site('commons', 'commons') + site = Site('commons') for code in (site, 'commons'): with self.subTest(code=code): self.assertEqual(i18n.translate(code, self.xdict), diff --git a/tests/page_tests.py b/tests/page_tests.py index 5176308..c58d6b8 100755 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -1238,7 +1238,7 @@ def test_create_short_link(self): """Test create_short_link function.""" # Make sure test user is logged in on meta:meta (T244062) - meta = pywikibot.Site('meta:meta') + meta = pywikibot.Site('meta') if not meta.logged_in(): meta.login() if not meta.user(): diff --git a/tests/site_tests.py b/tests/site_tests.py index 2d5642e..2c0f0e3 100755 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -3346,7 +3346,7 @@ with self.assertRaises(KeyError): site.family.hostname('wowwiki') with self.assertRaises(UnknownSiteError): - pywikibot.Site('wowwiki', 'wowwiki') + pywikibot.Site('wowwiki') with self.assertRaises(UnknownSiteError): pywikibot.Site('ceb', 'wowwiki') diff --git a/tests/wikibase_edit_tests.py b/tests/wikibase_edit_tests.py index 40cd4d3..589d12d 100755 --- a/tests/wikibase_edit_tests.py +++ b/tests/wikibase_edit_tests.py @@ -349,7 +349,7 @@ # set new claim claim = pywikibot.page.Claim(testsite, 'P27199', datatype='geo-shape') - commons_site = pywikibot.Site('commons', 'commons') + commons_site = pywikibot.Site('commons') page = pywikibot.Page(commons_site, 'Data:Lyngby Hovedgade.map') target = pywikibot.WbGeoShape(page) claim.setTarget(target) @@ -369,7 +369,7 @@ # set new claim claim = pywikibot.page.Claim( testsite, 'P30175', datatype='tabular-data') - commons_site = pywikibot.Site('commons', 'commons') + commons_site = pywikibot.Site('commons') page = pywikibot.Page(commons_site, 'Data:Bea.gov/GDP by state.tab') target = pywikibot.WbGeoShape(page) claim.setTarget(target) diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index 4ced0de..96b7ad6 100755 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -640,7 +640,7 @@ def setUp(self): """Setup tests.""" - self.commons = pywikibot.Site('commons', 'commons') + self.commons = pywikibot.Site('commons') self.page = Page(self.commons, 'Data:Lyngby Hovedgade.map') super().setUp() @@ -716,7 +716,7 @@ def setUp(self): """Setup tests.""" - self.commons = pywikibot.Site('commons', 'commons') + self.commons = pywikibot.Site('commons') self.page = Page(self.commons, 'Data:Bea.gov/GDP by state.tab') super().setUp() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/786171 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: Ie8d36c367715ca45c5bf3572b8f88160f5249622 Gerrit-Change-Number: 786171 Gerrit-PatchSet: 5 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 year, 11 months

[Gerrit] ...core[master]: [doc] Note regex usage of referencesSections

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/788710 ) Change subject: [doc] Note regex usage of referencesSections ...................................................................... [doc] Note regex usage of referencesSections Bug: T179653 Change-Id: I12e04eded02f4f67b68b12036a9ee726e69a1a82 --- M scripts/noreferences.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/scripts/noreferences.py b/scripts/noreferences.py index fa0a37e..35aff3d 100755 --- a/scripts/noreferences.py +++ b/scripts/noreferences.py @@ -233,9 +233,9 @@ } # Titles of sections where a reference tag would fit into. -# The first title should be the preferred one: It's the one that -# will be used when a new section has to be created. -# Except for the first, others are tested as regexes. +# The first title should be the preferred one: It's the one that will be +# used when a new section has to be created. Section titles can be regex +# patterns except of the first. referencesSections = { 'wikipedia': { 'ar': [ # not sure about which ones are preferred. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/788710 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: I12e04eded02f4f67b68b12036a9ee726e69a1a82 Gerrit-Change-Number: 788710 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, 11 months

[Gerrit] ...core[master]: [doc] Update tests refs

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/788457 ) Change subject: [doc] Update tests refs ...................................................................... [doc] Update tests refs - move api_ref/tests to tests_ref - update index.rst references - include tests/README.rst - remove outdated rst files Change-Id: Ib10eb7bb58f9e3f3de889e1ae9cf0b1c477491b0 --- D docs/api_ref/tests/basepage_tests.rst D docs/api_ref/tests/disambredir_tests.rst D docs/api_ref/tests/exceptions_tests.rst D docs/api_ref/tests/generate_family_files_tests.rst D docs/api_ref/tests/i18n.pywikibot.rst D docs/api_ref/tests/imagecopy_tests.rst D docs/api_ref/tests/isbn_tests.rst D docs/api_ref/tests/logentry_tests.rst D docs/api_ref/tests/python_tests.rst D docs/api_ref/tests/tools_ip_tests.rst D docs/api_ref/tests/weblib_tests.rst M docs/index.rst M docs/scripts_ref/index.rst R docs/tests_ref/add_text_tests.rst R docs/tests_ref/api_tests.rst R docs/tests_ref/archivebot_tests.rst R docs/tests_ref/aspects.rst A docs/tests_ref/basepage.rst R docs/tests_ref/bot_tests.rst R docs/tests_ref/cache_tests.rst R docs/tests_ref/category_bot_tests.rst R docs/tests_ref/category_tests.rst R docs/tests_ref/checkimages_tests.rst R docs/tests_ref/conftest.rst R docs/tests_ref/cosmetic_changes_tests.rst R docs/tests_ref/data_ingestion_tests.rst R docs/tests_ref/date_tests.rst R docs/tests_ref/deletionbot_tests.rst R docs/tests_ref/deprecation_tests.rst R docs/tests_ref/diff_tests.rst R docs/tests_ref/djvu_tests.rst R docs/tests_ref/dry_api_tests.rst R docs/tests_ref/dry_site_tests.rst R docs/tests_ref/edit_failure_tests.rst R docs/tests_ref/edit_tests.rst R docs/tests_ref/eventstreams_tests.rst R docs/tests_ref/family_tests.rst R docs/tests_ref/file_tests.rst R docs/tests_ref/fixes_tests.rst R docs/tests_ref/fixing_redirects_tests.rst R docs/tests_ref/flow_edit_tests.rst R docs/tests_ref/flow_tests.rst R docs/tests_ref/flow_thanks_tests.rst A docs/tests_ref/generate_family_file_tests.rst R docs/tests_ref/generate_user_files_tests.rst R docs/tests_ref/http_tests.rst R docs/tests_ref/i18n.rst R docs/tests_ref/i18n_tests.rst R docs/tests_ref/index.rst R docs/tests_ref/interwiki_graph_tests.rst R docs/tests_ref/interwiki_link_tests.rst R docs/tests_ref/interwikidata_tests.rst R docs/tests_ref/l10n_tests.rst R docs/tests_ref/link_tests.rst A docs/tests_ref/logentries_tests.rst R docs/tests_ref/login_tests.rst R docs/tests_ref/mediawikiversion_tests.rst R docs/tests_ref/namespace_tests.rst R docs/tests_ref/noreferences_tests.rst R docs/tests_ref/oauth_tests.rst R docs/tests_ref/page_tests.rst R docs/tests_ref/pagegenerators_tests.rst R docs/tests_ref/paraminfo_tests.rst R docs/tests_ref/patrolbot_tests.rst R docs/tests_ref/plural_tests.rst R docs/tests_ref/proofreadpage_tests.rst R docs/tests_ref/protectbot_tests.rst R docs/tests_ref/pwb.print_env.rst R docs/tests_ref/pwb.print_locals.rst R docs/tests_ref/pwb.print_unicode.rst R docs/tests_ref/pwb.rst R docs/tests_ref/pwb_tests.rst R docs/tests_ref/redirect_bot_tests.rst R docs/tests_ref/reflinks_tests.rst R docs/tests_ref/replacebot_tests.rst R docs/tests_ref/script_tests.rst R docs/tests_ref/site_detect_tests.rst R docs/tests_ref/site_tests.rst R docs/tests_ref/sparql_tests.rst R docs/tests_ref/template_bot_tests.rst R docs/tests_ref/tests_tests.rst R docs/tests_ref/textlib_tests.rst R docs/tests_ref/thanks_tests.rst R docs/tests_ref/thread_tests.rst R docs/tests_ref/timestamp_tests.rst R docs/tests_ref/timestripper_tests.rst R docs/tests_ref/tk_tests.rst R docs/tests_ref/tools_chars_tests.rst R docs/tests_ref/tools_formatter_tests.rst R docs/tests_ref/tools_tests.rst R docs/tests_ref/ui_options_tests.rst R docs/tests_ref/ui_tests.rst R docs/tests_ref/upload_tests.rst R docs/tests_ref/uploadbot_tests.rst R docs/tests_ref/user_tests.rst R docs/tests_ref/utils.rst R docs/tests_ref/weblinkchecker_tests.rst R docs/tests_ref/wikibase_edit_tests.rst R docs/tests_ref/wikibase_tests.rst R docs/tests_ref/wikistats_tests.rst R docs/tests_ref/xmlreader_tests.rst M tests/README.rst 102 files changed, 50 insertions(+), 120 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/api_ref/tests/basepage_tests.rst b/docs/api_ref/tests/basepage_tests.rst deleted file mode 100644 index e1be084..0000000 --- a/docs/api_ref/tests/basepage_tests.rst +++ /dev/null @@ -1,7 +0,0 @@ -tests.basepage\_tests module -============================ - -.. automodule:: tests.basepage_tests - :members: - :undoc-members: - :show-inheritance: diff --git a/docs/api_ref/tests/disambredir_tests.rst b/docs/api_ref/tests/disambredir_tests.rst deleted file mode 100644 index a9223ee..0000000 --- a/docs/api_ref/tests/disambredir_tests.rst +++ /dev/null @@ -1,7 +0,0 @@ -tests.disambredir\_tests module -=============================== - -.. automodule:: tests.disambredir_tests - :members: - :undoc-members: - :show-inheritance: diff --git a/docs/api_ref/tests/exceptions_tests.rst b/docs/api_ref/tests/exceptions_tests.rst deleted file mode 100644 index c85b34f..0000000 --- a/docs/api_ref/tests/exceptions_tests.rst +++ /dev/null @@ -1,7 +0,0 @@ -tests.exceptions\_tests module -============================== - -.. automodule:: tests.exceptions_tests - :members: - :undoc-members: - :show-inheritance: diff --git a/docs/api_ref/tests/generate_family_files_tests.rst b/docs/api_ref/tests/generate_family_files_tests.rst deleted file mode 100644 index d72df15..0000000 --- a/docs/api_ref/tests/generate_family_files_tests.rst +++ /dev/null @@ -1,7 +0,0 @@ -tests.generate\_family\_files\_tests module -=========================================== - -.. automodule:: tests.generate_family_files_tests - :members: - :undoc-members: - :show-inheritance: diff --git a/docs/api_ref/tests/i18n.pywikibot.rst b/docs/api_ref/tests/i18n.pywikibot.rst deleted file mode 100644 index 690a45f..0000000 --- a/docs/api_ref/tests/i18n.pywikibot.rst +++ /dev/null @@ -1,7 +0,0 @@ -tests.i18n.pywikibot module -=========================== - -.. automodule:: tests.i18n.pywikibot - :members: - :undoc-members: - :show-inheritance: diff --git a/docs/api_ref/tests/imagecopy_tests.rst b/docs/api_ref/tests/imagecopy_tests.rst deleted file mode 100644 index c977e2b..0000000 --- a/docs/api_ref/tests/imagecopy_tests.rst +++ /dev/null @@ -1,7 +0,0 @@ -tests.imagecopy\_tests module -============================= - -.. automodule:: tests.imagecopy_tests - :members: - :undoc-members: - :show-inheritance: diff --git a/docs/api_ref/tests/isbn_tests.rst b/docs/api_ref/tests/isbn_tests.rst deleted file mode 100644 index a132ab8..0000000 --- a/docs/api_ref/tests/isbn_tests.rst +++ /dev/null @@ -1,7 +0,0 @@ -tests.isbn\_tests module -======================== - -.. automodule:: tests.isbn_tests - :members: - :undoc-members: - :show-inheritance: diff --git a/docs/api_ref/tests/logentry_tests.rst b/docs/api_ref/tests/logentry_tests.rst deleted file mode 100644 index dc008f1..0000000 --- a/docs/api_ref/tests/logentry_tests.rst +++ /dev/null @@ -1,7 +0,0 @@ -tests.logentry\_tests module -============================ - -.. automodule:: tests.logentry_tests - :members: - :undoc-members: - :show-inheritance: diff --git a/docs/api_ref/tests/python_tests.rst b/docs/api_ref/tests/python_tests.rst deleted file mode 100644 index e91ca8e..0000000 --- a/docs/api_ref/tests/python_tests.rst +++ /dev/null @@ -1,7 +0,0 @@ -tests.python\_tests module -========================== - -.. automodule:: tests.python_tests - :members: - :undoc-members: - :show-inheritance: diff --git a/docs/api_ref/tests/tools_ip_tests.rst b/docs/api_ref/tests/tools_ip_tests.rst deleted file mode 100644 index 8a71ca2..0000000 --- a/docs/api_ref/tests/tools_ip_tests.rst +++ /dev/null @@ -1,7 +0,0 @@ -tests.tools\_ip\_tests module -============================= - -.. automodule:: tests.tools_ip_tests - :members: - :undoc-members: - :show-inheritance: diff --git a/docs/api_ref/tests/weblib_tests.rst b/docs/api_ref/tests/weblib_tests.rst deleted file mode 100644 index 80247c2..0000000 --- a/docs/api_ref/tests/weblib_tests.rst +++ /dev/null @@ -1,7 +0,0 @@ -tests.weblib\_tests module -========================== - -.. automodule:: tests.weblib_tests - :members: - :undoc-members: - :show-inheritance: diff --git a/docs/index.rst b/docs/index.rst index 927ad30..3dbd2e9 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -65,9 +65,10 @@ .. toctree:: :maxdepth: 1 - utilities/scripts_ref - scripts_ref/scripts.maintenance + Utility Scripts Reference<utilities/scripts_ref> scripts_ref/index + tests_ref/index + Maintenance Scripts<scripts_ref/scripts.maintenance> Miscellaneous diff --git a/docs/scripts_ref/index.rst b/docs/scripts_ref/index.rst index 3c14b01..0e32244 100644 --- a/docs/scripts_ref/index.rst +++ b/docs/scripts_ref/index.rst @@ -1,4 +1,4 @@ -Scripts reference +Scripts Reference ----------------- Provided scripts by Pywikibot diff --git a/docs/api_ref/tests/add_text_tests.rst b/docs/tests_ref/add_text_tests.rst similarity index 100% rename from docs/api_ref/tests/add_text_tests.rst rename to docs/tests_ref/add_text_tests.rst diff --git a/docs/api_ref/tests/api_tests.rst b/docs/tests_ref/api_tests.rst similarity index 100% rename from docs/api_ref/tests/api_tests.rst rename to docs/tests_ref/api_tests.rst diff --git a/docs/api_ref/tests/archivebot_tests.rst b/docs/tests_ref/archivebot_tests.rst similarity index 100% rename from docs/api_ref/tests/archivebot_tests.rst rename to docs/tests_ref/archivebot_tests.rst diff --git a/docs/api_ref/tests/aspects.rst b/docs/tests_ref/aspects.rst similarity index 100% rename from docs/api_ref/tests/aspects.rst rename to docs/tests_ref/aspects.rst diff --git a/docs/tests_ref/basepage.rst b/docs/tests_ref/basepage.rst new file mode 100644 index 0000000..65346bf --- /dev/null +++ b/docs/tests_ref/basepage.rst @@ -0,0 +1,7 @@ +tests.basepage module +===================== + +.. automodule:: tests.basepage + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/api_ref/tests/bot_tests.rst b/docs/tests_ref/bot_tests.rst similarity index 100% rename from docs/api_ref/tests/bot_tests.rst rename to docs/tests_ref/bot_tests.rst diff --git a/docs/api_ref/tests/cache_tests.rst b/docs/tests_ref/cache_tests.rst similarity index 100% rename from docs/api_ref/tests/cache_tests.rst rename to docs/tests_ref/cache_tests.rst diff --git a/docs/api_ref/tests/category_bot_tests.rst b/docs/tests_ref/category_bot_tests.rst similarity index 100% rename from docs/api_ref/tests/category_bot_tests.rst rename to docs/tests_ref/category_bot_tests.rst diff --git a/docs/api_ref/tests/category_tests.rst b/docs/tests_ref/category_tests.rst similarity index 100% rename from docs/api_ref/tests/category_tests.rst rename to docs/tests_ref/category_tests.rst diff --git a/docs/api_ref/tests/checkimages_tests.rst b/docs/tests_ref/checkimages_tests.rst similarity index 100% rename from docs/api_ref/tests/checkimages_tests.rst rename to docs/tests_ref/checkimages_tests.rst diff --git a/docs/api_ref/tests/conftest.rst b/docs/tests_ref/conftest.rst similarity index 100% rename from docs/api_ref/tests/conftest.rst rename to docs/tests_ref/conftest.rst diff --git a/docs/api_ref/tests/cosmetic_changes_tests.rst b/docs/tests_ref/cosmetic_changes_tests.rst similarity index 100% rename from docs/api_ref/tests/cosmetic_changes_tests.rst rename to docs/tests_ref/cosmetic_changes_tests.rst diff --git a/docs/api_ref/tests/data_ingestion_tests.rst b/docs/tests_ref/data_ingestion_tests.rst similarity index 100% rename from docs/api_ref/tests/data_ingestion_tests.rst rename to docs/tests_ref/data_ingestion_tests.rst diff --git a/docs/api_ref/tests/date_tests.rst b/docs/tests_ref/date_tests.rst similarity index 100% rename from docs/api_ref/tests/date_tests.rst rename to docs/tests_ref/date_tests.rst diff --git a/docs/api_ref/tests/deletionbot_tests.rst b/docs/tests_ref/deletionbot_tests.rst similarity index 100% rename from docs/api_ref/tests/deletionbot_tests.rst rename to docs/tests_ref/deletionbot_tests.rst diff --git a/docs/api_ref/tests/deprecation_tests.rst b/docs/tests_ref/deprecation_tests.rst similarity index 100% rename from docs/api_ref/tests/deprecation_tests.rst rename to docs/tests_ref/deprecation_tests.rst diff --git a/docs/api_ref/tests/diff_tests.rst b/docs/tests_ref/diff_tests.rst similarity index 100% rename from docs/api_ref/tests/diff_tests.rst rename to docs/tests_ref/diff_tests.rst diff --git a/docs/api_ref/tests/djvu_tests.rst b/docs/tests_ref/djvu_tests.rst similarity index 100% rename from docs/api_ref/tests/djvu_tests.rst rename to docs/tests_ref/djvu_tests.rst diff --git a/docs/api_ref/tests/dry_api_tests.rst b/docs/tests_ref/dry_api_tests.rst similarity index 100% rename from docs/api_ref/tests/dry_api_tests.rst rename to docs/tests_ref/dry_api_tests.rst diff --git a/docs/api_ref/tests/dry_site_tests.rst b/docs/tests_ref/dry_site_tests.rst similarity index 100% rename from docs/api_ref/tests/dry_site_tests.rst rename to docs/tests_ref/dry_site_tests.rst diff --git a/docs/api_ref/tests/edit_failure_tests.rst b/docs/tests_ref/edit_failure_tests.rst similarity index 100% rename from docs/api_ref/tests/edit_failure_tests.rst rename to docs/tests_ref/edit_failure_tests.rst diff --git a/docs/api_ref/tests/edit_tests.rst b/docs/tests_ref/edit_tests.rst similarity index 100% rename from docs/api_ref/tests/edit_tests.rst rename to docs/tests_ref/edit_tests.rst diff --git a/docs/api_ref/tests/eventstreams_tests.rst b/docs/tests_ref/eventstreams_tests.rst similarity index 100% rename from docs/api_ref/tests/eventstreams_tests.rst rename to docs/tests_ref/eventstreams_tests.rst diff --git a/docs/api_ref/tests/family_tests.rst b/docs/tests_ref/family_tests.rst similarity index 100% rename from docs/api_ref/tests/family_tests.rst rename to docs/tests_ref/family_tests.rst diff --git a/docs/api_ref/tests/file_tests.rst b/docs/tests_ref/file_tests.rst similarity index 100% rename from docs/api_ref/tests/file_tests.rst rename to docs/tests_ref/file_tests.rst diff --git a/docs/api_ref/tests/fixes_tests.rst b/docs/tests_ref/fixes_tests.rst similarity index 100% rename from docs/api_ref/tests/fixes_tests.rst rename to docs/tests_ref/fixes_tests.rst diff --git a/docs/api_ref/tests/fixing_redirects_tests.rst b/docs/tests_ref/fixing_redirects_tests.rst similarity index 100% rename from docs/api_ref/tests/fixing_redirects_tests.rst rename to docs/tests_ref/fixing_redirects_tests.rst diff --git a/docs/api_ref/tests/flow_edit_tests.rst b/docs/tests_ref/flow_edit_tests.rst similarity index 100% rename from docs/api_ref/tests/flow_edit_tests.rst rename to docs/tests_ref/flow_edit_tests.rst diff --git a/docs/api_ref/tests/flow_tests.rst b/docs/tests_ref/flow_tests.rst similarity index 100% rename from docs/api_ref/tests/flow_tests.rst rename to docs/tests_ref/flow_tests.rst diff --git a/docs/api_ref/tests/flow_thanks_tests.rst b/docs/tests_ref/flow_thanks_tests.rst similarity index 100% rename from docs/api_ref/tests/flow_thanks_tests.rst rename to docs/tests_ref/flow_thanks_tests.rst diff --git a/docs/tests_ref/generate_family_file_tests.rst b/docs/tests_ref/generate_family_file_tests.rst new file mode 100644 index 0000000..5dbd7ee --- /dev/null +++ b/docs/tests_ref/generate_family_file_tests.rst @@ -0,0 +1,7 @@ +tests.generate\_family\_file\_tests module +========================================== + +.. automodule:: tests.generate_family_file_tests + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/api_ref/tests/generate_user_files_tests.rst b/docs/tests_ref/generate_user_files_tests.rst similarity index 100% rename from docs/api_ref/tests/generate_user_files_tests.rst rename to docs/tests_ref/generate_user_files_tests.rst diff --git a/docs/api_ref/tests/http_tests.rst b/docs/tests_ref/http_tests.rst similarity index 100% rename from docs/api_ref/tests/http_tests.rst rename to docs/tests_ref/http_tests.rst diff --git a/docs/api_ref/tests/i18n.rst b/docs/tests_ref/i18n.rst similarity index 69% rename from docs/api_ref/tests/i18n.rst rename to docs/tests_ref/i18n.rst index 9d620ed..bd7c82c 100644 --- a/docs/api_ref/tests/i18n.rst +++ b/docs/tests_ref/i18n.rst @@ -6,10 +6,4 @@ :undoc-members: :show-inheritance: -Submodules ----------- - -.. toctree:: - - i18n.pywikibot diff --git a/docs/api_ref/tests/i18n_tests.rst b/docs/tests_ref/i18n_tests.rst similarity index 100% rename from docs/api_ref/tests/i18n_tests.rst rename to docs/tests_ref/i18n_tests.rst diff --git a/docs/api_ref/tests/index.rst b/docs/tests_ref/index.rst similarity index 86% rename from docs/api_ref/tests/index.rst rename to docs/tests_ref/index.rst index ea77f14..4e30565 100644 --- a/docs/api_ref/tests/index.rst +++ b/docs/tests_ref/index.rst @@ -1,15 +1,21 @@ -=========== +=============== +Tests Reference +=============== + +.. include:: ../../tests/README.rst + +*********** Subpackages -=========== +*********** .. toctree:: i18n pwb -============= +************* Library tests -============= +************* Tests in this project: @@ -18,7 +24,7 @@ api<./api_tests> aspects - basepage<./basepage_tests> + basepage bot<./bot_tests> cache<./cache_tests> category<./category_tests> @@ -33,7 +39,6 @@ edit_failure<./edit_failure_tests> edit<./edit_tests> eventstreams<./eventstreams_tests> - exceptions<./exceptions_tests> family<./family_tests> file<./file_tests> fixes<./fixes_tests> @@ -46,7 +51,7 @@ interwiki_link<./interwiki_link_tests> l10n<./l10n_tests> link<./link_tests> - logentry<./logentry_tests> + logentries<./logentries_tests> login<./login_tests> mediawikiversion<./mediawikiversion_tests> namespace<./namespace_tests> @@ -56,7 +61,6 @@ paraminfo<./paraminfo_tests> plural<./plural_tests> proofreadpage<./proofreadpage_tests> - python<./python_tests> site_detect<./site_detect_tests> site<./site_tests> sparql<./sparql_tests> @@ -69,21 +73,19 @@ tk<./tk_tests> tools_chars<./tools_chars_tests> tools_formatter<./tools_formatter_tests> - tools_ip<./tools_ip_tests> tools<./tools_tests> ui_options<./ui_options_tests> ui<./ui_tests> user<./user_tests> utils - weblib<./weblib_tests> wikibase_edit<./wikibase_edit_tests> wikibase<./wikibase_tests> wikistats<./wikistats_tests> xmlreader<./xmlreader_tests> -============ +************ Script tests -============ +************ Tests in this project: @@ -96,13 +98,10 @@ checkimages<./checkimages_tests> data_ingestion<./data_ingestion_tests> deletionbot<./deletionbot_tests> - disambredir<./disambredir_tests> fixing_redirects<./fixing_redirects_tests> - generate_family_files<./generate_family_files_tests> + generate_family_file<./generate_family_file_tests> generate_user_files<./generate_user_files_tests> - imagecopy<./imagecopy_tests> interwikidata<./interwikidata_tests> - isbn<./isbn_tests> noreferences<./noreferences_tests> patrolbot<./patrolbot_tests> protectbot<./protectbot_tests> diff --git a/docs/api_ref/tests/interwiki_graph_tests.rst b/docs/tests_ref/interwiki_graph_tests.rst similarity index 100% rename from docs/api_ref/tests/interwiki_graph_tests.rst rename to docs/tests_ref/interwiki_graph_tests.rst diff --git a/docs/api_ref/tests/interwiki_link_tests.rst b/docs/tests_ref/interwiki_link_tests.rst similarity index 100% rename from docs/api_ref/tests/interwiki_link_tests.rst rename to docs/tests_ref/interwiki_link_tests.rst diff --git a/docs/api_ref/tests/interwikidata_tests.rst b/docs/tests_ref/interwikidata_tests.rst similarity index 100% rename from docs/api_ref/tests/interwikidata_tests.rst rename to docs/tests_ref/interwikidata_tests.rst diff --git a/docs/api_ref/tests/l10n_tests.rst b/docs/tests_ref/l10n_tests.rst similarity index 100% rename from docs/api_ref/tests/l10n_tests.rst rename to docs/tests_ref/l10n_tests.rst diff --git a/docs/api_ref/tests/link_tests.rst b/docs/tests_ref/link_tests.rst similarity index 100% rename from docs/api_ref/tests/link_tests.rst rename to docs/tests_ref/link_tests.rst diff --git a/docs/tests_ref/logentries_tests.rst b/docs/tests_ref/logentries_tests.rst new file mode 100644 index 0000000..411bd7e --- /dev/null +++ b/docs/tests_ref/logentries_tests.rst @@ -0,0 +1,7 @@ +tests.logentries\_tests module +============================== + +.. automodule:: tests.logentries_tests + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/api_ref/tests/login_tests.rst b/docs/tests_ref/login_tests.rst similarity index 100% rename from docs/api_ref/tests/login_tests.rst rename to docs/tests_ref/login_tests.rst diff --git a/docs/api_ref/tests/mediawikiversion_tests.rst b/docs/tests_ref/mediawikiversion_tests.rst similarity index 100% rename from docs/api_ref/tests/mediawikiversion_tests.rst rename to docs/tests_ref/mediawikiversion_tests.rst diff --git a/docs/api_ref/tests/namespace_tests.rst b/docs/tests_ref/namespace_tests.rst similarity index 100% rename from docs/api_ref/tests/namespace_tests.rst rename to docs/tests_ref/namespace_tests.rst diff --git a/docs/api_ref/tests/noreferences_tests.rst b/docs/tests_ref/noreferences_tests.rst similarity index 100% rename from docs/api_ref/tests/noreferences_tests.rst rename to docs/tests_ref/noreferences_tests.rst diff --git a/docs/api_ref/tests/oauth_tests.rst b/docs/tests_ref/oauth_tests.rst similarity index 100% rename from docs/api_ref/tests/oauth_tests.rst rename to docs/tests_ref/oauth_tests.rst diff --git a/docs/api_ref/tests/page_tests.rst b/docs/tests_ref/page_tests.rst similarity index 100% rename from docs/api_ref/tests/page_tests.rst rename to docs/tests_ref/page_tests.rst diff --git a/docs/api_ref/tests/pagegenerators_tests.rst b/docs/tests_ref/pagegenerators_tests.rst similarity index 100% rename from docs/api_ref/tests/pagegenerators_tests.rst rename to docs/tests_ref/pagegenerators_tests.rst diff --git a/docs/api_ref/tests/paraminfo_tests.rst b/docs/tests_ref/paraminfo_tests.rst similarity index 100% rename from docs/api_ref/tests/paraminfo_tests.rst rename to docs/tests_ref/paraminfo_tests.rst diff --git a/docs/api_ref/tests/patrolbot_tests.rst b/docs/tests_ref/patrolbot_tests.rst similarity index 100% rename from docs/api_ref/tests/patrolbot_tests.rst rename to docs/tests_ref/patrolbot_tests.rst diff --git a/docs/api_ref/tests/plural_tests.rst b/docs/tests_ref/plural_tests.rst similarity index 100% rename from docs/api_ref/tests/plural_tests.rst rename to docs/tests_ref/plural_tests.rst diff --git a/docs/api_ref/tests/proofreadpage_tests.rst b/docs/tests_ref/proofreadpage_tests.rst similarity index 100% rename from docs/api_ref/tests/proofreadpage_tests.rst rename to docs/tests_ref/proofreadpage_tests.rst diff --git a/docs/api_ref/tests/protectbot_tests.rst b/docs/tests_ref/protectbot_tests.rst similarity index 100% rename from docs/api_ref/tests/protectbot_tests.rst rename to docs/tests_ref/protectbot_tests.rst diff --git a/docs/api_ref/tests/pwb.print_env.rst b/docs/tests_ref/pwb.print_env.rst similarity index 100% rename from docs/api_ref/tests/pwb.print_env.rst rename to docs/tests_ref/pwb.print_env.rst diff --git a/docs/api_ref/tests/pwb.print_locals.rst b/docs/tests_ref/pwb.print_locals.rst similarity index 100% rename from docs/api_ref/tests/pwb.print_locals.rst rename to docs/tests_ref/pwb.print_locals.rst diff --git a/docs/api_ref/tests/pwb.print_unicode.rst b/docs/tests_ref/pwb.print_unicode.rst similarity index 100% rename from docs/api_ref/tests/pwb.print_unicode.rst rename to docs/tests_ref/pwb.print_unicode.rst diff --git a/docs/api_ref/tests/pwb.rst b/docs/tests_ref/pwb.rst similarity index 100% rename from docs/api_ref/tests/pwb.rst rename to docs/tests_ref/pwb.rst diff --git a/docs/api_ref/tests/pwb_tests.rst b/docs/tests_ref/pwb_tests.rst similarity index 100% rename from docs/api_ref/tests/pwb_tests.rst rename to docs/tests_ref/pwb_tests.rst diff --git a/docs/api_ref/tests/redirect_bot_tests.rst b/docs/tests_ref/redirect_bot_tests.rst similarity index 100% rename from docs/api_ref/tests/redirect_bot_tests.rst rename to docs/tests_ref/redirect_bot_tests.rst diff --git a/docs/api_ref/tests/reflinks_tests.rst b/docs/tests_ref/reflinks_tests.rst similarity index 100% rename from docs/api_ref/tests/reflinks_tests.rst rename to docs/tests_ref/reflinks_tests.rst diff --git a/docs/api_ref/tests/replacebot_tests.rst b/docs/tests_ref/replacebot_tests.rst similarity index 100% rename from docs/api_ref/tests/replacebot_tests.rst rename to docs/tests_ref/replacebot_tests.rst diff --git a/docs/api_ref/tests/script_tests.rst b/docs/tests_ref/script_tests.rst similarity index 100% rename from docs/api_ref/tests/script_tests.rst rename to docs/tests_ref/script_tests.rst diff --git a/docs/api_ref/tests/site_detect_tests.rst b/docs/tests_ref/site_detect_tests.rst similarity index 100% rename from docs/api_ref/tests/site_detect_tests.rst rename to docs/tests_ref/site_detect_tests.rst diff --git a/docs/api_ref/tests/site_tests.rst b/docs/tests_ref/site_tests.rst similarity index 100% rename from docs/api_ref/tests/site_tests.rst rename to docs/tests_ref/site_tests.rst diff --git a/docs/api_ref/tests/sparql_tests.rst b/docs/tests_ref/sparql_tests.rst similarity index 100% rename from docs/api_ref/tests/sparql_tests.rst rename to docs/tests_ref/sparql_tests.rst diff --git a/docs/api_ref/tests/template_bot_tests.rst b/docs/tests_ref/template_bot_tests.rst similarity index 100% rename from docs/api_ref/tests/template_bot_tests.rst rename to docs/tests_ref/template_bot_tests.rst diff --git a/docs/api_ref/tests/tests_tests.rst b/docs/tests_ref/tests_tests.rst similarity index 100% rename from docs/api_ref/tests/tests_tests.rst rename to docs/tests_ref/tests_tests.rst diff --git a/docs/api_ref/tests/textlib_tests.rst b/docs/tests_ref/textlib_tests.rst similarity index 100% rename from docs/api_ref/tests/textlib_tests.rst rename to docs/tests_ref/textlib_tests.rst diff --git a/docs/api_ref/tests/thanks_tests.rst b/docs/tests_ref/thanks_tests.rst similarity index 100% rename from docs/api_ref/tests/thanks_tests.rst rename to docs/tests_ref/thanks_tests.rst diff --git a/docs/api_ref/tests/thread_tests.rst b/docs/tests_ref/thread_tests.rst similarity index 100% rename from docs/api_ref/tests/thread_tests.rst rename to docs/tests_ref/thread_tests.rst diff --git a/docs/api_ref/tests/timestamp_tests.rst b/docs/tests_ref/timestamp_tests.rst similarity index 100% rename from docs/api_ref/tests/timestamp_tests.rst rename to docs/tests_ref/timestamp_tests.rst diff --git a/docs/api_ref/tests/timestripper_tests.rst b/docs/tests_ref/timestripper_tests.rst similarity index 100% rename from docs/api_ref/tests/timestripper_tests.rst rename to docs/tests_ref/timestripper_tests.rst diff --git a/docs/api_ref/tests/tk_tests.rst b/docs/tests_ref/tk_tests.rst similarity index 100% rename from docs/api_ref/tests/tk_tests.rst rename to docs/tests_ref/tk_tests.rst diff --git a/docs/api_ref/tests/tools_chars_tests.rst b/docs/tests_ref/tools_chars_tests.rst similarity index 100% rename from docs/api_ref/tests/tools_chars_tests.rst rename to docs/tests_ref/tools_chars_tests.rst diff --git a/docs/api_ref/tests/tools_formatter_tests.rst b/docs/tests_ref/tools_formatter_tests.rst similarity index 100% rename from docs/api_ref/tests/tools_formatter_tests.rst rename to docs/tests_ref/tools_formatter_tests.rst diff --git a/docs/api_ref/tests/tools_tests.rst b/docs/tests_ref/tools_tests.rst similarity index 100% rename from docs/api_ref/tests/tools_tests.rst rename to docs/tests_ref/tools_tests.rst diff --git a/docs/api_ref/tests/ui_options_tests.rst b/docs/tests_ref/ui_options_tests.rst similarity index 100% rename from docs/api_ref/tests/ui_options_tests.rst rename to docs/tests_ref/ui_options_tests.rst diff --git a/docs/api_ref/tests/ui_tests.rst b/docs/tests_ref/ui_tests.rst similarity index 100% rename from docs/api_ref/tests/ui_tests.rst rename to docs/tests_ref/ui_tests.rst diff --git a/docs/api_ref/tests/upload_tests.rst b/docs/tests_ref/upload_tests.rst similarity index 100% rename from docs/api_ref/tests/upload_tests.rst rename to docs/tests_ref/upload_tests.rst diff --git a/docs/api_ref/tests/uploadbot_tests.rst b/docs/tests_ref/uploadbot_tests.rst similarity index 100% rename from docs/api_ref/tests/uploadbot_tests.rst rename to docs/tests_ref/uploadbot_tests.rst diff --git a/docs/api_ref/tests/user_tests.rst b/docs/tests_ref/user_tests.rst similarity index 100% rename from docs/api_ref/tests/user_tests.rst rename to docs/tests_ref/user_tests.rst diff --git a/docs/api_ref/tests/utils.rst b/docs/tests_ref/utils.rst similarity index 100% rename from docs/api_ref/tests/utils.rst rename to docs/tests_ref/utils.rst diff --git a/docs/api_ref/tests/weblinkchecker_tests.rst b/docs/tests_ref/weblinkchecker_tests.rst similarity index 100% rename from docs/api_ref/tests/weblinkchecker_tests.rst rename to docs/tests_ref/weblinkchecker_tests.rst diff --git a/docs/api_ref/tests/wikibase_edit_tests.rst b/docs/tests_ref/wikibase_edit_tests.rst similarity index 100% rename from docs/api_ref/tests/wikibase_edit_tests.rst rename to docs/tests_ref/wikibase_edit_tests.rst diff --git a/docs/api_ref/tests/wikibase_tests.rst b/docs/tests_ref/wikibase_tests.rst similarity index 100% rename from docs/api_ref/tests/wikibase_tests.rst rename to docs/tests_ref/wikibase_tests.rst diff --git a/docs/api_ref/tests/wikistats_tests.rst b/docs/tests_ref/wikistats_tests.rst similarity index 100% rename from docs/api_ref/tests/wikistats_tests.rst rename to docs/tests_ref/wikistats_tests.rst diff --git a/docs/api_ref/tests/xmlreader_tests.rst b/docs/tests_ref/xmlreader_tests.rst similarity index 100% rename from docs/api_ref/tests/xmlreader_tests.rst rename to docs/tests_ref/xmlreader_tests.rst diff --git a/tests/README.rst b/tests/README.rst index f4ec38e..9e5e5ee 100644 --- a/tests/README.rst +++ b/tests/README.rst @@ -1,6 +1,6 @@ -=============== +*************** Pywikibot tests -=============== +*************** The Pywikibot tests are based on the `unittest framework <https://docs.python.org/3/library/unittest.html>`_. @@ -22,8 +22,7 @@ The entire suite of tests may be run in the following ways from the root directory: -setup.py -~~~~~~~~ +**setup.py** :: @@ -31,22 +30,19 @@ pip install pytest-runner python setup.py pytest -Module unittest -~~~~~~~~~~~~~~~ +**Module unittest** :: python -m unittest discover -v -p "*_tests.py" -pytest -~~~~~~ +**pytest** :: py.test -tox -~~~ +**tox** :: @@ -59,24 +55,21 @@ With -lang and -family or -site options pwb can be used to specify a site. -unittest -~~~~~~~~ +**unittest** :: python -m unittest -v tests.api_tests tests.site_tests python -m unittest -v tests.api_tests.TestParamInfo.test_init -pytest -~~~~~~ +**pytest** :: py.test -s -v tests/api_tests.py tests/site_tests.py py.test -s -v tests/api_tests.py::TestParamInfo::test_init -pwb -~~~ +**pwb** :: @@ -85,8 +78,7 @@ python pwb.py tests/api_tests -v TestParamInfo.test_init python pwb.py -lang:de -family:wikipedia tests/page_tests -v TestPageObject -env -~~~ +**env** :: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/788457 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: Ib10eb7bb58f9e3f3de889e1ae9cf0b1c477491b0 Gerrit-Change-Number: 788457 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, 11 months

[Gerrit] ...core[master]: [tests] run login_tests action for master only

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/788689 ) Change subject: [tests] run login_tests action for master only ...................................................................... [tests] run login_tests action for master only Change-Id: I375bc146b67ff701ef50bd6a8e4f4badeed78b23 --- M .github/workflows/login_tests-ci.yml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/.github/workflows/login_tests-ci.yml b/.github/workflows/login_tests-ci.yml index 14d46ff..6d06e49 100644 --- a/.github/workflows/login_tests-ci.yml +++ b/.github/workflows/login_tests-ci.yml @@ -7,7 +7,7 @@ on: workflow_run: workflows: [ "Pywikibot CI" ] - branches: [ master, stable ] + branches: [ master ] types: - completed -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/788689 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: I375bc146b67ff701ef50bd6a8e4f4badeed78b23 Gerrit-Change-Number: 788689 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-MessageType: merged

1 year, 11 months

[Gerrit] ...i18n[master]: build: Updating grunt to 1.5.2

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/787041 ) Change subject: build: Updating grunt to 1.5.2 ...................................................................... build: Updating grunt to 1.5.2 Change-Id: I393a750b8e1131f3f6063ea9e3c4a155a02ece65 --- M package-lock.json M package.json 2 files changed, 151 insertions(+), 121 deletions(-) Approvals: Libraryupgrader: Checked jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/package-lock.json b/package-lock.json index 24c5e07..0721622 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "devDependencies": { - "grunt": "1.4.0", + "grunt": "1.5.2", "grunt-banana-checker": "0.9.0" } }, @@ -359,9 +359,9 @@ } }, "node_modules/grunt": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.4.0.tgz", - "integrity": "sha512-yRFc0GVCDu9yxqOFzpuXQ2pEdgtLDnFv5Qz54jfIcNnpJ8Z7B7P7kPkT4VMuRvm+N+QOsI8C4v/Q0DSaoj3LgQ==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.5.2.tgz", + "integrity": "sha512-XCtfaIu72OyDqK24MjWiGC9SwlkuhkS1mrULr1xzuJ2XqAFhP3ZAchZGHJeSCY6mkaOXU4F7SbmmCF7xIVoC9w==", "dev": true, "dependencies": { "dateformat": "~3.0.3", @@ -369,8 +369,8 @@ "exit": "~0.1.2", "findup-sync": "~0.3.0", "glob": "~7.1.6", - "grunt-cli": "~1.4.2", - "grunt-known-options": "~1.1.1", + "grunt-cli": "~1.4.3", + "grunt-known-options": "~2.0.0", "grunt-legacy-log": "~3.0.0", "grunt-legacy-util": "~2.0.1", "iconv-lite": "~0.4.13", @@ -399,10 +399,42 @@ "node": ">=8" } }, + "node_modules/grunt-cli": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.3.tgz", + "integrity": "sha512-9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ==", + "dev": true, + "dependencies": { + "grunt-known-options": "~2.0.0", + "interpret": "~1.1.0", + "liftup": "~3.0.1", + "nopt": "~4.0.1", + "v8flags": "~3.2.0" + }, + "bin": { + "grunt": "bin/grunt" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/grunt-cli/node_modules/nopt": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz", + "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==", + "dev": true, + "dependencies": { + "abbrev": "1", + "osenv": "^0.1.4" + }, + "bin": { + "nopt": "bin/nopt.js" + } + }, "node_modules/grunt-known-options": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.1.…", - "integrity": "sha512-cHwsLqoighpu7TuYj5RonnEuxGVFnztcUqTqp5rXFGYL4OuPFofwC4Ycg7n9fYwvK6F5WbYgeVOwph9Crs2fsQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-2.0.0.…", + "integrity": "sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA==", "dev": true, "engines": { "node": ">=0.10.0" @@ -469,38 +501,6 @@ "node": ">= 8" } }, - "node_modules/grunt/node_modules/grunt-cli": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.2.tgz", - "integrity": "sha512-wsu6BZh7KCnfeaSkDrKIAvOlqGKxNRTZjc8xfZlvxCByQIqUfZ31kh5uHpPnhQ4NdVgvaWaVxa1LUbVU80nACw==", - "dev": true, - "dependencies": { - "grunt-known-options": "~1.1.1", - "interpret": "~1.1.0", - "liftup": "~3.0.1", - "nopt": "~4.0.1", - "v8flags": "~3.2.0" - }, - "bin": { - "grunt": "bin/grunt" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/grunt/node_modules/grunt-cli/node_modules/nopt": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz", - "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==", - "dev": true, - "dependencies": { - "abbrev": "1", - "osenv": "^0.1.4" - }, - "bin": { - "nopt": "bin/nopt.js" - } - }, "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -597,12 +597,15 @@ } }, "node_modules/is-core-module": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.3.0.tgz", - "integrity": "sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw==", + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", + "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", "dev": true, "dependencies": { "has": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/is-extglob": { @@ -615,9 +618,9 @@ } }, "node_modules/is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, "dependencies": { "is-extglob": "^2.1.1" @@ -779,13 +782,13 @@ } }, "node_modules/micromatch": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", - "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", + "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", "dev": true, "dependencies": { - "braces": "^3.0.1", - "picomatch": "^2.2.3" + "braces": "^3.0.2", + "picomatch": "^2.3.1" }, "engines": { "node": ">=8.6" @@ -964,18 +967,21 @@ } }, "node_modules/picomatch": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz", - "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true, "engines": { "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" } }, "node_modules/rechoir": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz", - "integrity": "sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", + "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==", "dev": true, "dependencies": { "resolve": "^1.9.0" @@ -985,13 +991,20 @@ } }, "node_modules/resolve": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", - "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", + "version": "1.22.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", + "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", "dev": true, "dependencies": { - "is-core-module": "^2.2.0", - "path-parse": "^1.0.6" + "is-core-module": "^2.8.1", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/resolve-dir": { @@ -1043,6 +1056,18 @@ "node": ">=8" } }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-prese…", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -1396,9 +1421,9 @@ } }, "grunt": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.4.0.tgz", - "integrity": "sha512-yRFc0GVCDu9yxqOFzpuXQ2pEdgtLDnFv5Qz54jfIcNnpJ8Z7B7P7kPkT4VMuRvm+N+QOsI8C4v/Q0DSaoj3LgQ==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.5.2.tgz", + "integrity": "sha512-XCtfaIu72OyDqK24MjWiGC9SwlkuhkS1mrULr1xzuJ2XqAFhP3ZAchZGHJeSCY6mkaOXU4F7SbmmCF7xIVoC9w==", "dev": true, "requires": { "dateformat": "~3.0.3", @@ -1406,8 +1431,8 @@ "exit": "~0.1.2", "findup-sync": "~0.3.0", "glob": "~7.1.6", - "grunt-cli": "~1.4.2", - "grunt-known-options": "~1.1.1", + "grunt-cli": "~1.4.3", + "grunt-known-options": "~2.0.0", "grunt-legacy-log": "~3.0.0", "grunt-legacy-util": "~2.0.1", "iconv-lite": "~0.4.13", @@ -1416,33 +1441,6 @@ "mkdirp": "~1.0.4", "nopt": "~3.0.6", "rimraf": "~3.0.2" - }, - "dependencies": { - "grunt-cli": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.2.tgz", - "integrity": "sha512-wsu6BZh7KCnfeaSkDrKIAvOlqGKxNRTZjc8xfZlvxCByQIqUfZ31kh5uHpPnhQ4NdVgvaWaVxa1LUbVU80nACw==", - "dev": true, - "requires": { - "grunt-known-options": "~1.1.1", - "interpret": "~1.1.0", - "liftup": "~3.0.1", - "nopt": "~4.0.1", - "v8flags": "~3.2.0" - }, - "dependencies": { - "nopt": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz", - "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==", - "dev": true, - "requires": { - "abbrev": "1", - "osenv": "^0.1.4" - } - } - } - } } }, "grunt-banana-checker": { @@ -1451,10 +1449,35 @@ "integrity": "sha512-SqPiB6OazWqR8USL0NymtuT5Br3mD9WBBsM1rHC/3wIi2SrZNM6/+j9CIeuEM5oCn+AtO2Y0+rzzFyOdC9afAg==", "dev": true }, + "grunt-cli": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.3.tgz", + "integrity": "sha512-9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ==", + "dev": true, + "requires": { + "grunt-known-options": "~2.0.0", + "interpret": "~1.1.0", + "liftup": "~3.0.1", + "nopt": "~4.0.1", + "v8flags": "~3.2.0" + }, + "dependencies": { + "nopt": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz", + "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==", + "dev": true, + "requires": { + "abbrev": "1", + "osenv": "^0.1.4" + } + } + } + }, "grunt-known-options": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.1.…", - "integrity": "sha512-cHwsLqoighpu7TuYj5RonnEuxGVFnztcUqTqp5rXFGYL4OuPFofwC4Ycg7n9fYwvK6F5WbYgeVOwph9Crs2fsQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-2.0.0.…", + "integrity": "sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA==", "dev": true }, "grunt-legacy-log": { @@ -1583,9 +1606,9 @@ } }, "is-core-module": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.3.0.tgz", - "integrity": "sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw==", + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", + "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", "dev": true, "requires": { "has": "^1.0.3" @@ -1598,9 +1621,9 @@ "dev": true }, "is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, "requires": { "is-extglob": "^2.1.1" @@ -1725,13 +1748,13 @@ "dev": true }, "micromatch": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", - "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", + "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", "dev": true, "requires": { - "braces": "^3.0.1", - "picomatch": "^2.2.3" + "braces": "^3.0.2", + "picomatch": "^2.3.1" } }, "minimatch": { @@ -1865,28 +1888,29 @@ "dev": true }, "picomatch": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz", - "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true }, "rechoir": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz", - "integrity": "sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", + "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==", "dev": true, "requires": { "resolve": "^1.9.0" } }, "resolve": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", - "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", + "version": "1.22.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", + "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", "dev": true, "requires": { - "is-core-module": "^2.2.0", - "path-parse": "^1.0.6" + "is-core-module": "^2.8.1", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" } }, "resolve-dir": { @@ -1929,6 +1953,12 @@ "has-flag": "^4.0.0" } }, + "supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-prese…", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true + }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", diff --git a/package.json b/package.json index 47e59fb..5cf0f32 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "test": "grunt test" }, "devDependencies": { - "grunt": "1.4.0", + "grunt": "1.5.2", "grunt-banana-checker": "0.9.0" } } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/787041 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: I393a750b8e1131f3f6063ea9e3c4a155a02ece65 Gerrit-Change-Number: 787041 Gerrit-PatchSet: 1 Gerrit-Owner: Libraryupgrader <tools.libraryupgrader(a)tools.wmflabs.org> Gerrit-Reviewer: Legoktm <legoktm(a)debian.org> Gerrit-Reviewer: Libraryupgrader <tools.libraryupgrader(a)tools.wmflabs.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 11 months

[Gerrit] ...core[master]: [IMPR] use exc_info=True with pywikibot.exception() by default

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/787065 ) Change subject: [IMPR] use exc_info=True with pywikibot.exception() by default ...................................................................... [IMPR] use exc_info=True with pywikibot.exception() by default Bug: T306762 Change-Id: I646834a6b4c07e510206bbc92f2d9c14e397efb8 --- M pywikibot/bot.py M pywikibot/logging.py M pywikibot/scripts/generate_family_file.py M pywikibot/specialbots/_upload.py M scripts/archivebot.py M scripts/category.py M scripts/category_redirect.py M scripts/checkimages.py M scripts/commonscat.py M scripts/cosmetic_changes.py M scripts/dataextend.py M scripts/djvutext.py M scripts/download_dump.py M scripts/fixing_redirects.py M scripts/interwiki.py M scripts/maintenance/cache.py M scripts/movepages.py M scripts/pagefromfile.py M scripts/parser_function_count.py M scripts/redirect.py M scripts/reflinks.py M scripts/replace.py M scripts/revertbot.py M scripts/watchlist.py M scripts/welcome.py M tests/aspects.py M tests/ui_tests.py 27 files changed, 80 insertions(+), 78 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 5183905..5e7de0f 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -964,7 +964,7 @@ try: pywikibot.Site() except (UnknownFamilyError, UnknownSiteError): - pywikibot.exception() + pywikibot.exception(exc_info=False) sys.exit(1) if username: @@ -1516,7 +1516,7 @@ pywikibot.output('successfully.') else: pywikibot.output('by exception:\n') - pywikibot.exception() + pywikibot.exception(exc_info=False) def init_page(self, item: Any) -> 'pywikibot.page.BasePage': """Initialize a generator item before treating. diff --git a/pywikibot/logging.py b/pywikibot/logging.py index 5399d03..a955887 100644 --- a/pywikibot/logging.py +++ b/pywikibot/logging.py @@ -290,25 +290,26 @@ # Note: The logoutput frame must be updated if this decorator is removed @deprecated_args(tb='exc_info') # since 7.2 -def exception(msg: Any = None, *args: Any, **kwargs: Any) -> None: +def exception(msg: Any = None, *args: Any, + exc_info: bool = True, **kwargs: Any) -> None: """Output an error traceback to the user with level :const:`ERROR`. Use directly after an 'except' statement:: ... except Exception: - pywikibot.exception('exc_info'=True) + pywikibot.exception() ... or alternatively:: ... except Exception as e: - pywikibot.exception(e, 'exc_info'=True) + pywikibot.exception(e) ... - Without `exc_info` parameter this function works like :func:`error` - except that the `msg` parameter may be omitted. + With `exc_info=False` this function works like :func:`error` except + that the `msg` parameter may be omitted. This function should only be called from an Exception handler. ``msg`` will be sent to stderr via :mod:`pywikibot.userinterfaces`. The arguments are interpreted as for :func:`logoutput`. @@ -316,6 +317,8 @@ .. versionchanged:: 7.2 only keyword arguments are allowed except for `msg`; `exc_info` keyword is to be used instead of `tb`. + .. versionchanged:: 7.3 + `exc_info` is True by default .. seealso:: :python:`Logger.exception() <library/logging.html#logging.Logger.exception>` @@ -325,7 +328,7 @@ if msg is None: exc_type, value, _tb = sys.exc_info() msg = str(value) - if not kwargs.get('exc_info', False): + if not exc_info: msg += ' ({})'.format(exc_type.__name__) assert msg is not None - error(msg, *args, **kwargs) + error(msg, *args, exc_info=exc_info, **kwargs) diff --git a/pywikibot/scripts/generate_family_file.py b/pywikibot/scripts/generate_family_file.py index e109e7a..817409c 100755 --- a/pywikibot/scripts/generate_family_file.py +++ b/pywikibot/scripts/generate_family_file.py @@ -116,8 +116,8 @@ try: w = self.Wiki(self.base_url, verify=verify) except FatalServerError: # pragma: no cover - print('ERROR: ' - + pywikibot.comms.http.SSL_CERT_VERIFY_FAILED_MSG) + pywikibot.error( + pywikibot.comms.http.SSL_CERT_VERIFY_FAILED_MSG) pywikibot.exception() if not pywikibot.bot.input_yn( 'Retry with disabled ssl certificate validation', diff --git a/pywikibot/specialbots/_upload.py b/pywikibot/specialbots/_upload.py index 66a81bb..d72bd15 100644 --- a/pywikibot/specialbots/_upload.py +++ b/pywikibot/specialbots/_upload.py @@ -401,8 +401,8 @@ and (not site.has_right('upload_by_url') or download): try: file_url = self.read_file_content(file_url) - except FatalServerError: - pywikibot.exception() + except FatalServerError as e: + pywikibot.error(e) return None try: @@ -418,14 +418,14 @@ .format(site)) elif error.code == 'copyuploadbaddomain' and not download \ and '://' in file_url: - pywikibot.exception() + pywikibot.error(error) pywikibot.output('Downloading the file and retry...') download = True continue else: - pywikibot.error('Upload error: ', exc_info=True) + pywikibot.exception('Upload error: ') except Exception: - pywikibot.error('Upload error: ', exc_info=True) + pywikibot.exception('Upload error: ') else: if success: # No warning, upload complete. diff --git a/scripts/archivebot.py b/scripts/archivebot.py index 1ba136b..6d53efc 100755 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -911,7 +911,7 @@ .format(pg, e)) except Exception: pywikibot.exception('Error occurred while processing page {}' - .format(pg), exc_info=True) + .format(pg)) if __name__ == '__main__': diff --git a/scripts/category.py b/scripts/category.py index 5a7e12b..7386033 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -1619,7 +1619,7 @@ try: bot.run() except Error: - pywikibot.error('Fatal error:', exc_info=True) + pywikibot.exception('Fatal error:') finally: if cat_db: cat_db.dump() diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py index 2b542ae..d0ce5b7 100755 --- a/scripts/category_redirect.py +++ b/scripts/category_redirect.py @@ -264,8 +264,8 @@ message = i18n.twtranslate( self.site, 'category_redirect-log-added', params) self.log_text.append(message) - except Error: - pywikibot.exception() + except Error as e: + pywikibot.error(e) message = i18n.twtranslate( self.site, 'category_redirect-log-add-failed', params) self.log_text.append(message) diff --git a/scripts/checkimages.py b/scripts/checkimages.py index 0c9430e..f3ea138 100755 --- a/scripts/checkimages.py +++ b/scripts/checkimages.py @@ -602,8 +602,8 @@ pywikibot.output('Edit Conflict! Retrying...') try: self.put_mex_in_talk() - except Exception: - pywikibot.exception() + except Exception as e: + pywikibot.error(e) pywikibot.output( 'Another error... skipping the user...') diff --git a/scripts/commonscat.py b/scripts/commonscat.py index d2b0915..ad8392f 100755 --- a/scripts/commonscat.py +++ b/scripts/commonscat.py @@ -381,8 +381,8 @@ pywikibot.log('Looking for template on ' + ipage.title()) try: # T291783 ipage_exists = ipage.exists() - except InvalidTitleError: - pywikibot.exception() + except InvalidTitleError as e: + pywikibot.error(e) continue if (not ipage_exists or ipage.isRedirectPage() diff --git a/scripts/cosmetic_changes.py b/scripts/cosmetic_changes.py index f432a61..96e6c4b 100755 --- a/scripts/cosmetic_changes.py +++ b/scripts/cosmetic_changes.py @@ -77,8 +77,8 @@ ignore=self.opt.ignore) try: old_text = self.current_page.text - except InvalidPageError: - pywikibot.exception() + except InvalidPageError as e: + pywikibot.error(e) return new_text = cc_toolkit.change(old_text) diff --git a/scripts/dataextend.py b/scripts/dataextend.py index 5f916df..1411475 100644 --- a/scripts/dataextend.py +++ b/scripts/dataextend.py @@ -15437,8 +15437,8 @@ repo = pywikibot.Site().data_repository() try: item = pywikibot.ItemPage(repo, item) - except InvalidTitleError: - pywikibot.exception() + except InvalidTitleError as e: + pywikibot.error(e) else: bot = DataExtendBot(site=repo, generator=[item], **options) bot.run() diff --git a/scripts/djvutext.py b/scripts/djvutext.py index 509ddeb..8e3ca18 100755 --- a/scripts/djvutext.py +++ b/scripts/djvutext.py @@ -214,4 +214,4 @@ try: main() except Exception: - pywikibot.error('Fatal error:', exc_info=True) + pywikibot.exception('Fatal error:') diff --git a/scripts/download_dump.py b/scripts/download_dump.py index 4a7b6cf..abe740c 100755 --- a/scripts/download_dump.py +++ b/scripts/download_dump.py @@ -164,13 +164,13 @@ replace(file_current_storepath, file_final_storepath) break - except OSError: - pywikibot.exception() + except OSError as e: + pywikibot.error(e) try: remove(file_current_storepath) - except OSError: - pywikibot.exception() + except OSError as e: + pywikibot.error(e) # If the atomic download fails, try without a temporary file # If the non-atomic download also fails, exit the script diff --git a/scripts/fixing_redirects.py b/scripts/fixing_redirects.py index bdb3700..b147f86 100755 --- a/scripts/fixing_redirects.py +++ b/scripts/fixing_redirects.py @@ -97,8 +97,8 @@ # Check whether the link found is to page. try: actual_link_page.title() - except InvalidTitleError: - pywikibot.exception() + except InvalidTitleError as e: + pywikibot.error(e) continue if actual_link_page != linked_page: continue @@ -172,8 +172,8 @@ InvalidTitleError, InterwikiRedirectPageError): pass - except RuntimeError: - pywikibot.exception() + except RuntimeError as e: + pywikibot.error(e) else: section = target.section() if section and not does_text_contain_section(target.text, @@ -193,8 +193,8 @@ """Change all redirects from the current page to actual links.""" try: newtext = self.current_page.text - except InvalidPageError: - pywikibot.exception() + except InvalidPageError as e: + pywikibot.error(e) return with ThreadPoolExecutor() as executor: diff --git a/scripts/interwiki.py b/scripts/interwiki.py index d6473b0..2b5d814 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -1723,8 +1723,8 @@ page.save(summary=mcomment, asynchronous=self.conf.asynchronous, nocreate=True) - except NoCreateError: - pywikibot.exception() + except NoCreateError as e: + pywikibot.error(e) return False except LockedPageError: pywikibot.output('Page {} is locked. Skipping.' @@ -2430,7 +2430,7 @@ except KeyboardInterrupt: dump.write_dump(bot.dump_titles, append) except Exception: - pywikibot.exception(tb=bool(config.verbose_output)) + pywikibot.exception(exc_info=bool(config.verbose_output)) dump.write_dump(bot.dump_titles, append) else: pywikibot.output('Script terminated sucessfully.') diff --git a/scripts/maintenance/cache.py b/scripts/maintenance/cache.py index cb24d54..48da334 100755 --- a/scripts/maintenance/cache.py +++ b/scripts/maintenance/cache.py @@ -265,10 +265,10 @@ try: entry._load_cache() - except ValueError as e: + except ValueError: pywikibot.error('Failed loading {}'.format( entry._cachefile_path())) - pywikibot.exception(e, exc_info=True) + pywikibot.exception() continue if use_accesstime is None: @@ -282,19 +282,19 @@ try: entry.parse_key() - except ParseError: + except ParseError as e: pywikibot.error('Problems parsing {} with key {}' .format(entry.filename, entry.key)) - pywikibot.exception() + pywikibot.error(e) continue try: entry._rebuild() - except Exception as e: + except Exception: pywikibot.error('Problems loading {} with key {}, {!r}' .format(entry.filename, entry.key, entry._parsed_key)) - pywikibot.exception(e, exc_info=True) + pywikibot.exception() continue if func is None or func(entry): @@ -317,8 +317,8 @@ try: return eval('lambda entry: ' + command) - except Exception: - pywikibot.exception() + except Exception as e: + pywikibot.error(e) pywikibot.error( 'Cannot compile {} command: {}'.format(name, command)) return None diff --git a/scripts/movepages.py b/scripts/movepages.py index 118dc9c..c59d653 100755 --- a/scripts/movepages.py +++ b/scripts/movepages.py @@ -86,8 +86,8 @@ movetalk=self.opt.movetalkpage, movesubpages=self.opt.movesubpages, noredirect=self.opt.noredirect) - except PageRelatedError: - pywikibot.exception() + except PageRelatedError as e: + pywikibot.error(e) def skip_page(self, page): """Treat only non-redirect pages if 'skipredirects' is set.""" diff --git a/scripts/pagefromfile.py b/scripts/pagefromfile.py index fd29a6b..a29606f 100755 --- a/scripts/pagefromfile.py +++ b/scripts/pagefromfile.py @@ -209,8 +209,8 @@ encoding=config.textfile_encoding) as f: text = f.read() - except OSError: - pywikibot.exception() + except OSError as e: + pywikibot.error(e) return position = 0 diff --git a/scripts/parser_function_count.py b/scripts/parser_function_count.py index 83d4566..df996e1 100755 --- a/scripts/parser_function_count.py +++ b/scripts/parser_function_count.py @@ -168,8 +168,8 @@ with codecs.open( self.opt.save, encoding='utf-8', mode='a') as f: f.write(resultlist) - except OSError: - pywikibot.exception() + except OSError as e: + pywikibot.error(e) if self.opt.upload: page = pywikibot.Page(self.site, self.opt.upload) diff --git a/scripts/redirect.py b/scripts/redirect.py index e7eaa39..4488167 100755 --- a/scripts/redirect.py +++ b/scripts/redirect.py @@ -489,8 +489,8 @@ """Get redirect target page and handle some exceptions.""" try: return page.getRedirectTarget() - except (CircularRedirectError, RuntimeError): - pywikibot.exception() + except (CircularRedirectError, RuntimeError) as e: + pywikibot.error(e) pywikibot.output('Skipping {}.'.format(page)) except InterwikiRedirectPageError: pywikibot.output('{} is on another site, skipping.'.format(page)) @@ -502,8 +502,8 @@ done = not self.opt.delete try: targetPage = self.get_redirect_target(redir_page) - except InvalidTitleError: - pywikibot.exception() + except InvalidTitleError as e: + pywikibot.error(e) targetPage = None if not targetPage: @@ -511,8 +511,8 @@ try: targetPage.get() - except InvalidTitleError: - pywikibot.exception() + except InvalidTitleError as e: + pywikibot.error(e) except NoPageError: movedTarget = None with suppress(NoMoveTargetError): @@ -582,8 +582,8 @@ pywikibot.warning( "Redirect target section {} doesn't exist." .format(newRedir.title(as_link=True))) - except UnsupportedPageError: - pywikibot.exception() + except UnsupportedPageError as e: + pywikibot.error(e) pywikibot.output('Skipping {}.'.format(newRedir)) break except NoPageError: diff --git a/scripts/reflinks.py b/scripts/reflinks.py index d8e571c..23ae56b 100755 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -510,9 +510,9 @@ pywikibot.output('pdfinfo value error.') except OSError: pywikibot.output('pdfinfo OS error.') - except Exception: # Ignore errors + except Exception as e: # Ignore errors pywikibot.output('PDF processing error.') - pywikibot.exception() + pywikibot.error(e) else: for aline in pdfinfo_out.splitlines(): if isinstance(aline, bytes): diff --git a/scripts/replace.py b/scripts/replace.py index fe93bad..6d807db 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -664,8 +664,8 @@ """Work on each page retrieved from generator.""" try: original_text = page.text - except InvalidPageError: - pywikibot.exception() + except InvalidPageError as e: + pywikibot.error(e) return applied = set() new_text = original_text diff --git a/scripts/revertbot.py b/scripts/revertbot.py index 551f81f..ea4a5d5 100755 --- a/scripts/revertbot.py +++ b/scripts/revertbot.py @@ -143,7 +143,7 @@ return 'The edit(s) made in {} by {} was rollbacked'.format( page.title(), self.user) - pywikibot.exception() + pywikibot.exception(exc_info=False) return False def log(self, msg) -> None: diff --git a/scripts/watchlist.py b/scripts/watchlist.py index dd3ed60..1b94bd4 100755 --- a/scripts/watchlist.py +++ b/scripts/watchlist.py @@ -135,8 +135,8 @@ for page in watchlist: try: pywikibot.stdout(page.title()) - except InvalidTitleError: - pywikibot.exception() + except InvalidTitleError as e: + pywikibot.error(e) if __name__ == '__main__': diff --git a/scripts/welcome.py b/scripts/welcome.py index 223b327..5086e92 100755 --- a/scripts/welcome.py +++ b/scripts/welcome.py @@ -709,8 +709,8 @@ or ue.action() == 'autocreate' and globalvar.welcome_auto: try: user = ue.page() - except HiddenKeyError: - pywikibot.exception() + except HiddenKeyError as e: + pywikibot.error(e) else: yield user diff --git a/tests/aspects.py b/tests/aspects.py index 89653a8..8bfbb66 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -468,8 +468,7 @@ r.status_code, HTTPStatus(r.status_code).phrase)) except Exception as e: pywikibot.exception('{}: accessing {} caused exception:' - .format(cls.__name__, hostname), - exc_info=True) + .format(cls.__name__, hostname)) cls._checked_hostnames[hostname] = e raise unittest.SkipTest( diff --git a/tests/ui_tests.py b/tests/ui_tests.py index 6df6054..3c81000 100755 --- a/tests/ui_tests.py +++ b/tests/ui_tests.py @@ -157,7 +157,7 @@ try: raise TestExceptionError('Testing Exception') except TestExceptionError: - pywikibot.exception('exception') + pywikibot.error('exception', exc_info=False) self.assertEqual(self.strout.getvalue(), '') self.assertEqual(self.strerr.getvalue(), 'ERROR: exception\n') @@ -166,7 +166,7 @@ try: raise TestExceptionError('Testing Exception') except TestExceptionError: - pywikibot.exception() + pywikibot.exception(exc_info=False) self.assertEqual(self.strout.getvalue(), '') self.assertEqual(self.strerr.getvalue(), 'ERROR: Testing Exception (TestExceptionError)\n') @@ -175,7 +175,7 @@ try: raise TestExceptionError('Testing Exception') except TestExceptionError: - pywikibot.exception(exc_info=True) + pywikibot.exception() self.assertEqual(self.strout.getvalue(), '') stderrlines = self.strerr.getvalue().split('\n') self.assertEqual(stderrlines[0], -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/787065 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: I646834a6b4c07e510206bbc92f2d9c14e397efb8 Gerrit-Change-Number: 787065 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 year, 11 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits May 2022