Pywikibot-commits May 2016

pywikibot-commits@lists.wikimedia.org

2 participants
98 discussions

[Gerrit] Add asteroids that are being used as locations - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Add asteroids that are being used as locations ...................................................................... Add asteroids that are being used as locations Used as globes for other items on Wikidata. Source: SELECT (count(?item) as ?c) ?globe ?globeLabel WHERE { ?item wdt:P376 ?globe . ?item wdt:P625 ?location . SERVICE wikibase:label { bd:serviceParam wikibase:language "en" . } } GROUP BY ?globe ?globeLabel ORDER BY DESC(?c) Change-Id: I049866d40d8ad4903f2445b6bf1fdf8a164202a3 (cherry picked from commit 9192099fb51570251e440e0be39959b0c8c7c465) --- M pywikibot/families/wikidata_family.py 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikidata_family.py b/pywikibot/families/wikidata_family.py index 4340f3a..13f5546 100644 --- a/pywikibot/families/wikidata_family.py +++ b/pywikibot/families/wikidata_family.py @@ -56,12 +56,15 @@ 'dione': 'http://www.wikidata.org/entity/Q15040', 'earth': 'http://www.wikidata.org/entity/Q2', 'enceladus': 'http://www.wikidata.org/entity/Q3303', + 'eros': 'http://www.wikidata.org/entity/Q16711', 'europa': 'http://www.wikidata.org/entity/Q3143', 'ganymede': 'http://www.wikidata.org/entity/Q3169', + 'gaspra': 'http://www.wikidata.org/entity/Q158244', 'hyperion': 'http://www.wikidata.org/entity/Q15037', 'iapetus': 'http://www.wikidata.org/entity/Q17958', 'io': 'http://www.wikidata.org/entity/Q3123', 'jupiter': 'http://www.wikidata.org/entity/Q319', + 'lutetia': 'http://www.wikidata.org/entity/Q107556', 'mars': 'http://www.wikidata.org/entity/Q111', 'mercury': 'http://www.wikidata.org/entity/Q308', 'mimas': 'http://www.wikidata.org/entity/Q15034', -- To view, visit https://gerrit.wikimedia.org/r/291199 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I049866d40d8ad4903f2445b6bf1fdf8a164202a3 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: 2.0 Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Smalyshev <smalyshev(a)wikimedia.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years, 11 months

[Gerrit] Clear exceptions in BaseBot.run before processing - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Clear exceptions in BaseBot.run before processing ...................................................................... Clear exceptions in BaseBot.run before processing Bot classes use sys.exc_info, which can be a stale exception under Python 2. Bug: T136487 Change-Id: I01311cf9071ab45cb38bc5463153e887a76c5138 --- M pywikibot/bot.py 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 7dbb8ef..378f2b2 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -1414,6 +1414,10 @@ if PY2: maxint = sys.maxint + # Python 2 does not clear previous exceptions and method `exit` + # relies on sys.exc_info returning exceptions occurring in `run`. + sys.exc_clear() + try: for page in self.generator: try: -- To view, visit https://gerrit.wikimedia.org/r/291523 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I01311cf9071ab45cb38bc5463153e887a76c5138 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years, 11 months

[Gerrit] Add .coveragerc and codecov.yml - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Add .coveragerc and codecov.yml ...................................................................... Add .coveragerc and codecov.yml Do not cover __main__ block in tests/ as they exists only to allow tests to be invoked without a test runner. Also ignore some test option code in tests/__init__.py Change-Id: Iec6260e4d44713f0cbb0fa5dd8eacc7aa8de6c4d --- A .codecov.yml A .coveragerc M tests/add_text_tests.py M tests/api_tests.py M tests/archivebot_tests.py M tests/basepage_tests.py M tests/bot_tests.py M tests/cache_tests.py M tests/category_bot_tests.py M tests/category_tests.py M tests/checkimages_tests.py M tests/cosmetic_changes_tests.py M tests/data_ingestion_tests.py M tests/date_tests.py M tests/deletionbot_tests.py M tests/deprecation_tests.py M tests/diff_tests.py M tests/disambredir_tests.py M tests/djvu_tests.py M tests/dry_api_tests.py M tests/dry_site_tests.py M tests/edit_failure_tests.py M tests/edit_tests.py M tests/exceptions_tests.py M tests/family_tests.py M tests/file_tests.py M tests/fixes_tests.py M tests/http_tests.py M tests/i18n_tests.py M tests/interwiki_graph_tests.py M tests/interwiki_link_tests.py M tests/interwikidata_tests.py M tests/isbn_tests.py M tests/l10n_tests.py M tests/link_tests.py M tests/logentry_tests.py M tests/mediawikiversion_tests.py M tests/namespace_tests.py M tests/oauth_tests.py M tests/page_tests.py M tests/pagegenerators_tests.py M tests/paraminfo_tests.py M tests/patrolbot_tests.py M tests/plural_tests.py M tests/proofreadpage_tests.py M tests/protectbot_tests.py M tests/pwb_tests.py M tests/python_tests.py M tests/reflinks_tests.py M tests/replacebot_tests.py M tests/script_tests.py M tests/site_detect_tests.py M tests/site_tests.py M tests/sparql_tests.py M tests/template_bot_tests.py M tests/tests_tests.py M tests/textlib_tests.py M tests/thread_tests.py M tests/timestamp_tests.py M tests/timestripper_tests.py M tests/tk_tests.py M tests/tools_chars_tests.py M tests/tools_formatter_tests.py M tests/tools_ip_tests.py M tests/tools_tests.py M tests/ui_options_tests.py M tests/ui_tests.py M tests/upload_tests.py M tests/uploadbot_tests.py M tests/user_tests.py M tests/weblib_tests.py M tests/weblinkchecker_tests.py M tests/wikibase_edit_tests.py M tests/wikibase_tests.py M tests/wikidataquery_tests.py M tests/wikistats_tests.py M tests/xmlreader_tests.py 77 files changed, 112 insertions(+), 75 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/.codecov.yml b/.codecov.yml new file mode 100644 index 0000000..9602e90 --- /dev/null +++ b/.codecov.yml @@ -0,0 +1,29 @@ +codecov: + bot: jayvdb + +coverage: + status: + project: + default: + enabled: yes + patch: + default: + enabled: yes + changes: + default: + enabled: yes + + ignore: + - ez_setup.py + - tests/*edit*.py + - tests/*upload*.py + + notify: + irc: + default: + server: chat.freenode.net + channel: pywikibot + + gitter: + default: + url: https://webhooks.gitter.im/e/f312b840da1c40d9f4be diff --git a/.coveragerc b/.coveragerc new file mode 100644 index 0000000..cf272bf --- /dev/null +++ b/.coveragerc @@ -0,0 +1,8 @@ +[report] +exclude_lines = + if __debug__ and not PY2: # pyflakes workaround + + # Have to re-enable the standard pragma + pragma: no cover + + if .PYWIKIBOT_TEST_.*. in os.environ: diff --git a/tests/add_text_tests.py b/tests/add_text_tests.py index 9c90ef6..5430858 100644 --- a/tests/add_text_tests.py +++ b/tests/add_text_tests.py @@ -46,5 +46,5 @@ newtext) -if __name__ == "__main__": +if __name__ == '__main__': # pragma: no cover unittest.main() diff --git a/tests/api_tests.py b/tests/api_tests.py index 3e3e61a..c236f68 100644 --- a/tests/api_tests.py +++ b/tests/api_tests.py @@ -1026,7 +1026,7 @@ self.assertEqual(result, expect) self.assertIsInstance(result, str) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/archivebot_tests.py b/tests/archivebot_tests.py index bf07034..9ea2ab8 100644 --- a/tests/archivebot_tests.py +++ b/tests/archivebot_tests.py @@ -93,7 +93,7 @@ # 'th': year is 2552 while regex assumes 19..|20.., might be fixed -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/basepage_tests.py b/tests/basepage_tests.py index 8017671..3a1e66b 100644 --- a/tests/basepage_tests.py +++ b/tests/basepage_tests.py @@ -113,7 +113,7 @@ self.assertFalse(self._page.isCategoryRedirect()) self.assertTrue(self._page.botMayEdit()) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/bot_tests.py b/tests/bot_tests.py index c95b9d5..42b9726 100644 --- a/tests/bot_tests.py +++ b/tests/bot_tests.py @@ -362,7 +362,7 @@ self.bot.run() -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/cache_tests.py b/tests/cache_tests.py index 5d5c7b6..877620c 100644 --- a/tests/cache_tests.py +++ b/tests/cache_tests.py @@ -41,5 +41,5 @@ cache.process_entries(join_cache_path(), self._check_cache_entry) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover unittest.main() diff --git a/tests/category_bot_tests.py b/tests/category_bot_tests.py index 293679b..4174b40 100644 --- a/tests/category_bot_tests.py +++ b/tests/category_bot_tests.py @@ -59,7 +59,7 @@ self.assertEqual(bot.newcat.text, expected) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/category_tests.py b/tests/category_tests.py index 7b0a114..4fca4a3 100644 --- a/tests/category_tests.py +++ b/tests/category_tests.py @@ -233,7 +233,7 @@ self.assertEqual(count, cat.categoryinfo['size']) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/checkimages_tests.py b/tests/checkimages_tests.py index 2a173e9..b6104e0 100644 --- a/tests/checkimages_tests.py +++ b/tests/checkimages_tests.py @@ -26,5 +26,5 @@ self.assertEqual(item1[1], 'a deprecated template') -if __name__ == "__main__": +if __name__ == '__main__': # pragma: no cover unittest.main() diff --git a/tests/cosmetic_changes_tests.py b/tests/cosmetic_changes_tests.py index d6dc97f..907233c 100644 --- a/tests/cosmetic_changes_tests.py +++ b/tests/cosmetic_changes_tests.py @@ -308,7 +308,7 @@ 'کی') # Once numbering fixes are enabled we can add tests. -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/data_ingestion_tests.py b/tests/data_ingestion_tests.py index 3a8fae2..8c08334 100644 --- a/tests/data_ingestion_tests.py +++ b/tests/data_ingestion_tests.py @@ -124,5 +124,5 @@ '-page:User:John_Vandenberg/data_ingestion_test_template') -if __name__ == "__main__": +if __name__ == '__main__': # pragma: no cover unittest.main() diff --git a/tests/date_tests.py b/tests/date_tests.py index 822fc4c..538cc8b 100644 --- a/tests/date_tests.py +++ b/tests/date_tests.py @@ -95,7 +95,7 @@ self.assertEqual(date.get_month_delta(datetime(2014, 3, 31), datetime(2013, 3, 31)), -12) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/deletionbot_tests.py b/tests/deletionbot_tests.py index 2c170aa..f1ba9bb 100644 --- a/tests/deletionbot_tests.py +++ b/tests/deletionbot_tests.py @@ -124,7 +124,7 @@ TestDeletionBot.undelete_args = [self.title(asLink=True), reason] -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/deprecation_tests.py b/tests/deprecation_tests.py index 98161ec..53d7bce 100644 --- a/tests/deprecation_tests.py +++ b/tests/deprecation_tests.py @@ -802,7 +802,7 @@ __name__ + '.DeprecatedMethodClass.deprecated_instance_method_and_arg2') -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/diff_tests.py b/tests/diff_tests.py index b94911f..27593ee 100644 --- a/tests/diff_tests.py +++ b/tests/diff_tests.py @@ -108,7 +108,7 @@ self.assertIn('bs4', mocked_import.call_args[0]) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/disambredir_tests.py b/tests/disambredir_tests.py index 0b7fa08..fc5eb2e 100644 --- a/tests/disambredir_tests.py +++ b/tests/disambredir_tests.py @@ -155,7 +155,7 @@ '[[Main Page|Label]]\n') -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/djvu_tests.py b/tests/djvu_tests.py index 65742fe..7dc3908 100644 --- a/tests/djvu_tests.py +++ b/tests/djvu_tests.py @@ -78,7 +78,7 @@ self.assertFalse(djvu.has_text()) self.assertRaises(ValueError, djvu.get_page, 100) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/dry_api_tests.py b/tests/dry_api_tests.py index 903c107..37c9c89 100644 --- a/tests/dry_api_tests.py +++ b/tests/dry_api_tests.py @@ -476,5 +476,5 @@ self.assertCountEqual(qGen1.request._params.items(), qGen2.request._params.items()) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover unittest.main() diff --git a/tests/dry_site_tests.py b/tests/dry_site_tests.py index b047221..4d5c747 100644 --- a/tests/dry_site_tests.py +++ b/tests/dry_site_tests.py @@ -290,5 +290,5 @@ __name__ + '.TestNeedVersion.deprecated_available_method2') -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover unittest.main() diff --git a/tests/edit_failure_tests.py b/tests/edit_failure_tests.py index 0ca3ef5..f4a87bc 100644 --- a/tests/edit_failure_tests.py +++ b/tests/edit_failure_tests.py @@ -183,7 +183,7 @@ 'Unsupported URL scheme: wtf', item.addClaim, claim) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/edit_tests.py b/tests/edit_tests.py index 5333eb8..0702125 100644 --- a/tests/edit_tests.py +++ b/tests/edit_tests.py @@ -109,7 +109,7 @@ self.assertTrue(p.text.endswith(ts)) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/exceptions_tests.py b/tests/exceptions_tests.py index 5b238d6..5902137 100644 --- a/tests/exceptions_tests.py +++ b/tests/exceptions_tests.py @@ -79,7 +79,7 @@ 'pywikibot.exceptions.DeprecatedPageNotFoundError') -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/family_tests.py b/tests/family_tests.py index 42035ad..440f249 100644 --- a/tests/family_tests.py +++ b/tests/family_tests.py @@ -259,7 +259,7 @@ self.assertDeprecationParts('fatal argument of pywikibot.family.Family.load') -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/file_tests.py b/tests/file_tests.py index de459bc..d75cfd1 100644 --- a/tests/file_tests.py +++ b/tests/file_tests.py @@ -180,7 +180,7 @@ self.assertIsInstance(latest[1], unicode) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/fixes_tests.py b/tests/fixes_tests.py index 26650ae..74a24eb 100644 --- a/tests/fixes_tests.py +++ b/tests/fixes_tests.py @@ -46,7 +46,7 @@ self.assertIs(fixes.fixes, old_fixes) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/http_tests.py b/tests/http_tests.py index 4922a81..2e51928 100644 --- a/tests/http_tests.py +++ b/tests/http_tests.py @@ -407,7 +407,7 @@ self.assertIs(main_module_cookie_jar, http.cookie_jar) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/i18n_tests.py b/tests/i18n_tests.py index 22fd9b0..f1b93fa 100644 --- a/tests/i18n_tests.py +++ b/tests/i18n_tests.py @@ -466,7 +466,7 @@ 'dozen') -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/interwiki_graph_tests.py b/tests/interwiki_graph_tests.py index 3a06b4e..967547c 100644 --- a/tests/interwiki_graph_tests.py +++ b/tests/interwiki_graph_tests.py @@ -90,7 +90,7 @@ 'octagon') -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/interwiki_link_tests.py b/tests/interwiki_link_tests.py index 111940d..8eba0cc 100644 --- a/tests/interwiki_link_tests.py +++ b/tests/interwiki_link_tests.py @@ -91,7 +91,7 @@ link.parse) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/interwikidata_tests.py b/tests/interwikidata_tests.py index c823a8a..b65134b 100644 --- a/tests/interwikidata_tests.py +++ b/tests/interwikidata_tests.py @@ -102,7 +102,7 @@ '-family:wiktionary') -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/isbn_tests.py b/tests/isbn_tests.py index 7122aaf..668219a 100644 --- a/tests/isbn_tests.py +++ b/tests/isbn_tests.py @@ -253,5 +253,5 @@ """Avoid that editEntity writes.""" pass -if __name__ == "__main__": +if __name__ == '__main__': # pragma: no cover unittest.main() diff --git a/tests/l10n_tests.py b/tests/l10n_tests.py index cfbac35..91c7a71 100644 --- a/tests/l10n_tests.py +++ b/tests/l10n_tests.py @@ -106,7 +106,7 @@ % (package, key)) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/link_tests.py b/tests/link_tests.py index 4d4c2f8..f21a700 100644 --- a/tests/link_tests.py +++ b/tests/link_tests.py @@ -972,7 +972,7 @@ link.parse) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/logentry_tests.py b/tests/logentry_tests.py index a4e91b9..20d8935 100644 --- a/tests/logentry_tests.py +++ b/tests/logentry_tests.py @@ -281,7 +281,7 @@ 'moved_target()') -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/mediawikiversion_tests.py b/tests/mediawikiversion_tests.py index c6c3f60..4abb82b 100644 --- a/tests/mediawikiversion_tests.py +++ b/tests/mediawikiversion_tests.py @@ -87,7 +87,7 @@ self.assertRaises(ValueError, V.from_generator, 'Invalid 1.2.3') -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/namespace_tests.py b/tests/namespace_tests.py index 922ec3b..ebfaf87 100644 --- a/tests/namespace_tests.py +++ b/tests/namespace_tests.py @@ -425,7 +425,7 @@ self.assertRaises(KeyError, namespaces.__getitem__, '|') -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/oauth_tests.py b/tests/oauth_tests.py index d05f33d..a856ca4 100644 --- a/tests/oauth_tests.py +++ b/tests/oauth_tests.py @@ -83,7 +83,7 @@ self.site.username(sysop=False)) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/page_tests.py b/tests/page_tests.py index a10453a..ab0b132 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -993,7 +993,7 @@ self.assertEqual(pywikibot.page.html2unicode('&#x70y'), '&#x70y') -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index 4927c65..87dd970 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -1231,7 +1231,7 @@ total=5): assert False # this shouldn't be reached -if __name__ == "__main__": +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/paraminfo_tests.py b/tests/paraminfo_tests.py index 4831e22..306a24d 100644 --- a/tests/paraminfo_tests.py +++ b/tests/paraminfo_tests.py @@ -232,5 +232,5 @@ self._check_param_values(self.repo, 'wbgetclaims', 'rank', known) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover unittest.main() diff --git a/tests/patrolbot_tests.py b/tests/patrolbot_tests.py index efaa29d..5058348 100644 --- a/tests/patrolbot_tests.py +++ b/tests/patrolbot_tests.py @@ -71,7 +71,7 @@ self.assertEqual(self.bot.in_list(['', 'Foo'], 'Foo'), 'Foo') -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/plural_tests.py b/tests/plural_tests.py index dc1a2c1..b5ce6b3 100644 --- a/tests/plural_tests.py +++ b/tests/plural_tests.py @@ -68,7 +68,7 @@ max_num = 1000 -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/proofreadpage_tests.py b/tests/proofreadpage_tests.py index 39b464b..6087a89 100644 --- a/tests/proofreadpage_tests.py +++ b/tests/proofreadpage_tests.py @@ -594,7 +594,7 @@ self.assertEqual(list(gen), self.pages) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/protectbot_tests.py b/tests/protectbot_tests.py index 7c2f868..e9219ea 100644 --- a/tests/protectbot_tests.py +++ b/tests/protectbot_tests.py @@ -61,7 +61,7 @@ '([Edit=Allow only administrators] (indefinite) [Move=Allow only ' 'administrators] (indefinite))') -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/pwb_tests.py b/tests/pwb_tests.py index 94535f3..9466a6d 100644 --- a/tests/pwb_tests.py +++ b/tests/pwb_tests.py @@ -78,5 +78,5 @@ self.assertEqual('Häuser', vpwb['stderr'].strip()) -if __name__ == "__main__": +if __name__ == '__main__': # pragma: no cover unittest.main(verbosity=10) diff --git a/tests/python_tests.py b/tests/python_tests.py index 16023ed..bdb9084 100755 --- a/tests/python_tests.py +++ b/tests/python_tests.py @@ -64,7 +64,7 @@ self.assertEqual(text, unicodedata2.normalize('NFC', text)) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/reflinks_tests.py b/tests/reflinks_tests.py index f154738..ac5f6f5 100644 --- a/tests/reflinks_tests.py +++ b/tests/reflinks_tests.py @@ -223,5 +223,5 @@ TestReferencesBotConstructor.constructor_kwargs = kwargs -if __name__ == "__main__": +if __name__ == '__main__': # pragma: no cover unittest.main() diff --git a/tests/replacebot_tests.py b/tests/replacebot_tests.py index e7181e7..e062477 100644 --- a/tests/replacebot_tests.py +++ b/tests/replacebot_tests.py @@ -239,7 +239,7 @@ self.assertTrue(callable(bot.replacements[0].new)) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/script_tests.py b/tests/script_tests.py index 5837e98..f9cb422 100644 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -425,7 +425,7 @@ _results = no_args_expected_results -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/site_detect_tests.py b/tests/site_detect_tests.py index 51e7904..2a0a94a 100644 --- a/tests/site_detect_tests.py +++ b/tests/site_detect_tests.py @@ -267,7 +267,7 @@ self.assertAllError() -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/site_tests.py b/tests/site_tests.py index 677e32d..89bc75e 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -3149,7 +3149,7 @@ self.assertRaises(pywikibot.UnknownExtension, lambda x: x.proofread_levels, site) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/sparql_tests.py b/tests/sparql_tests.py index 9db482c..f7c2f5c 100644 --- a/tests/sparql_tests.py +++ b/tests/sparql_tests.py @@ -148,7 +148,7 @@ res = q.ask('ASK { ?x ?y ?z }') self.assertFalse(res) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/template_bot_tests.py b/tests/template_bot_tests.py index c27dd67..178c6fa 100644 --- a/tests/template_bot_tests.py +++ b/tests/template_bot_tests.py @@ -142,5 +142,5 @@ site=self.site) -if __name__ == "__main__": +if __name__ == '__main__': # pragma: no cover unittest.main() diff --git a/tests/tests_tests.py b/tests/tests_tests.py index b0b82bd..d4fcb12 100755 --- a/tests/tests_tests.py +++ b/tests/tests_tests.py @@ -51,7 +51,7 @@ self.site) -if __name__ == "__main__": +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index 151b194..daf8f4d 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -1392,7 +1392,7 @@ self.assertEqual(textlib.unescape('!23<>'"&&'), '!23<>\'"&&') -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/thread_tests.py b/tests/thread_tests.py index 5ac4f3d..9019385 100644 --- a/tests/thread_tests.py +++ b/tests/thread_tests.py @@ -75,7 +75,7 @@ self.assertEqualItertools(['aabc', 'dddb', 'baa']) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/timestamp_tests.py b/tests/timestamp_tests.py index 3c359e1..5d6eb9d 100644 --- a/tests/timestamp_tests.py +++ b/tests/timestamp_tests.py @@ -105,7 +105,7 @@ self.assertIsInstance(td, datetime.timedelta) self.assertEqual(t2 + td, t1) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/timestripper_tests.py b/tests/timestripper_tests.py index fe267b9..8c7ab0a 100644 --- a/tests/timestripper_tests.py +++ b/tests/timestripper_tests.py @@ -293,7 +293,7 @@ self.assertEqual(ts.timestripper(txt_match), res) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/tk_tests.py b/tests/tk_tests.py index 42fb2c4..57e3a0e 100644 --- a/tests/tk_tests.py +++ b/tests/tk_tests.py @@ -73,7 +73,7 @@ assert v is None -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/tools_chars_tests.py b/tests/tools_chars_tests.py index 2e42f8d..9249d27 100644 --- a/tests/tools_chars_tests.py +++ b/tests/tools_chars_tests.py @@ -48,7 +48,7 @@ self.assertCountEqual(invalid.items(), []) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/tools_formatter_tests.py b/tests/tools_formatter_tests.py index eb1a84b..73a377b 100644 --- a/tests/tools_formatter_tests.py +++ b/tests/tools_formatter_tests.py @@ -108,7 +108,7 @@ self.assert_format('{color}', '42', color=42) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/tools_ip_tests.py b/tests/tools_ip_tests.py index cc0f913..56afa23 100644 --- a/tests/tools_ip_tests.py +++ b/tests/tools_ip_tests.py @@ -691,7 +691,7 @@ self._test_T105443_failures() self.assertEqual(self.fail, 0) -if __name__ == "__main__": +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/tools_tests.py b/tests/tools_tests.py index 71f6b63..b38048b 100644 --- a/tests/tools_tests.py +++ b/tests/tools_tests.py @@ -675,7 +675,7 @@ return inspect.getargspec(method) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/ui_options_tests.py b/tests/ui_options_tests.py index e83ed9b..8a7608c 100644 --- a/tests/ui_options_tests.py +++ b/tests/ui_options_tests.py @@ -118,7 +118,7 @@ % (prefix, len(options) + 1))) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/ui_tests.py b/tests/ui_tests.py index 52485c2..7dbf363 100644 --- a/tests/ui_tests.py +++ b/tests/ui_tests.py @@ -864,7 +864,7 @@ self.stream._hConsole = None -if __name__ == "__main__": +if __name__ == '__main__': # pragma: no cover try: try: unittest.main() diff --git a/tests/upload_tests.py b/tests/upload_tests.py index 7968f01..53794d0 100644 --- a/tests/upload_tests.py +++ b/tests/upload_tests.py @@ -153,7 +153,7 @@ self._verify_stash() -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/uploadbot_tests.py b/tests/uploadbot_tests.py index eb9b817..48f72a9 100644 --- a/tests/uploadbot_tests.py +++ b/tests/uploadbot_tests.py @@ -64,7 +64,7 @@ bot.run() -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/user_tests.py b/tests/user_tests.py index 353188a..1d10ae4 100644 --- a/tests/user_tests.py +++ b/tests/user_tests.py @@ -79,7 +79,7 @@ self.assertFalse(user.isEmailable()) self.assertIn('invalid', user.getprops()) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/weblib_tests.py b/tests/weblib_tests.py index 3ef7c70..7e82081 100644 --- a/tests/weblib_tests.py +++ b/tests/weblib_tests.py @@ -84,7 +84,7 @@ self.assertEqual(archivedversion, 'http://www.webcitation.org/6DHSeh2L0') -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/weblinkchecker_tests.py b/tests/weblinkchecker_tests.py index 5e052e2..14f1590 100644 --- a/tests/weblinkchecker_tests.py +++ b/tests/weblinkchecker_tests.py @@ -92,7 +92,7 @@ self._get_archive_url, 'invalid') -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/wikibase_edit_tests.py b/tests/wikibase_edit_tests.py index 2f984df..59bcd29 100644 --- a/tests/wikibase_edit_tests.py +++ b/tests/wikibase_edit_tests.py @@ -330,7 +330,7 @@ self.assertNotIn('P580', claim.qualifiers.keys()) self.assertNotIn('P88', claim.qualifiers.keys()) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index 6cfceaf..bdfc4c3 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -1290,7 +1290,7 @@ self.assertIn('enwiki', data) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/wikidataquery_tests.py b/tests/wikidataquery_tests.py index f9a76b8..f45dcb4 100644 --- a/tests/wikidataquery_tests.py +++ b/tests/wikidataquery_tests.py @@ -286,7 +286,7 @@ self.assertLess(t2 - t1, 0.2) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/wikistats_tests.py b/tests/wikistats_tests.py index 37b470d..4e2af7c 100644 --- a/tests/wikistats_tests.py +++ b/tests/wikistats_tests.py @@ -98,7 +98,7 @@ self.assertIn('total', data) -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: diff --git a/tests/xmlreader_tests.py b/tests/xmlreader_tests.py index 00fe478..29c6af4 100644 --- a/tests/xmlreader_tests.py +++ b/tests/xmlreader_tests.py @@ -127,7 +127,7 @@ u'moved [[Çullu, Agdam]] to [[Çullu, Quzanlı]]: dab') -if __name__ == '__main__': +if __name__ == '__main__': # pragma: no cover try: unittest.main() except SystemExit: -- To view, visit https://gerrit.wikimedia.org/r/290705 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iec6260e4d44713f0cbb0fa5dd8eacc7aa8de6c4d Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Siebrand <siebrand(a)kitano.nl> Gerrit-Reviewer: jenkins-bot <>

7 years, 11 months

[Gerrit] [bugfix] fix for template_bot_tests - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [bugfix] fix for template_bot_tests ...................................................................... [bugfix] fix for template_bot_tests - A template prefix must be case insensitive. Change the _MultiTemplateMatchBuilder regex to recognize mixed case template aliases. Combine a regex string for that. - remove unittest.expectedFailure decorator from template_bot_tests.py which is solved now - add some additional tests for _MultiTemplateMatchBuilder Bug: T134676 Change-Id: I9bf2f4ddf6e17b3c509f5dde744804a52e6e78f9 --- M pywikibot/textlib.py M tests/template_bot_tests.py M tests/textlib_tests.py 3 files changed, 52 insertions(+), 2 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index ec7b508..511f03e 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -193,8 +193,12 @@ ']' + re.escape(old[1:]) else: pattern = re.escape(old) + # namespaces may be any mixed case + namespaces = [''.join('[{0}{1}]'.format(char.upper(), char.lower()) + for char in ns) + for ns in namespace] pattern = re.sub(r'_|\\ ', r'[_ ]', pattern) - templateRegex = re.compile(r'\{\{ *(' + ':|'.join(namespace) + + templateRegex = re.compile(r'\{\{ *(' + ':|'.join(namespaces) + r':|[mM][sS][gG]:)?' + pattern + r'(?P<parameters>\s*\|.+?|) *}}', flags) diff --git a/tests/template_bot_tests.py b/tests/template_bot_tests.py index c27dd67..05073c1 100644 --- a/tests/template_bot_tests.py +++ b/tests/template_bot_tests.py @@ -109,7 +109,6 @@ self.assertPagelistTitles(pages, ['Fake page with msg'], site=self.site) - @unittest.expectedFailure def test_match_unnecessary_template_prefix(self): """Test pages with {{template:..}}.""" template = pywikibot.Page(self.site, 'Template:Bar') diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index a9be159..31f074d 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -16,6 +16,7 @@ import pywikibot import pywikibot.textlib as textlib +from pywikibot.textlib import _MultiTemplateMatchBuilder from pywikibot import config, UnknownSite from pywikibot.site import _IWEntry @@ -1343,6 +1344,52 @@ r'X\g<bar>X') +class TestMultiTemplateMatchBuilder(DefaultDrySiteTestCase): + + """Test _MultiTemplateMatchBuilder.""" + + dry = True + + def test_noMatch(self): + """Test text without any desired templates.""" + string = 'The quick brown fox' + builder = _MultiTemplateMatchBuilder(self.site) + self.assertIsNone(re.search(builder.pattern('quick'), string)) + + def test_Match(self): + """Test text with one match without parameters.""" + string = 'The {{quick}} brown fox' + builder = _MultiTemplateMatchBuilder(self.site) + self.assertIsNotNone(re.search(builder.pattern('quick'), string)) + self.assertIsNotNone(re.search(builder.pattern('Quick'), string)) + + def test_match_with_params(self): + """Test text with one match with parameters.""" + string = 'The {{Quick|brown}} fox' + builder = _MultiTemplateMatchBuilder(self.site) + self.assertIsNotNone(re.search(builder.pattern('quick'), string)) + self.assertIsNotNone(re.search(builder.pattern('Quick'), string)) + + def test_match_msg(self): + """Test text with {{msg:..}}.""" + string = 'The {{msg:quick}} brown fox' + builder = _MultiTemplateMatchBuilder(self.site) + self.assertIsNotNone(re.search(builder.pattern('quick'), string)) + self.assertIsNotNone(re.search(builder.pattern('Quick'), string)) + + def test_match_template_prefix(self): + """Test pages with {{template:..}}.""" + string = 'The {{%s:%s}} brown fox' + template = 'template' + builder = _MultiTemplateMatchBuilder(self.site) + for t in (template.upper(), template.lower(), template.title()): + for q in ('quick', 'Quick'): + self.assertIsNotNone(re.search(builder.pattern('quick'), + string % (t, q))) + self.assertIsNotNone(re.search(builder.pattern('Quick'), + string % (t, q))) + + class TestGetLanguageLinks(SiteAttributeTestCase): """Test L{textlib.getLanguageLinks} function.""" -- To view, visit https://gerrit.wikimedia.org/r/287437 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9bf2f4ddf6e17b3c509f5dde744804a52e6e78f9 Gerrit-PatchSet: 5 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: AbdealiJK <abdealikothari(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years, 11 months

[Gerrit] Use Python 3 compatible flake8-mock - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Use Python 3 compatible flake8-mock ...................................................................... Use Python 3 compatible flake8-mock a57f1c introduced flake8-mock, however it fails to install on Windows on Python 3, an issue I had raised a month ago. (https://github.com/aleGpereira/flake8-mock/issues/3) Change-Id: I167f13918671d93075b8920527704113e868a90d --- M dev-requirements.txt M tox.ini 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/dev-requirements.txt b/dev-requirements.txt index 44499a0..e8bab19 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -17,7 +17,7 @@ pyflakes>=0.9 flake8 flake8-docstrings>=0.2.6 -flake8-mock +git+https://github.com/jayvdb/flake8-mock@use-ascii-readme codecov coverage mock ; python_version < '3' diff --git a/tox.ini b/tox.ini index e44df2b..eb77d65 100644 --- a/tox.ini +++ b/tox.ini @@ -62,7 +62,7 @@ flake8-import-order flake8-tuple>=0.2.8 flake8-print>=2.0.1 - flake8-mock + git+https://github.com/jayvdb/flake8-mock@use-ascii-readme [testenv:nose] commands = -- To view, visit https://gerrit.wikimedia.org/r/290655 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I167f13918671d93075b8920527704113e868a90d Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

7 years, 11 months

[Gerrit] Additional tests for CC fixArabicLetters - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Additional tests for CC fixArabicLetters ...................................................................... Additional tests for CC fixArabicLetters More coverage of functionality, especially of comma exception. Change-Id: I019e13bc91cd65554d609de47efeecfd94e24f08 --- M tests/cosmetic_changes_tests.py 1 file changed, 36 insertions(+), 2 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Legoktm: Looks good to me, approved AbdealiJK: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/tests/cosmetic_changes_tests.py b/tests/cosmetic_changes_tests.py index 80a0595..1484904 100644 --- a/tests/cosmetic_changes_tests.py +++ b/tests/cosmetic_changes_tests.py @@ -300,12 +300,46 @@ family = 'wikipedia' code = 'fa' - def test_fixArabicLetters(self): - """Test fixArabicLetters.""" + def test_fixArabicLetters_comma(self): + """Test fixArabicLetters comma replacements.""" + self.assertEqual(self.cct.fixArabicLetters(','), '،') self.assertEqual(self.cct.fixArabicLetters('A,b,ا,۴,'), 'A,b،ا،۴،') + + def test_fixArabicLetters_comma_skip(self): + """Test fixArabicLetters Latin comma not replaced.""" + self.assertEqual(self.cct.fixArabicLetters('a", b'), 'a", b') + self.assertEqual(self.cct.fixArabicLetters('a, "b'), 'a, "b') + self.assertEqual(self.cct.fixArabicLetters('a", "b'), 'a", "b') + # spaces are not required + self.assertEqual(self.cct.fixArabicLetters('a",b'), 'a",b') + self.assertEqual(self.cct.fixArabicLetters('a,"b'), 'a,"b') + self.assertEqual(self.cct.fixArabicLetters('a","b'), 'a","b') + # quotes are a 'non-Farsi' character; additional non-Farsi not needed + self.assertEqual(self.cct.fixArabicLetters('",b'), '",b') + self.assertEqual(self.cct.fixArabicLetters('a,"'), 'a,"') + self.assertEqual(self.cct.fixArabicLetters('","'), '","') + + # A single quotation is a 'non-Farsi' character + self.assertEqual(self.cct.fixArabicLetters("',b"), "',b") + self.assertEqual(self.cct.fixArabicLetters("a,'"), "a,'") + self.assertEqual(self.cct.fixArabicLetters("','"), "','") + + # A space is a 'non-Farsi' character + self.assertEqual(self.cct.fixArabicLetters('a", ۴'), 'a", ۴') + self.assertEqual(self.cct.fixArabicLetters(' , '), ' , ') + + def test_fixArabicLetters_letters(self): + """Test fixArabicLetters letter replacements.""" + self.assertEqual(self.cct.fixArabicLetters('ك'), + 'ک') + self.assertEqual(self.cct.fixArabicLetters('ي'), + 'ی') + self.assertEqual(self.cct.fixArabicLetters('ى'), + 'ی') self.assertEqual(self.cct.fixArabicLetters('كي'), 'کی') + # Once numbering fixes are enabled we can add tests. if __name__ == '__main__': -- To view, visit https://gerrit.wikimedia.org/r/278599 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I019e13bc91cd65554d609de47efeecfd94e24f08 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: AbdealiJK <abdealikothari(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

7 years, 11 months

[Gerrit] Travis workaround for TLSv1.2 on precise container - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Travis workaround for TLSv1.2 on precise container ...................................................................... Travis workaround for TLSv1.2 on precise container Use debian-sid libssl1.0.0 on Precise containers. This debian sid package conflicts with Ubuntu packages graphviz and python-ipaddr, so they are only added on Trusty and Precise sudo builds. requests[security] was added in requests 2.4.1 and requests[security] added a pyOpenSSL>=0.13 dependency in requests 2.9.0. As precise-sudo has pyOpenSSL 0.12, and trusty has requests 2.2.1, these both need to be upgraded by pip otherwise they fail in setup.py which will not overwrite distribution packaged libraries with newer versions. Bug: T134647 Change-Id: Iabf344a417299214cdb92c5776cbe580cb6989e5 --- M .travis.yml M requests-requirements.txt M requirements.txt 3 files changed, 28 insertions(+), 9 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/.travis.yml b/.travis.yml index 87954ee..a0186ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,11 +16,12 @@ addons: apt: + sources: + - debian-sid packages: + - libssl1.0.0 - djvulibre-bin - - graphviz - liblua5.1-0-dev - - python-ipaddr before_install: # When PYSETUP_TEST_EXTRAS is not enabled, do not allow the @@ -134,11 +135,27 @@ matrix: include: - python: '2.7_with_system_site_packages' # equivalent to virtualenv: system_site_packages: true - env: LANGUAGE=he FAMILY=wikivoyage SITE_ONLY=1 - - python: '2.7' - env: LANGUAGE=nb FAMILY=wikipedia DIST=trusty + env: LANGUAGE=he FAMILY=wikivoyage DIST=precise-sudo PYWIKIBOT2_TEST_NO_RC=1 + dist: precise + sudo: required + addons: + apt: + packages: + - djvulibre-bin + - graphviz + - liblua5.1-0-dev + - python-ipaddr + - python: '2.7_with_system_site_packages' + env: LANGUAGE=nb FAMILY=wikipedia DIST=trusty PYSETUP_TEST_EXTRAS=1 dist: trusty sudo: required + addons: + apt: + packages: + - djvulibre-bin + - graphviz + - liblua5.1-0-dev + - python-ipaddr - python: '2.7' env: LANGUAGE=en FAMILY=wpbeta SITE_ONLY=1 OAUTH_DOMAIN="en.wikipedia.beta.wmflabs.org" - python: '3.3' diff --git a/requests-requirements.txt b/requests-requirements.txt index 778c9f6..4ad0a88 100644 --- a/requests-requirements.txt +++ b/requests-requirements.txt @@ -1,7 +1,7 @@ -requests +requests>=2.4.1 # requests security extra # Bug T105767 on Python 2.7 release 9+ -pyOpenSSL ; python_full_version < '2.7.9' or python_version >= '3' +pyOpenSSL>=0.13 ; python_full_version < '2.7.9' or python_version >= '3' ndg-httpsclient ; python_full_version < '2.7.9' or python_version >= '3' pyasn1 ; python_full_version < '2.7.9' or python_version >= '3' diff --git a/requirements.txt b/requirements.txt index 3658030..9b4400a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,10 +19,10 @@ # $ awk -F '[#>=]' '{print $1}' requirements.txt | xargs apt-cache search # mandatory; see README.conversion.txt -requests +requests>=2.4.1 # requests security extra -pyOpenSSL ; python_full_version < '2.7.9' +pyOpenSSL>=0.13 ; python_full_version < '2.7.9' ndg-httpsclient ; python_full_version < '2.7.9' pyasn1 ; python_full_version < '2.7.9' @@ -82,6 +82,8 @@ # scripts/script_wui.py depends on Lua, which is not available using pip # but can be obtained from: https://github.com/bastibe/lunatic-python +# However, a better fork is: https://github.com/AlereDevices/lunatic-python +# Also script_wui.py is not currently functional, so it isnt installed here. # core HTML comparison parser in diff module beautifulsoup4 -- To view, visit https://gerrit.wikimedia.org/r/290146 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iabf344a417299214cdb92c5776cbe580cb6989e5 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

7 years, 11 months

[Gerrit] Fix ID for Rhea - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Fix ID for Rhea ...................................................................... Fix ID for Rhea Q108419 is the wrong Rhea - this is the female Titan, Q15050 is the moon of Saturn Change-Id: I1d15e017e1216c8c25af199da01d70be4c13478a (cherry picked from commit 21570f1f25b2a390ee32b804b85971fa04cc0001) --- M pywikibot/families/wikidata_family.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Smalyshev: Looks good to me, but someone else must approve Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikidata_family.py b/pywikibot/families/wikidata_family.py index 181c4c4..4340f3a 100644 --- a/pywikibot/families/wikidata_family.py +++ b/pywikibot/families/wikidata_family.py @@ -71,7 +71,7 @@ 'phobos': 'http://www.wikidata.org/entity/Q7547', 'phoebe': 'http://www.wikidata.org/entity/Q17975', 'pluto': 'http://www.wikidata.org/entity/Q339', - 'rhea': 'http://www.wikidata.org/entity/Q108419', + 'rhea': 'http://www.wikidata.org/entity/Q15050', 'tethys': 'http://www.wikidata.org/entity/Q15047', 'titan': 'http://www.wikidata.org/entity/Q2565', 'titania': 'http://www.wikidata.org/entity/Q3322', -- To view, visit https://gerrit.wikimedia.org/r/290926 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1d15e017e1216c8c25af199da01d70be4c13478a Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: 2.0 Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Smalyshev <smalyshev(a)wikimedia.org> Gerrit-Reviewer: jenkins-bot <>

7 years, 11 months

[Gerrit] Tox pyflakes task - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Tox pyflakes task ...................................................................... Tox pyflakes task Replace flake8 disable=xxx with alternative workarounds for pyflakes. For Tox/Jenkins, use pyflakes directly on various Python implementations/versions, adding checking PyPy by Jenkins, and an unused testenv for developer checking of Python 2.6. The tox flake8 task now only runs on Python 2.7, as typically flake8 plugins & errors are not version specific. Bug: T101592 Change-Id: I076a5300ae6ff1c30365be106a8ceca2d48de7e4 --- M pwb.py M pywikibot/bot.py M pywikibot/page.py M pywikibot/tools/__init__.py M pywikibot/userinterfaces/terminal_interface_base.py M scripts/maintenance/cache.py M setup.py M tox.ini 8 files changed, 109 insertions(+), 33 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pwb.py b/pwb.py index 7290738..88e40ee 100755 --- a/pwb.py +++ b/pwb.py @@ -72,7 +72,7 @@ """ global pwb try: - import pywikibot # flake8: disable=F811 + import pywikibot pwb = pywikibot except RuntimeError: remove_modules() @@ -184,7 +184,8 @@ if sys.platform == 'win32' and sys.version_info[0] < 3: _pwb_dir = str(_pwb_dir) os.environ[str('PYWIKIBOT2_DIR_PWB')] = _pwb_dir - import pywikibot # flake8: disable=F401 + import pywikibot + pwb = pywikibot except RuntimeError as err: # user-config.py to be created print("NOTE: 'user-config.py' was not found!") diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 2788b86..7dbb8ef 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -84,12 +84,12 @@ from pywikibot import config from pywikibot import daemonize from pywikibot import version -from pywikibot.bot_choice import ( # flake8: disable=F401 (unused imports) +from pywikibot.bot_choice import ( Option, StandardOption, NestedOption, IntegerOption, ContextOption, ListOption, OutputProxyOption, HighlightContextOption, ChoiceException, QuitKeyboardInterrupt, ) -from pywikibot.logging import ( # flake8: disable=F401 +from pywikibot.logging import ( CRITICAL, ERROR, INFO, WARNING, ) from pywikibot.logging import DEBUG, INPUT, STDOUT, VERBOSE @@ -97,7 +97,7 @@ add_init_routine, debug, error, exception, log, output, stdout, warning, ) -from pywikibot.logging import critical # flake8: disable=F401 +from pywikibot.logging import critical from pywikibot.tools import deprecated, deprecated_args, PY2, PYTHON_VERSION from pywikibot.tools._logging import ( LoggingFormatter as _LoggingFormatter, @@ -105,6 +105,27 @@ ) from pywikibot.tools.formatter import color_format +__all__ = ( + 'CRITICAL', 'ERROR', 'INFO', 'WARNING', 'DEBUG', 'INPUT', 'STDOUT', + 'VERBOSE', 'critical', 'debug', 'error', 'exception', 'log', 'warning', + 'output', 'stdout', 'LoggingFormatter', 'RotatingFileHandler', + 'init_handlers', 'writelogheader', + 'input', 'input_choice', 'input_yn', 'inputChoice', 'input_list_choice', + 'Option', 'StandardOption', 'NestedOption', 'IntegerOption', + 'ContextOption', 'ListOption', 'OutputProxyOption', + 'HighlightContextOption', 'ChoiceException', 'UnhandledAnswer', + 'Choice', 'AlwaysChoice', + 'QuitKeyboardInterrupt', + 'InteractiveReplace', + 'calledModuleName', 'handle_args', 'handleArgs', 'showHelp', 'suggest_help', + 'writeToCommandLogFile', 'open_webbrowser', + 'BaseBot', 'Bot', 'SingleSiteBot', 'MultipleSitesBot', + 'CurrentPageBot', 'AutomaticTWSummaryBot', + 'ExistingPageBot', 'FollowRedirectPageBot', 'CreatingPageBot', + 'RedirectPageBot', 'NoRedirectPageBot', + 'WikidataBot', +) + if not PY2: unicode = str diff --git a/pywikibot/page.py b/pywikibot/page.py index c3ee4de..901d3dd 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -34,13 +34,19 @@ from collections import defaultdict, namedtuple from warnings import warn -if sys.version_info[0] > 2: +from pywikibot.tools import PY2 + +if not PY2: unicode = basestring = str long = int from html import entities as htmlentitydefs from urllib.parse import quote_from_bytes, unquote_to_bytes else: - chr = unichr # flake8 F821 (undefined name) disabled by tox.ini + if __debug__ and not PY2: + unichr = NotImplemented # pyflakes workaround + + chr = unichr + import htmlentitydefs from urllib import quote as quote_from_bytes, unquote as unquote_to_bytes @@ -60,16 +66,36 @@ from pywikibot.family import Family from pywikibot.site import Namespace from pywikibot.tools import ( - PYTHON_VERSION, PY2, + PYTHON_VERSION, MediaWikiVersion, UnicodeMixin, ComparableMixin, DotReadableDict, deprecated, deprecate_arg, deprecated_args, issue_deprecation_warning, ModuleDeprecationWrapper as _ModuleDeprecationWrapper, first_upper, remove_last_args, _NotImplementedWarning, OrderedDict, Counter, ) -from pywikibot.tools.ip import ip_regexp # flake8: disable=F401 (unused import) +from pywikibot.tools.ip import ip_regexp from pywikibot.tools.ip import is_IP +__all__ = ( + 'BasePage', + 'Page', + 'FilePage', + 'Category', + 'User', + 'WikibasePage', + 'ItemPage', + 'Property', + 'PropertyPage', + 'Claim', + 'Revision', + 'FileInfo', + 'Link', + 'html2unicode', + 'UnicodeToAsciiHtml', + 'unicode2html', + 'url2unicode', + 'ip_regexp', # unused & deprecated +) logger = logging.getLogger("pywiki.wiki.page") diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index 7a629e1..ff94c70 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -147,9 +147,9 @@ else: - from collections import Counter # flake8: disable=F401 (unused import) - from collections import OrderedDict - from itertools import count # flake8: disable=F401 (unused import) + Counter = collections.Counter + OrderedDict = collections.OrderedDict + count = itertools.count def empty_iterator(): diff --git a/pywikibot/userinterfaces/terminal_interface_base.py b/pywikibot/userinterfaces/terminal_interface_base.py index dbae726..3cda2cf 100755 --- a/pywikibot/userinterfaces/terminal_interface_base.py +++ b/pywikibot/userinterfaces/terminal_interface_base.py @@ -53,6 +53,9 @@ colorTagR = re.compile('\03{(?P<name>%s|previous)}' % '|'.join(colors)) +if __debug__ and not PY2: + raw_input = NotImplemented # pyflakes workaround + class UI(object): diff --git a/scripts/maintenance/cache.py b/scripts/maintenance/cache.py index 7fe3d12..299497d 100755 --- a/scripts/maintenance/cache.py +++ b/scripts/maintenance/cache.py @@ -77,8 +77,17 @@ from pywikibot.data import api # The follow attributes are used by eval() -from pywikibot.page import User # flake8: disable=F401 (unused import) -from pywikibot.site import APISite, DataSite, LoginStatus # flake8: disable=F401 +from pywikibot.page import User +from pywikibot.site import APISite, DataSite, LoginStatus + +__all__ = ( + 'User', 'APISite', 'DataSite', 'LoginStatus', + 'ParseError', 'CacheEntry', 'process_entries', 'main', + 'has_password', 'is_logout', 'empty_response', 'not_accessed', + 'incorrect_hash', + 'older_than', 'newer_than', 'older_than_one_day', 'recent', + 'uniquedesc', 'parameters', +) class ParseError(Exception): diff --git a/setup.py b/setup.py index fa1da3a..c880ec4 100644 --- a/setup.py +++ b/setup.py @@ -14,9 +14,12 @@ try: # Work around a traceback on Python < 2.7.4 and < 3.3.1 # http://bugs.python.org/issue15881#msg170215 - import multiprocessing # flake8: disable=F401 (unused import) + import multiprocessing except ImportError: pass + +# pyflakes workaround +__unused__ = (multiprocessing, ) PYTHON_VERSION = sys.version_info[:3] PY2 = (PYTHON_VERSION[0] == 2) @@ -108,7 +111,8 @@ if PYTHON_VERSION < (2, 7, 3): # work around distutils hardcoded unittest dependency # work around T106512 - import unittest # flake8: disable=F401 (unused import) + import unittest + __unused__ += (unittest, ) if 'test' in sys.argv: import unittest2 sys.modules['unittest'] = unittest2 @@ -142,7 +146,8 @@ script_deps['data_ingestion.py'] = extra_deps['csv'] try: - import bz2 # flake8: disable=F401 (unused import) + import bz2 + __unused__ += (bz2, ) except ImportError: # Use bz2file if the python is not compiled with bz2 support. dependencies.append('bz2file') diff --git a/tox.ini b/tox.ini index ea79390..e44df2b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,12 +1,15 @@ [tox] -minversion = 1.6 +# minversion = 1.7.2 needed for skip_missing_interpreters +minversion = 1.7.2 skipsdist = True -envlist = flake8,flake8-py3,doctest-{py27,py34},py26,py27,py34 +skip_missing_interpreters = True +envlist = flake8,pyflakes-{py26,py3,pypy},doctest-{py27,py34},py26,py27,py34 [tox:jenkins] # Override default for WM Jenkins # Others are run in their own individual jobs on WM Jenkins -envlist = flake8,flake8-py3 +# Wikimedia Jenkins does not have Python 2.6 +envlist = flake8,pyflakes-{py3,pypy} [params] doctest_skip = --ignore-files=(gui\.py|botirc\.py|rcstream\.py) @@ -21,6 +24,27 @@ [testenv:py26] deps = unittest2 + +[testenv:pyflakes-py26] +commands = ffind --ignore-vcs . '(?<!user-config).py$' --module=pyflakes +basepython = python2.6 +deps = + pyflakes + ffind>=1.0.2 + +[testenv:pyflakes-py3] +commands = ffind --ignore-vcs . '(?<!user-config).py$' --module=pyflakes +basepython = python3 +deps = + pyflakes + ffind>=1.0.2 + +[testenv:pyflakes-pypy] +commands = ffind --ignore-vcs . '(?<!user-config).py$' --module=pyflakes +basepython = pypy +deps = + pyflakes + ffind>=1.0.2 [testenv:flake8] commands = @@ -39,16 +63,6 @@ flake8-tuple>=0.2.8 flake8-print>=2.0.1 flake8-mock - -[testenv:flake8-py3] -commands = - flake8 --version - flake8 --doctests {posargs} -basepython = python3 -deps = flake8 - pyflakes >= 1.1 - flake8-docstrings>=0.2.6 - flake8-putty>=0.3.2 [testenv:nose] commands = @@ -135,9 +149,6 @@ scripts/makecat.py : +D103 scripts/interwiki.py,/""/ : +P102 pywikibot/__init__.py,/link_regex/ : +P103 - # undefined names on Python 3: - pywikibot/page.py , /chr = unichr/ , python_version >= '3' : +F821 - pywikibot/userinterfaces/terminal_interface_base.py , /raw_input/ , python_version >= '3' : +F821 # invalidly detected as {} format string: tests/textlib_tests.py,/self.assert.*{{/ : +P103 # __dict__ used in a discouraged manner -- To view, visit https://gerrit.wikimedia.org/r/260909 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I076a5300ae6ff1c30365be106a8ceca2d48de7e4 Gerrit-PatchSet: 24 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Hashar <hashar(a)free.fr> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years, 11 months

[Gerrit] revertbot: correctly retrieve old page contents - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: revertbot: correctly retrieve old page contents ...................................................................... revertbot: correctly retrieve old page contents Bug: T124537 Change-Id: Iab36cb7f292b23940a2135a7a74b53e34a341a79 --- M scripts/revertbot.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/revertbot.py b/scripts/revertbot.py index d635963..240720b 100755 --- a/scripts/revertbot.py +++ b/scripts/revertbot.py @@ -117,7 +117,7 @@ page.title(asLink=True, forceInterwiki=True, textlink=True))) if not self.rollback: old = page.text - page.text = rev.text + page.text = page.getOldVersion(rev.revid) pywikibot.showDiff(old, page.text) page.save(comment) return comment -- To view, visit https://gerrit.wikimedia.org/r/290200 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iab36cb7f292b23940a2135a7a74b53e34a341a79 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years, 11 months

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits May 2016