Pywikibot-commits April 2020

pywikibot-commits@lists.wikimedia.org

1 participants
98 discussions

[Gerrit] pywikibot/core[master]: [bugfix] Raise ServerError also if connection to PetScan timeouts

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/585729 ) Change subject: [bugfix] Raise ServerError also if connection to PetScan timeouts ...................................................................... [bugfix] Raise ServerError also if connection to PetScan timeouts Change-Id: Ifc7cc4f15b7f6e7038f1bd13a5db649433a7bac9 --- M pywikibot/pagegenerators.py 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 077fddf..b2d2c42 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -30,6 +30,7 @@ from datetime import timedelta from functools import partial +from requests.exceptions import ReadTimeout from warnings import warn import pywikibot @@ -3077,7 +3078,11 @@ """Query PetScan.""" url = 'https://petscan.wmflabs.org' - req = http.fetch(url, params=self.opts) + try: + req = http.fetch(url, params=self.opts) + except ReadTimeout: + raise ServerError( + 'received ReadTimeout from {0}'.format(url)) if 500 <= req.status < 600: raise ServerError( 'received {0} status from {1}'.format(req.status, req.uri)) -- To view, visit https://gerrit.wikimedia.org/r/585729 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ifc7cc4f15b7f6e7038f1bd13a5db649433a7bac9 Gerrit-Change-Number: 585729 Gerrit-PatchSet: 4 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

4 years, 1 month

[Gerrit] pywikibot/core[master]: [doc] Use epytext in PetScanPageGenerator

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/585728 ) Change subject: [doc] Use epytext in PetScanPageGenerator ...................................................................... [doc] Use epytext in PetScanPageGenerator Change-Id: I2ecc2380b3e5407f6bb1e93d2d39235120ea615f --- M pywikibot/pagegenerators.py 1 file changed, 10 insertions(+), 10 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 077fddf..0e30c02 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -3016,16 +3016,16 @@ """ Initializer. - :param categories: List of categories to retrieve pages from + @param categories: List of categories to retrieve pages from (as strings) - :param subset_combination: Combination mode. + @param subset_combination: Combination mode. If True, returns the intersection of the results of the categories, else returns the union of the results of the categories - :param namespaces: List of namespaces to search in + @param namespaces: List of namespaces to search in (default is None, meaning all namespaces) - :param site: Site to operate on + @param site: Site to operate on (default is the default site from the user config) - :param extra_options: Dictionary of extra options to use (optional) + @param extra_options: Dictionary of extra options to use (optional) """ if site is None: site = pywikibot.Site() @@ -3039,13 +3039,13 @@ """ Get the querystring options to query PetScan. - :param categories: List of categories (as strings) - :param subset_combination: Combination mode. + @param categories: List of categories (as strings) + @param subset_combination: Combination mode. If True, returns the intersection of the results of the categories, else returns the union of the results of the categories - :param namespaces: List of namespaces to search in - :param extra_options: Dictionary of extra options to use - :return: Dictionary of querystring parameters to use in the query + @param namespaces: List of namespaces to search in + @param extra_options: Dictionary of extra options to use + @return: Dictionary of querystring parameters to use in the query """ extra_options = extra_options or {} -- To view, visit https://gerrit.wikimedia.org/r/585728 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2ecc2380b3e5407f6bb1e93d2d39235120ea615f Gerrit-Change-Number: 585728 Gerrit-PatchSet: 3 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

4 years, 1 month

[Gerrit] pywikibot/core[master]: [IMPR] Simplify code and use subTest

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/585425 ) Change subject: [IMPR] Simplify code and use subTest ...................................................................... [IMPR] Simplify code and use subTest Setup data in setUp and use subTest to reduce similar codes Change-Id: I2da09ecc01811843ab1aedf6fc09cb7f94ced5ef --- M tests/interwiki_graph_tests.py 1 file changed, 16 insertions(+), 25 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/interwiki_graph_tests.py b/tests/interwiki_graph_tests.py index 07f5fa9..e1b64d9 100644 --- a/tests/interwiki_graph_tests.py +++ b/tests/interwiki_graph_tests.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- """Test Interwiki Graph functionality.""" # -# (C) Pywikibot team, 2015-2018 +# (C) Pywikibot team, 2015-2020 # # Distributed under the terms of the MIT license. # @@ -47,45 +47,36 @@ 'pl': DryPage(cls.plwikt, 'origin'), } - def test_simple_graph(self): - """Test that GraphDrawer.createGraph does not raise exception.""" + def setUp(self): + """Setup interwiki_graph data.""" + super(TestWiktionaryGraph, self).setUp() data = interwiki_graph.Subject(self.pages['en']) - data.found_in[self.pages['en']] = [self.pages['fr'], self.pages['pl']] data.found_in[self.pages['fr']] = [self.pages['en'], self.pages['pl']] data.found_in[self.pages['pl']] = [self.pages['en'], self.pages['fr']] + self.data = data - drawer = interwiki_graph.GraphDrawer(data) - + def test_simple_graph(self): + """Test that GraphDrawer.createGraph does not raise exception.""" + drawer = interwiki_graph.GraphDrawer(self.data) drawer.createGraph() def test_octagon(self): """Test octagon nodes.""" - data = interwiki_graph.Subject(self.pages['en']) - - data.found_in[self.pages['en']] = [self.pages['fr'], self.pages['pl']] - data.found_in[self.pages['en2']] = [self.pages['fr']] - data.found_in[self.pages['fr']] = [self.pages['en'], self.pages['pl']] - data.found_in[self.pages['pl']] = [self.pages['en'], self.pages['fr']] - - drawer = interwiki_graph.GraphDrawer(data) + self.data.found_in[self.pages['en2']] = [self.pages['fr']] + drawer = interwiki_graph.GraphDrawer(self.data) self.assertEqual({self.pages['en'].site}, drawer._octagon_site_set()) drawer.createGraph() - nodes = drawer.graph.obj_dict['nodes'] - self.assertEqual( - nodes['"pl:origin"'][0]['attributes']['shape'], - 'rectangle') - self.assertEqual( - nodes['"fr:origin"'][0]['attributes']['shape'], - 'rectangle') - - self.assertEqual( - nodes['"en:origin"'][0]['attributes']['shape'], - 'octagon') + for node, shape in [('"pl:origin"', 'rectangle'), + ('"fr:origin"', 'rectangle'), + ('"en:origin"', 'octagon')]: + with self.subTest(node=node): + self.assertEqual( + nodes[node][0]['attributes']['shape'], shape) if __name__ == '__main__': # pragma: no cover -- To view, visit https://gerrit.wikimedia.org/r/585425 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2da09ecc01811843ab1aedf6fc09cb7f94ced5ef Gerrit-Change-Number: 585425 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

4 years, 1 month

[Gerrit] pywikibot/core[master]: [IMPR] Improve page save flow in blockpageschecker.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/585445 ) Change subject: [IMPR] Improve page save flow in blockpageschecker.py ...................................................................... [IMPR] Improve page save flow in blockpageschecker.py Change-Id: Ice85284c31eeec4b55fed59383258e472d6544af --- M scripts/blockpageschecker.py 1 file changed, 34 insertions(+), 37 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/blockpageschecker.py b/scripts/blockpageschecker.py index ec7488f..7f8222c 100755 --- a/scripts/blockpageschecker.py +++ b/scripts/blockpageschecker.py @@ -232,9 +232,6 @@ protectType = 'edit' namespace = 0 - # To prevent Infinite loops - errorCount = 0 - # Process global args and prepare generator args parser local_args = pywikibot.handle_args(args) genFactory = pagegenerators.GeneratorFactory() @@ -482,40 +479,40 @@ if choice == 'a': always = True if always or choice == 'y': - while True: - try: - page.put(text, commentUsed, force=True) - except pywikibot.EditConflict: - pywikibot.output('Edit conflict! skip!') - break - except pywikibot.ServerError: - # Sometimes there is this error that's quite annoying - # because can block the whole process for nothing. - errorCount += 1 - if errorCount < 5: - pywikibot.output('Server Error! Wait..') - time.sleep(3) - continue - else: - # Prevent Infinite Loops - raise pywikibot.ServerError('Fifth Server Error!') - except pywikibot.SpamfilterError as e: - pywikibot.output('Cannot change %s because of ' - 'blacklist entry %s' - % (page.title(), e.url)) - break - except pywikibot.LockedPage: - pywikibot.output('The page is still protected. ' - 'Skipping...') - break - except pywikibot.PageNotSaved as error: - pywikibot.output('Error putting page: %s' - % (error.args,)) - break - else: - # Break only if the errors are one after the other - errorCount = 0 - break + save_page(page, text, commentUsed) + + +def save_page(page, text, comment): + """Save a given page.""" + # To prevent Infinite loops + error_count = 0 + while True: + try: + page.put(text, comment, force=True) + except pywikibot.EditConflict: + pywikibot.output('Edit conflict! skip!') + except pywikibot.ServerError: + # Sometimes there is this error that's quite annoying + # because can block the whole process for nothing. + error_count += 1 + if error_count < 5: + pywikibot.output('Server Error! Wait..') + time.sleep(3) + continue + else: + # Prevent Infinite Loops + raise pywikibot.ServerError('Fifth Server Error!') + except pywikibot.SpamfilterError as e: + pywikibot.output('Cannot change %s because of ' + 'blacklist entry %s' + % (page.title(), e.url)) + except pywikibot.LockedPage: + pywikibot.output('The page is still protected. ' + 'Skipping...') + except pywikibot.PageNotSaved as error: + pywikibot.output('Error putting page: %s' + % (error.args,)) + break if __name__ == '__main__': -- To view, visit https://gerrit.wikimedia.org/r/585445 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ice85284c31eeec4b55fed59383258e472d6544af Gerrit-Change-Number: 585445 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

4 years, 1 month

[Gerrit] pywikibot/core[master]: [IMPR] Reduce similar codes in template_bot_tests.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/585430 ) Change subject: [IMPR] Reduce similar codes in template_bot_tests.py ...................................................................... [IMPR] Reduce similar codes in template_bot_tests.py Change-Id: I3c9055ea11cba4080e233a50ff05903a0d73a1e1 --- M tests/template_bot_tests.py 1 file changed, 15 insertions(+), 49 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/template_bot_tests.py b/tests/template_bot_tests.py index 9bb077f..d978eed 100644 --- a/tests/template_bot_tests.py +++ b/tests/template_bot_tests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Test template bot module.""" # -# (C) Pywikibot team, 2015-2019 +# (C) Pywikibot team, 2015-2020 # # Distributed under the terms of the MIT license. # @@ -25,41 +25,30 @@ dry = True - def test_no_match(self): - """Test pages without any desired templates.""" - template = pywikibot.Page(self.site, 'Template:foobar') + def generator(self, title, xml='article-pear-0.10.xml'): + """Return XMLDumpPageGenerator list for a given template title.""" + template = pywikibot.Page(self.site, title, ns=10) builder = _MultiTemplateMatchBuilder(self.site) predicate = builder.search_any_predicate([template]) gen = XMLDumpPageGenerator( - filename=join_xml_data_path('article-pear-0.10.xml'), + filename=join_xml_data_path(xml), site=self.site, text_predicate=predicate) - pages = list(gen) - self.assertIsEmpty(pages) + return list(gen) + + def test_no_match(self): + """Test pages without any desired templates.""" + self.assertIsEmpty(self.generator('foobar')) def test_match(self): """Test pages with one match without parameters.""" - template = pywikibot.Page(self.site, 'Template:stack begin') - builder = _MultiTemplateMatchBuilder(self.site) - predicate = builder.search_any_predicate([template]) - gen = XMLDumpPageGenerator( - filename=join_xml_data_path('article-pear-0.10.xml'), - site=self.site, - text_predicate=predicate) - pages = list(gen) + pages = self.generator('stack begin') self.assertLength(pages, 1) self.assertPageTitlesEqual(pages, ['Pear'], site=self.site) def test_match_with_params(self): """Test pages with one match with parameters.""" - template = pywikibot.Page(self.site, 'Template:Taxobox') - builder = _MultiTemplateMatchBuilder(self.site) - predicate = builder.search_any_predicate([template]) - gen = XMLDumpPageGenerator( - filename=join_xml_data_path('article-pear-0.10.xml'), - site=self.site, - text_predicate=predicate) - pages = list(gen) + pages = self.generator('Taxobox') self.assertLength(pages, 1) self.assertPageTitlesEqual(pages, ['Pear'], site=self.site) @@ -90,30 +79,14 @@ def test_match_msg(self): """Test pages with {{msg:..}}.""" - template = pywikibot.Page(self.site, 'Template:Foo') - builder = _MultiTemplateMatchBuilder(self.site) - - predicate = builder.search_any_predicate([template]) - gen = XMLDumpPageGenerator( - filename=join_xml_data_path('dummy-template.xml'), - site=self.site, - text_predicate=predicate) - pages = list(gen) + pages = self.generator('Foo', 'dummy-template.xml') self.assertLength(pages, 1) self.assertPageTitlesEqual(pages, ['Fake page with msg'], site=self.site) def test_match_unnecessary_template_prefix(self): """Test pages with {{template:..}}.""" - template = pywikibot.Page(self.site, 'Template:Bar') - builder = _MultiTemplateMatchBuilder(self.site) - - predicate = builder.search_any_predicate([template]) - gen = XMLDumpPageGenerator( - filename=join_xml_data_path('dummy-template.xml'), - site=self.site, - text_predicate=predicate) - pages = list(gen) + pages = self.generator('Bar', 'dummy-template.xml') self.assertLength(pages, 1) self.assertPageTitlesEqual( pages, ['Fake page with unnecessary template prefix'], @@ -121,14 +94,7 @@ def test_nested_match(self): """Test pages with one match inside another template.""" - template = pywikibot.Page(self.site, 'Template:boo') - builder = _MultiTemplateMatchBuilder(self.site) - predicate = builder.search_any_predicate([template]) - gen = XMLDumpPageGenerator( - filename=join_xml_data_path('dummy-template.xml'), - site=self.site, - text_predicate=predicate) - pages = list(gen) + pages = self.generator('boo', 'dummy-template.xml') self.assertLength(pages, 1) self.assertPageTitlesEqual( pages, ['Fake page with nested template'], -- To view, visit https://gerrit.wikimedia.org/r/585430 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3c9055ea11cba4080e233a50ff05903a0d73a1e1 Gerrit-Change-Number: 585430 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: jenkins-bot (75)

4 years, 1 month

[Gerrit] pywikibot/core[master]: [IMPR] Simplify code and use subTest

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/585132 ) Change subject: [IMPR] Simplify code and use subTest ...................................................................... [IMPR] Simplify code and use subTest Simplify code and use subTest to reduce similar codes Change-Id: I02b445372856c08157e3f8adabeffe88b7884bc8 --- M tests/i18n_tests.py 1 file changed, 23 insertions(+), 39 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/i18n_tests.py b/tests/i18n_tests.py index 1ee14f8..2d2d32d 100644 --- a/tests/i18n_tests.py +++ b/tests/i18n_tests.py @@ -52,39 +52,27 @@ self.assertEqual(i18n.translate('en', self.msg_semi_localized, fallback=True), 'test-semi-localized EN') - self.assertEqual(i18n.translate('nl', self.msg_semi_localized, - fallback=True), - 'test-semi-localized NL') - self.assertEqual(i18n.translate('fy', self.msg_semi_localized, - fallback=True), - 'test-semi-localized NL') + for code in ('nl', 'fy'): + with self.subTest(code=code): + self.assertEqual(i18n.translate(code, self.msg_semi_localized, + fallback=True), + 'test-semi-localized NL') def testNonLocalized(self): """Test translate with missing localisation.""" - self.assertEqual(i18n.translate('en', self.msg_non_localized, - fallback=True), - 'test-non-localized EN') - self.assertEqual(i18n.translate('fy', self.msg_non_localized, - fallback=True), - 'test-non-localized EN') - self.assertEqual(i18n.translate('nl', self.msg_non_localized, - fallback=True), - 'test-non-localized EN') - self.assertEqual(i18n.translate('ru', self.msg_non_localized, - fallback=True), - 'test-non-localized EN') + for code in ('en', 'fy', 'nl', 'ru'): + with self.subTest(code=code): + self.assertEqual(i18n.translate(code, self.msg_non_localized, + fallback=True), + 'test-non-localized EN') def testNoEnglish(self): """Test translate with missing English text.""" - self.assertEqual(i18n.translate('en', self.msg_no_english, - fallback=True), - 'test-no-english JA') - self.assertEqual(i18n.translate('fy', self.msg_no_english, - fallback=True), - 'test-no-english JA') - self.assertEqual(i18n.translate('nl', self.msg_no_english, - fallback=True), - 'test-no-english JA') + for code in ('en', 'fy', 'nl'): + with self.subTest(code=code): + self.assertEqual(i18n.translate(code, self.msg_no_english, + fallback=True), + 'test-no-english JA') class UserInterfaceLangTestCase(TestCase): @@ -164,21 +152,17 @@ """Test translating with fallback to alternative language.""" self.assertEqual(i18n.twtranslate('en', 'test-semi-localized'), 'test-semi-localized EN') - self.assertEqual(i18n.twtranslate('nl', 'test-semi-localized'), - 'test-semi-localized NL') - self.assertEqual(i18n.twtranslate('fy', 'test-semi-localized'), - 'test-semi-localized NL') + for code in ('nl', 'fy'): + with self.subTest(code=code): + self.assertEqual(i18n.twtranslate(code, 'test-semi-localized'), + 'test-semi-localized NL') def testNonLocalized(self): """Test translating non localized entries.""" - self.assertEqual(i18n.twtranslate('en', 'test-non-localized'), - 'test-non-localized EN') - self.assertEqual(i18n.twtranslate('fy', 'test-non-localized'), - 'test-non-localized EN') - self.assertEqual(i18n.twtranslate('nl', 'test-non-localized'), - 'test-non-localized EN') - self.assertEqual(i18n.twtranslate('ru', 'test-non-localized'), - 'test-non-localized EN') + for code in ('en', 'fy', 'nl', 'ru'): + with self.subTest(code=code): + self.assertEqual(i18n.twtranslate(code, 'test-non-localized'), + 'test-non-localized EN') def testNoEnglish(self): """Test translating into English with missing entry.""" -- To view, visit https://gerrit.wikimedia.org/r/585132 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I02b445372856c08157e3f8adabeffe88b7884bc8 Gerrit-Change-Number: 585132 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: jenkins-bot (75)

4 years, 1 month

[Gerrit] pywikibot/core[master]: [tests] Use meta for TestShortLink

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/585068 ) Change subject: [tests] Use meta for TestShortLink ...................................................................... [tests] Use meta for TestShortLink shared_urlshortner_wiki is meta and pywikibot must be logged in there Bug: T244062 Change-Id: I3f84d47bc6278d6d1231d4053614809149929ecf --- M tests/page_tests.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/page_tests.py b/tests/page_tests.py index 8201445..34b32e7 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -1206,8 +1206,8 @@ user = True - family = 'wikipedia' - code = 'test' + family = 'meta' + code = 'meta' def test_create_short_link(self): """Test create_short_link function.""" -- To view, visit https://gerrit.wikimedia.org/r/585068 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3f84d47bc6278d6d1231d4053614809149929ecf Gerrit-Change-Number: 585068 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

4 years, 1 month

[Gerrit] pywikibot/core[master]: mysql: drop support for MySQLdb module

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/495740 ) Change subject: mysql: drop support for MySQLdb module ...................................................................... mysql: drop support for MySQLdb module The PyMySql module has been the default since 72f072f0c and is the prefered python module. Its advantage over MySQLdb is the module is pure python and does not depend on having the mysql client to be installed on the host. It is thus easier to install for end users. Remove left over legacy support of MySQLdb. Add a note in HISTORY.rst as a hint. Note that the code is only used by pagegenerators.py Bug: T89976 Bug: T243154 Change-Id: Iaa295b27269d40ae6f157635044493566ce39b18 --- M HISTORY.rst M pywikibot/data/mysql.py 2 files changed, 7 insertions(+), 22 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/HISTORY.rst b/HISTORY.rst index c6f2898..a182023 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -4,6 +4,8 @@ Current release --------------- +* pagengenerators.py no more support 'oursql' or 'MySQLdb'. It now solely + support PyMySQL https://pypi.org/project/PyMySQL/ (T243154, T89976) * Bugfixes and improvements * Localisation updates diff --git a/pywikibot/data/mysql.py b/pywikibot/data/mysql.py index 980e9c8..15a6ceb 100644 --- a/pywikibot/data/mysql.py +++ b/pywikibot/data/mysql.py @@ -9,21 +9,11 @@ import pywikibot -# Requires PyMySql as first choice or -# MySQLdb <https://sourceforge.net/projects/mysql-python/> try: - import pymysql as mysqldb + import pymysql except ImportError: - try: - import MySQLdb as mysqldb # noqa: N813 - except ImportError: - raise ImportError('No supported MySQL library installed. ' - 'Please install PyMySQL.') - else: - pywikibot.warning("PyMySQL not found. It'll fallback " - 'on the deprecated library MySQLdb.') -else: - mysqldb.install_as_MySQLdb() + raise ImportError('MySQL python module not found. Please install PyMySQL.') + from pywikibot import config2 as config from pywikibot.tools import deprecated_args, UnicodeType @@ -67,7 +57,7 @@ else: credentials = {'read_default_file': config.db_connect_file} - conn = mysqldb.connect(config.db_hostname, + conn = pymysql.connect(config.db_hostname, db=config.db_name_format.format(dbname), port=config.db_port, charset='utf8', @@ -76,14 +66,7 @@ cursor = conn.cursor() if verbose: - try: - _query = cursor.mogrify(query, params) - except AttributeError: # if MySQLdb is used. - # Not exactly the same encoding handling as cursor.execute() - # Here it is just for the sake of verbose. - _query = query - if params is not None: - _query = query.format(params) + _query = cursor.mogrify(query, params) if not isinstance(_query, UnicodeType): _query = UnicodeType(_query, encoding='utf-8') -- To view, visit https://gerrit.wikimedia.org/r/495740 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iaa295b27269d40ae6f157635044493566ce39b18 Gerrit-Change-Number: 495740 Gerrit-PatchSet: 4 Gerrit-Owner: Hashar <hashar(a)free.fr> Gerrit-Reviewer: Hashar <hashar(a)free.fr> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Multichill <maarten(a)mdammers.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75) Gerrit-CC: Dvorapa <dvorapa(a)seznam.cz>

4 years, 1 month

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits April 2020