Pywikibot-commits February 2021

pywikibot-commits@lists.wikimedia.org

1 participants
134 discussions

[Gerrit] ...core[master]: [tests] intall requirements with travis

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662937 ) Change subject: [tests] intall requirements with travis ...................................................................... [tests] intall requirements with travis Change-Id: I7661af69b1769dd0e2ca8234fd7771600dc089bb --- M .travis.yml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.travis.yml b/.travis.yml index 40289d6..61b2dc5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,6 +50,7 @@ # Make Travis reinstall default pytest (T255349) - pip uninstall -y pytest - pip install -r dev-requirements.txt + - pip install -r requirements.txt before_script: - if [[ "$PYSETUP_TEST_EXTRAS" != '1' ]]; then -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662937 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: I7661af69b1769dd0e2ca8234fd7771600dc089bb Gerrit-Change-Number: 662937 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 3 months

[Gerrit] ...core[master]: [tests] remove 7 years old code stuff

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662931 ) Change subject: [tests] remove 7 years old code stuff ...................................................................... [tests] remove 7 years old code stuff See http://stackoverflow.com/a/13751649/163740 Change-Id: I2c2331b07b615ff74d75dca84ac559242c862bc0 --- M .appveyor.yml 1 file changed, 0 insertions(+), 9 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.appveyor.yml b/.appveyor.yml index 4348ef6..31342b8 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -3,13 +3,6 @@ version: 6.0.{build} environment: - APPVEYOR_PYTHON_URL: "https://raw.githubusercontent.com/dvorapa/python-appveyor-demo/master/appve…" - - # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the - # /E:ON and /V:ON options are not enabled in the batch script interpreter - # See: http://stackoverflow.com/a/13751649/163740 - CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_env.cmd" - PYWIKIBOT_DIR: "%appdata%\\Pywikibot" PYWIKIBOT_USER_CONFIG: "%appdata%\\Pywikibot\\user-config.py" PYWIKIBOT_PASSWD_FILE: "%appdata%\\Pywikibot\\passwordfile" @@ -81,8 +74,6 @@ # Download the Appveyor Python build accessories into subdirectory .\appveyor - mkdir appveyor - ps: $wc = new-object net.webclient - - ps: $run = $wc.DownloadString($env:APPVEYOR_PYTHON_URL + 'run_with_env.cmd') - - ps: $run | Out-File -Encoding ascii -FilePath appveyor\run_with_env.cmd - python -m venv env - env\Scripts\activate.bat -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662931 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: I2c2331b07b615ff74d75dca84ac559242c862bc0 Gerrit-Change-Number: 662931 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 3 months

[Gerrit] ...core[master]: [tests] remove Pythin install script in appveyor

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662919 ) Change subject: [tests] remove Pythin install script in appveyor ...................................................................... [tests] remove Pythin install script in appveyor Python 3.5 and 3.9 does not run anyway. Try the defaults. Change-Id: If8c42af3249bc74354b4026261937d37a656be70 --- M .appveyor.yml 1 file changed, 0 insertions(+), 5 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.appveyor.yml b/.appveyor.yml index 6d5c7ba..4348ef6 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -84,11 +84,6 @@ - ps: $run = $wc.DownloadString($env:APPVEYOR_PYTHON_URL + 'run_with_env.cmd') - ps: $run | Out-File -Encoding ascii -FilePath appveyor\run_with_env.cmd - # This is needed for Python versions not installed on Appveyor build machines - - ps: | - if (-not(Test-Path($env:PYTHON))) { - iex $wc.DownloadString($env:APPVEYOR_PYTHON_URL + 'install.ps1') - } - python -m venv env - env\Scripts\activate.bat - pip install -r dev-requirements.txt -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662919 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: If8c42af3249bc74354b4026261937d37a656be70 Gerrit-Change-Number: 662919 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 3 months

[Gerrit] ...core[master]: [tests] exclude maintenance scripts from coverage

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662909 ) Change subject: [tests] exclude maintenance scripts from coverage ...................................................................... [tests] exclude maintenance scripts from coverage Change-Id: I272e28d8cdbe640ab2676afe87c838b5ec408dfe --- M .codecov.yml 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.codecov.yml b/.codecov.yml index 06e9839..a812178 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -14,13 +14,18 @@ enabled: yes ignore: + - pywikibot/backports.py - pywikibot/data/mysql.py - pywikibot/daemonize.py - pywikibot/families/__init__.py - scripts/archive - scripts/userscripts - scripts/maintenance/colors.py + - scripts/maintenance/interwkidumps.py - scripts/maintenance/make_i18n_dict.py + - scripts/maintenance/preload_sites.py + - scripts/maintenance/sorting_order.py + - scripts/maintenance/update_linktrails.py - scripts/maintenance/wikimedia_sites.py notify: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662909 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: I272e28d8cdbe640ab2676afe87c838b5ec408dfe Gerrit-Change-Number: 662909 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 3 months

[Gerrit] ...core[master]: [tests] exclude some version functions from coverage

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662906 ) Change subject: [tests] exclude some version functions from coverage ...................................................................... [tests] exclude some version functions from coverage coverage for svn functions cannot be done via tests which is git based. Change-Id: Iaecadb035f40bea3fd01b9fd74b2697275d96b9e --- M pywikibot/version.py 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/version.py b/pywikibot/version.py index d821a56..5667630 100644 --- a/pywikibot/version.py +++ b/pywikibot/version.py @@ -133,7 +133,7 @@ return {'tag': tag, 'rev': rev, 'date': datestring, 'hsh': hsh} -def svn_rev_info(path): +def svn_rev_info(path): # pragma: no cover """Fetch information about the current revision of a Subversion checkout. @param path: directory of the Subversion checkout @@ -184,7 +184,7 @@ return tag, rev, date -def github_svn_rev2hash(tag: str, rev): +def github_svn_rev2hash(tag: str, rev): # pragma: no cover """Convert a Subversion revision to a Git hash using Github. @param tag: name of the Subversion repo on Github @@ -204,7 +204,7 @@ return hsh, date -def getversion_svn(path=None): +def getversion_svn(path=None): # pragma: no cover """Get version info for a Subversion checkout. @param path: directory of the Subversion checkout @@ -287,7 +287,7 @@ return (tag, rev, date, hsh) -def getversion_nightly(path=None): +def getversion_nightly(path=None): # pragma: no cover """Get version info for a nightly release. @param path: directory of the uncompressed nightly. @@ -347,7 +347,7 @@ @deprecated('pywikibot.__version__', since='20201003') -def get_module_version(module) -> Optional[str]: +def get_module_version(module) -> Optional[str]: # pragma: no cover """ Retrieve __version__ variable from an imported module. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662906 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: Iaecadb035f40bea3fd01b9fd74b2697275d96b9e Gerrit-Change-Number: 662906 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 3 months

[Gerrit] ...core[master]: [tests] Reconfig travis job lifecycle

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662902 ) Change subject: [tests] Reconfig travis job lifecycle ...................................................................... [tests] Reconfig travis job lifecycle Change-Id: I8276204118182b2297215e57fed96082b6a3d1c1 --- M .travis.yml 1 file changed, 4 insertions(+), 6 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.travis.yml b/.travis.yml index 8635e29..40289d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,17 +45,18 @@ export PYWIKIBOT_TEST_WRITE_FAIL=1 ; fi -before_script: +install: - pip install -U setuptools # Make Travis reinstall default pytest (T255349) - pip uninstall -y pytest - pip install -r dev-requirements.txt -script: +before_script: - if [[ "$PYSETUP_TEST_EXTRAS" != '1' ]]; then pip install -e .[mwoauth]; fi +script: - mkdir ~/.pywikibot - python pwb.py generate_family_file 'https://wiki.musicbrainz.org/' musicbrainz 'n' @@ -118,10 +119,7 @@ coverage run -m unittest discover -vv -p "*_tests.py" ; fi -after_success: - codecov - -after_failure: +after_script: codecov env: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662902 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: I8276204118182b2297215e57fed96082b6a3d1c1 Gerrit-Change-Number: 662902 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 3 months

[Gerrit] ...core[master]: [tests] Remove libssl1.0.0 dependency

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662900 ) Change subject: [tests] Remove libssl1.0.0 dependency ...................................................................... [tests] Remove libssl1.0.0 dependency Tests are made on xenial dist; remove outdated dependency Bug: T134647 Change-Id: If0c8478a46f5e3e231dcbd714cf3eebd3ac7e229 --- M .travis.yml 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.travis.yml b/.travis.yml index bae3528..8635e29 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,6 @@ addons: apt: packages: - - libssl1.0.0 - djvulibre-bin before_install: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662900 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: If0c8478a46f5e3e231dcbd714cf3eebd3ac7e229 Gerrit-Change-Number: 662900 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 3 months

[Gerrit] ...core[master]: Adopted use of context Manager call for assertRaises/assertRaisesRegex

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662107 ) Change subject: Adopted use of context Manager call for assertRaises/assertRaisesRegex ...................................................................... Adopted use of context Manager call for assertRaises/assertRaisesRegex Bug: T267801 Change-Id: I54196adfea71eb9071be6c797e84667bd7b0811f --- M tests/siteinfo_tests.py M tests/token_tests.py M tests/tools_formatter_tests.py M tests/tools_tests.py M tests/ui_options_tests.py M tests/user_tests.py M tests/weblinkchecker_tests.py M tests/wikibase_edit_tests.py M tests/wikibase_tests.py 9 files changed, 158 insertions(+), 114 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/siteinfo_tests.py b/tests/siteinfo_tests.py index 4bb48e5..c3350ee 100644 --- a/tests/siteinfo_tests.py +++ b/tests/siteinfo_tests.py @@ -79,7 +79,8 @@ """Test accessing a property not in siteinfo.""" not_exists = 'this-property-does-not-exist' mysite = self.site - self.assertRaises(KeyError, mysite.siteinfo.__getitem__, not_exists) + with self.assertRaises(KeyError): + mysite.siteinfo.__getitem__(not_exists) self.assertNotIn(not_exists, mysite.siteinfo) self.assertIsEmpty(mysite.siteinfo.get(not_exists)) self.assertFalse(entered_loop(mysite.siteinfo.get(not_exists))) diff --git a/tests/token_tests.py b/tests/token_tests.py index 56181c4..05b2471 100644 --- a/tests/token_tests.py +++ b/tests/token_tests.py @@ -99,8 +99,8 @@ def test_invalid_token(self): """Test invalid token.""" - self.assertRaises(pywikibot.Error, lambda t: self.mysite.tokens[t], - 'invalidtype') + with self.assertRaises(pywikibot.Error): + self.mysite.tokens['invalidtype'] class TokenTestBase(TestCaseBase): @@ -153,7 +153,8 @@ rc = rc[0] # site.patrol() needs params - self.assertRaises(pywikibot.Error, lambda x: list(x), mysite.patrol()) + with self.assertRaises(pywikibot.Error): + list(mysite.patrol()) try: result = list(mysite.patrol(rcid=rc['rcid'])) except api.APIError as error: diff --git a/tests/tools_formatter_tests.py b/tests/tools_formatter_tests.py index c570378..c4e92f7 100644 --- a/tests/tools_formatter_tests.py +++ b/tests/tools_formatter_tests.py @@ -1,6 +1,6 @@ """Tests for the C{pywikibot.tools.formatter} module.""" # -# (C) Pywikibot team, 2015-2020 +# (C) Pywikibot team, 2015-2021 # # Distributed under the terms of the MIT license. # @@ -61,29 +61,33 @@ """Test with colors in template string.""" self.assert_format('{0}{black}', '42\03{black}', 42) self.assert_format('{ans}{black}', '42\03{black}', ans=42) - self.assertRaisesRegex( - ValueError, r'.*conversion.*', formatter.color_format, - '{0}{black!r}', 42) - self.assertRaisesRegex( - ValueError, r'.*format spec.*', formatter.color_format, - '{0}{black:03}', 42) + with self.assertRaisesRegex( + ValueError, + r'.*conversion.*'): + formatter.color_format('{0}{black!r}', 42) + with self.assertRaisesRegex( + ValueError, + r'.*format spec.*'): + formatter.color_format('{0}{black:03}', 42) def test_marker(self): r"""Test that the \03 marker is only allowed in front of colors.""" self.assert_format('{0}\03{black}', '42\03{black}', 42) # literal before a normal field - self.assertRaisesRegex( - ValueError, r'.*\\03', formatter.color_format, - '\03{0}{black}', 42) + with self.assertRaisesRegex( + ValueError, + r'.*\\03'): + formatter.color_format('\03{0}{black}', 42) # literal before a color field - self.assertRaisesRegex( - ValueError, r'.*\\03', formatter.color_format, - '{0}\03before{black}', 42) + with self.assertRaisesRegex( + ValueError, + r'.*\\03'): + formatter.color_format('{0}\03before{black}', 42) def test_color_kwargs(self): """Test with a color as keyword argument.""" - self.assertRaises(ValueError, - formatter.color_format, '{aqua}{black}', aqua=42) + with self.assertRaises(ValueError): + formatter.color_format('{aqua}{black}', aqua=42) def test_non_ascii(self): """Test non-ASCII replacements.""" @@ -94,9 +98,10 @@ def test_bytes_format(self): """Test that using `bytes` is not allowed.""" - self.assertRaises(TypeError, formatter.color_format, b'{0}', 'a') - self.assertRaises(TypeError, formatter.color_format, b'{black}{0}', - 'a') + with self.assertRaises(TypeError): + formatter.color_format(b'{0}', 'a') + with self.assertRaises(TypeError): + formatter.color_format(b'{black}{0}', 'a') def test_variant_colors(self): """Test variant colors with {color} parameter.""" diff --git a/tests/tools_tests.py b/tests/tools_tests.py index 1335459..384332a 100644 --- a/tests/tools_tests.py +++ b/tests/tools_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/python """Test tools package alone which don't fit into other tests.""" # -# (C) Pywikibot team, 2015-2020 +# (C) Pywikibot team, 2015-2021 # # Distributed under the terms of the MIT license. import decimal @@ -81,10 +81,10 @@ 'used when bz2 and bz2file are not importable') try: tools.bz2 = ImportError(bz2_import_error) - self.assertRaisesRegex(ImportError, - bz2_import_error, - self._get_content, - self.base_file + '.bz2') + with self.assertRaisesRegex( + ImportError, + bz2_import_error): + self._get_content(self.base_file + '.bz2') finally: tools.bz2 = old_bz2 @@ -101,11 +101,11 @@ self.skipTest('7za not installed') self.assertEqual( self._get_content(self.base_file + '.7z'), self.original_content) - self.assertRaisesRegex(OSError, - 'Unexpected STDERR output from 7za ', - self._get_content, - self.base_file + '_invalid.7z', - use_extension=True) + with self.assertRaisesRegex( + OSError, + 'Unexpected STDERR output from 7za '): + self._get_content(self.base_file + '_invalid.7z', + use_extension=True) def test_open_archive_lzma(self): """Test open_archive with lzma compressor in the standard library.""" @@ -128,14 +128,14 @@ 'used when lzma is not importable') try: tools.lzma = ImportError(lzma_import_error) - self.assertRaisesRegex(ImportError, - lzma_import_error, - self._get_content, - self.base_file + '.lzma') - self.assertRaisesRegex(ImportError, - lzma_import_error, - self._get_content, - self.base_file + '.xz') + with self.assertRaisesRegex( + ImportError, + lzma_import_error): + self._get_content(self.base_file + '.lzma') + with self.assertRaisesRegex( + ImportError, + lzma_import_error): + self._get_content(self.base_file + '.xz') finally: tools.lzma = old_lzma @@ -169,23 +169,23 @@ def test_invalid_modes(self): """Test various invalid mode configurations.""" - self.assertRaisesRegex(ValueError, - 'Invalid mode: "ra"', - tools.open_archive, - '/dev/null', 'ra') # two modes besides - self.assertRaisesRegex(ValueError, - 'Invalid mode: "rt"', - tools.open_archive, - '/dev/null', 'rt') # text mode - self.assertRaisesRegex(ValueError, - 'Invalid mode: "br"', - tools.open_archive, - '/dev/null', 'br') # binary at front - self.assertRaisesRegex(ValueError, - 'Magic number detection only when reading', - tools.open_archive, - # writing without extension - '/dev/null', 'wb', False) + with self.assertRaisesRegex( + ValueError, + 'Invalid mode: "ra"'): + tools.open_archive('/dev/null', 'ra') # two modes besides + with self.assertRaisesRegex( + ValueError, + 'Invalid mode: "rt"'): + tools.open_archive('/dev/null', 'rt') # text mode + with self.assertRaisesRegex( + ValueError, + 'Invalid mode: "br"'): + tools.open_archive('/dev/null', 'br') # binary at front + with self.assertRaisesRegex( + ValueError, + 'Magic number detection only when reading'): + tools.open_archive('/dev/null', # writing without extension + 'wb', False) def test_binary_mode(self): """Test that it uses binary mode.""" @@ -206,11 +206,10 @@ def test_write_archive_7z(self): """Test writing an archive as a 7z archive.""" - self.assertRaisesRegex(NotImplementedError, - 'It is not possible to write a 7z file.', - tools.open_archive, - '/dev/null.7z', - mode='wb') + with self.assertRaisesRegex( + NotImplementedError, + 'It is not possible to write a 7z file.'): + tools.open_archive('/dev/null.7z', mode='wb') def test_write_archive_lzma(self): """Test writing a lzma archive.""" @@ -259,13 +258,12 @@ def test_conflict(self): """Test that it detects conflicts.""" - self.assertRaisesRegex( - ValueError, '42', tools.merge_unique_dicts, self.dct1, - **{'42': 'bad'}) - self.assertRaisesRegex( - ValueError, '42', tools.merge_unique_dicts, self.dct1, self.dct1) - self.assertRaisesRegex( - ValueError, '42', tools.merge_unique_dicts, self.dct1, **self.dct1) + with self.assertRaisesRegex(ValueError, '42'): + tools.merge_unique_dicts(self.dct1, **{'42': 'bad'}) + with self.assertRaisesRegex(ValueError, '42'): + tools.merge_unique_dicts(self.dct1, self.dct1) + with self.assertRaisesRegex(ValueError, '42'): + tools.merge_unique_dicts(self.dct1, **self.dct1) class TestIsSliceWithEllipsis(TestCase): @@ -451,7 +449,8 @@ else: self.assertEqual(deduped, {1, 2, 3, 4}) - self.assertRaises(StopIteration, next, deduper) + with self.assertRaises(StopIteration): + next(deduper) def _test_dedup_str(self, deduped, deduper, key=None): """Test filter_unique results for str.""" @@ -478,7 +477,8 @@ else: self.assertEqual(deduped, {key(i) for i in self.strs}) - self.assertRaises(StopIteration, next, deduper) + with self.assertRaises(StopIteration): + next(deduper) def test_set(self): """Test filter_unique with a set.""" @@ -530,7 +530,8 @@ self.assertIsEmpty(deduped) for _ in self.decs: self.assertEqual(id(next(deduper)), deduped.pop()) - self.assertRaises(StopIteration, next, deduper) + with self.assertRaises(StopIteration): + next(deduper) # len(Decimal with distinct ids) != len(Decimal with distinct value). deduper_ids = list(tools.filter_unique(self.decs, key=id)) self.assertNotEqual(len(deduper_ids), len(set(deduper_ids))) @@ -558,7 +559,8 @@ self.assertEqual(deduped, [1, 3, 2]) last = next(gen2) self.assertEqual(last, 4) - self.assertRaises(StopIteration, next, gen2) + with self.assertRaises(StopIteration): + next(gen2) def test_skip(self): """Test filter_unique with a container that skips items.""" @@ -586,7 +588,8 @@ self.assertEqual(deduped, {1, 3}) # And it should not resume - self.assertRaises(StopIteration, next, deduper) + with self.assertRaises(StopIteration): + next(deduper) deduped = AddStopList() deduped.stop_list = [4] @@ -596,7 +599,8 @@ self.assertEqual(deduped, {1, 2, 3}) # And it should not resume - self.assertRaises(StopIteration, next, deduper) + with self.assertRaises(StopIteration): + next(deduper) class TestFileModeChecker(TestCase): diff --git a/tests/ui_options_tests.py b/tests/ui_options_tests.py index 3013552..478f31b 100644 --- a/tests/ui_options_tests.py +++ b/tests/ui_options_tests.py @@ -1,6 +1,6 @@ """Bot tests for input_choice options.""" # -# (C) Pywikibot team, 2015-2020 +# (C) Pywikibot team, 2015-2021 # # Distributed under the terms of the MIT license. # @@ -86,7 +86,8 @@ self.assertEqual(message('?', [option], None), '? (r<number> [1-5])') self.assertEqual(message('?', [option], 'r3'), '? (r<number> [1-[3]-5])') - self.assertRaisesRegex(AttributeError, self.TEST_RE, option.test, 1) + with self.assertRaisesRegex(AttributeError, self.TEST_RE): + option.test(1) self.assertFalse(option.test('0')) self.assertFalse(option.test('r0')) self.assertFalse(option.test('r6')) @@ -98,8 +99,10 @@ def test_List(self): """Test ListOption.""" - self.assertRaisesRegex(ValueError, self.SEQ_EMPTY_RE, - bot.ListOption, []) + with self.assertRaisesRegex( + ValueError, + self.SEQ_EMPTY_RE): + bot.ListOption([]) options = ['foo', 'bar'] option = bot.ListOption(options) self.assertTrue(option.stop) @@ -112,9 +115,14 @@ self.assertEqual(message('?', [option], None), '? (<number> [1])') self.assertEqual(message('?', [option], '1'), '? (<number> [[1]])') options.pop() - self.assertRaisesRegex(ValueError, self.SEQ_EMPTY_RE, option.format, - None) - self.assertRaisesRegex(ValueError, self.SEQ_EMPTY_RE, option.format) + with self.assertRaisesRegex( + ValueError, + self.SEQ_EMPTY_RE): + option.format(None) + with self.assertRaisesRegex( + ValueError, + self.SEQ_EMPTY_RE): + option.format() self.assertFalse(option.test('0')) options += ['baz', 'quux', 'norf'] self.assertEqual(message('?', [option], None), '? (<number> [1-3])') @@ -135,16 +143,20 @@ def test_showing_list(self): """Test ShowingListOption.""" - self.assertRaisesRegex(ValueError, self.SEQ_EMPTY_RE, - bot.ShowingListOption, []) + with self.assertRaisesRegex( + ValueError, + self.SEQ_EMPTY_RE): + bot.ShowingListOption([]) options = ['foo', 'bar'] option = bot.ShowingListOption(options) self.assertEqual(message('?', [option]), '? (<number> [1-2])') def test_multiple_choice_list(self): """Test MultipleChoiceList.""" - self.assertRaisesRegex(ValueError, self.SEQ_EMPTY_RE, - bot.MultipleChoiceList, []) + with self.assertRaisesRegex( + ValueError, + self.SEQ_EMPTY_RE): + bot.MultipleChoiceList([]) options = ['foo', 'bar'] option = bot.MultipleChoiceList(options) self.assertTrue(option.stop) @@ -164,8 +176,10 @@ def test_showing_multiple_choice_list(self): """Test ShowingMultipleChoiceList.""" - self.assertRaisesRegex(ValueError, self.SEQ_EMPTY_RE, - bot.ShowingMultipleChoiceList, []) + with self.assertRaisesRegex( + ValueError, + self.SEQ_EMPTY_RE): + bot.ShowingMultipleChoiceList([]) options = ['foo', 'bar'] option = bot.ShowingMultipleChoiceList(options) self.assertEqual(message('?', [option]), '? (<number> [1-2])') diff --git a/tests/user_tests.py b/tests/user_tests.py index 09bcca8..4093983 100644 --- a/tests/user_tests.py +++ b/tests/user_tests.py @@ -1,6 +1,6 @@ """Tests for the User page.""" # -# (C) Pywikibot team, 2016-2020 +# (C) Pywikibot team, 2016-2021 # # Distributed under the terms of the MIT license. # @@ -133,10 +133,14 @@ self.assertFalse(user.isEmailable()) self.assertIn('invalid', user.getprops()) self.assertTrue(user._isAutoblock) - self.assertRaisesRegex(AutoblockUser, 'This is an autoblock ID', - user.getUserPage) - self.assertRaisesRegex(AutoblockUser, 'This is an autoblock ID', - user.getUserTalkPage) + with self.assertRaisesRegex( + AutoblockUser, + 'This is an autoblock ID'): + user.getUserPage() + with self.assertRaisesRegex( + AutoblockUser, + 'This is an autoblock ID'): + user.getUserTalkPage() def test_autoblocked_user_with_namespace(self): """Test autoblocked user.""" @@ -153,10 +157,14 @@ self.assertFalse(user.isEmailable()) self.assertIn('invalid', user.getprops()) self.assertTrue(user._isAutoblock) - self.assertRaisesRegex(AutoblockUser, 'This is an autoblock ID', - user.getUserPage) - self.assertRaisesRegex(AutoblockUser, 'This is an autoblock ID', - user.getUserTalkPage) + with self.assertRaisesRegex( + AutoblockUser, + 'This is an autoblock ID'): + user.getUserPage() + with self.assertRaisesRegex( + AutoblockUser, + 'This is an autoblock ID'): + user.getUserTalkPage() class TestUserMethods(DefaultSiteTestCase): diff --git a/tests/weblinkchecker_tests.py b/tests/weblinkchecker_tests.py index e756394..57782c2 100644 --- a/tests/weblinkchecker_tests.py +++ b/tests/weblinkchecker_tests.py @@ -1,6 +1,6 @@ """weblinkchecker test module.""" # -# (C) Pywikibot team, 2015-2020 +# (C) Pywikibot team, 2015-2021 # # Distributed under the terms of the MIT license. # @@ -69,9 +69,10 @@ def test_invalid(self): """Test getting memento for invalid URL.""" # memento_client raises 'Exception', not a subclass. - self.assertRaisesRegex( - Exception, 'Only HTTP URIs are supported', - self._get_archive_url, 'invalid') + with self.assertRaisesRegex( + Exception, + 'Only HTTP URIs are supported'): + self._get_archive_url('invalid') if __name__ == '__main__': # pragma: no cover diff --git a/tests/wikibase_edit_tests.py b/tests/wikibase_edit_tests.py index 5d2a1a9..e0ba7de 100644 --- a/tests/wikibase_edit_tests.py +++ b/tests/wikibase_edit_tests.py @@ -5,7 +5,7 @@ class in edit_failiure_tests.py """ # -# (C) Pywikibot team, 2014-2020 +# (C) Pywikibot team, 2014-2021 # # Distributed under the terms of the MIT license. # diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index 6a9740b..c28d2bf 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -349,7 +349,8 @@ t = pywikibot.WbTime(site=repo, year=-2010, hour=12, minute=43) regex = r'^You cannot turn BC dates into a Timestamp$' - self.assertRaisesRegex(ValueError, regex, t.toTimestamp) + with self.assertRaisesRegex(ValueError, regex): + t.toTimestamp() t = pywikibot.WbTime(site=repo, year=2010, month=1, day=1, hour=12, minute=43, second=0) @@ -1065,13 +1066,17 @@ self.assertEqual(numeric_id, 7) self.assertFalse(hasattr(item, '_content')) regex = r"^Page .+ doesn't exist\.$" - self.assertRaisesRegex(pywikibot.NoPage, regex, item.get) + with self.assertRaisesRegex( + pywikibot.NoPage, + regex): + item.get() self.assertTrue(hasattr(item, '_content')) self.assertEqual(item.id, 'Q7') self.assertEqual(item.getID(), 'Q7') self.assertEqual(item._link._title, 'Q7') self.assertEqual(item.title(), 'Q7') - self.assertRaisesRegex(pywikibot.NoPage, regex, item.get) + with self.assertRaisesRegex(pywikibot.NoPage, regex): + item.get() self.assertTrue(hasattr(item, '_content')) self.assertEqual(item._link._title, 'Q7') self.assertEqual(item.getID(), 'Q7') @@ -1085,7 +1090,8 @@ self.assertFalse(item.exists()) self.assertEqual(item.getID(), 'Q9999999999999999999') regex = r"^Page .+ doesn't exist\.$" - self.assertRaisesRegex(pywikibot.NoPage, regex, item.get) + with self.assertRaisesRegex(pywikibot.NoPage, regex): + item.get() def test_fromPage_noprops(self): """Test item from page without properties.""" @@ -1264,7 +1270,8 @@ # without a full debug log. # It should raise NoPage on the source page, with title 'Test page' # as that is what the bot operator needs to see in the log output. - self.assertRaisesRegex(pywikibot.NoPage, 'Test page', item.get) + with self.assertRaisesRegex(pywikibot.NoPage, 'Test page'): + item.get() def test_from_entity_uri(self): """Test ItemPage.from_entity_uri.""" @@ -1329,8 +1336,8 @@ self.assertFalse(item.isRedirectPage()) self.assertTrue(item.exists()) regex = r'^Page .+ is not a redirect page\.$' - self.assertRaisesRegex(pywikibot.IsNotRedirectPage, regex, - item.getRedirectTarget) + with self.assertRaisesRegex(pywikibot.IsNotRedirectPage, regex): + item.getRedirectTarget() def test_redirect_item(self): """Test redirect item.""" @@ -1344,7 +1351,8 @@ self.assertEqual(item.getRedirectTarget(), target) self.assertIsInstance(item.getRedirectTarget(), ItemPage) regex = r'^Page .+ is a redirect page\.$' - self.assertRaisesRegex(pywikibot.IsRedirectPage, regex, item.get) + with self.assertRaisesRegex(pywikibot.IsRedirectPage, regex): + item.get() def test_redirect_item_without_get(self): """Test redirect item without explicit get operation.""" @@ -2114,9 +2122,11 @@ wikidata = self.get_repo() page = WikibasePage(wikidata) regex = r' object has no attribute ' - self.assertRaisesRegex(AttributeError, regex, page.namespace) + with self.assertRaisesRegex(AttributeError, regex): + page.namespace() page = WikibasePage(wikidata, title='') - self.assertRaisesRegex(AttributeError, regex, page.namespace) + with self.assertRaisesRegex(AttributeError, regex): + page.namespace() page = WikibasePage(wikidata, ns=0) self.assertEqual(page.namespace(), 0) @@ -2331,8 +2341,8 @@ regex = r' has no data repository$' with self.assertRaisesRegex(pywikibot.WikiBaseError, regex): ItemPage.fromPage(self.wdp) - self.assertRaisesRegex(pywikibot.WikiBaseError, regex, - self.wdp.data_item) + with self.assertRaisesRegex(pywikibot.WikiBaseError, regex): + self.wdp.data_item() def test_has_data_repository(self, key): """Test that site has no data repository.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662107 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: I54196adfea71eb9071be6c797e84667bd7b0811f Gerrit-Change-Number: 662107 Gerrit-PatchSet: 4 Gerrit-Owner: Homeboy 445 <akshitsan13(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 3 months

[Gerrit] ...core[master]: [tests] Update test_QualityFilterPageGenerator test after page changes

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662742 ) Change subject: [tests] Update test_QualityFilterPageGenerator test after page changes ...................................................................... [tests] Update test_QualityFilterPageGenerator test after page changes Bug: T274159 Change-Id: I30a51bbbe9e825f53a619bfbdabd7f0e78f899d2 --- M tests/pagegenerators_tests.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index 0e6c92f..33d978b 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -252,7 +252,7 @@ """Test QualityFilterPageGenerator.""" site = self.site gen = pagegenerators.PagesFromTitlesGenerator(self.titles, site) - gen = pagegenerators.QualityFilterPageGenerator(gen, [0]) + gen = pagegenerators.QualityFilterPageGenerator(gen, [0, 3]) self.assertLength(tuple(gen), 7) gen = pagegenerators.PagesFromTitlesGenerator(self.titles, site) gen = pagegenerators.QualityFilterPageGenerator(gen, [4]) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662742 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: I30a51bbbe9e825f53a619bfbdabd7f0e78f899d2 Gerrit-Change-Number: 662742 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 4 months

[Gerrit] ...core[master]: [bugfix] Fix textlib.removeDisabledParts method

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662715 ) Change subject: [bugfix] Fix textlib.removeDisabledParts method ...................................................................... [bugfix] Fix textlib.removeDisabledParts method - textlib.NESTED_TEMPLATE_REGEX contains re.VERBOSE flag. Recomiling its pattern without this flag lead the regex to fail. - reuse the cached precompiled patterns with their own flags instead of recompiling all regex patterns with generic IGNORECASE|DOTALL flag - add some tests Bug: T274138 Change-Id: I28e896aabe33b799747f18c1abcb48ccb49c0a7a --- M pywikibot/textlib.py M tests/textlib_tests.py 2 files changed, 22 insertions(+), 3 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index dc47927..4097a17 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -465,9 +465,9 @@ tags = ('comment', 'includeonly', 'nowiki', 'pre', 'syntaxhighlight') tags = set(tags) - set(include) regexes = _get_regexes(tags, site) - toRemoveR = re.compile('|'.join(x.pattern for x in regexes), - re.IGNORECASE | re.DOTALL) - return toRemoveR.sub('', text) + for regex in regexes: + text = regex.sub('', text) + return text def removeHTMLParts(text: str, diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index ce9e33a..e57c953 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -727,6 +727,25 @@ self.assertTrue(self._mwpfh) +class TestDisabledParts(DefaultDrySiteTestCase): + + """Test the removeDisabledParts function in textlib.""" + + def test_remove_disabled_parts(self): + """Test removeDisabledParts function.""" + tests = { + 'comment': '', + 'link': '[[Target link]]', + 'source': '<source>foo := bar</source>', + 'template': '{{Infobox\n|foo = bar}}', + 'unknown': '<Unknown>This is an unknown pattern</unKnown>', + } + for test, pattern in tests.items(): + with self.subTest(test=test): + self.assertEqual( + textlib.removeDisabledParts(pattern, tags=[test]), '') + + class TestReplaceLinks(TestCase): """Test the replace_links function in textlib.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662715 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: I28e896aabe33b799747f18c1abcb48ccb49c0a7a Gerrit-Change-Number: 662715 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 4 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits February 2021