Pywikibot-commits October 2018

pywikibot-commits@lists.wikimedia.org

1 participants
57 discussions

[Gerrit] pywikibot/core[master]: Fix typos in pagegenerators.py
by jenkins-bot (Code Review) 01 Oct '18

01 Oct '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463767 ) Change subject: Fix typos in pagegenerators.py ...................................................................... Fix typos in pagegenerators.py - grammar - doctest warning Change-Id: I551a3b39d33cedebf2a51f4288e6e90be3c9ddbd --- M pywikibot/pagegenerators.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Zhuyifei1999: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index bcbb912..78ec1a7 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -65,7 +65,7 @@ # most of these functions just wrap a Site or Page method that returns # a generator -parameterHelp = """ \ +parameterHelp = """\ GENERATOR OPTIONS ================= @@ -250,7 +250,7 @@ contain it. Argument can be given as "-searchitem:text", where text is the string to look for, or "-searchitem:lang:text", - where lang is the langauge to search items in. + where lang is the language to search items in. -wantedpages Work on pages that are linked, but do not exist; may be given as "-wantedpages:n" where n is the maximum -- To view, visit https://gerrit.wikimedia.org/r/463767 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: I551a3b39d33cedebf2a51f4288e6e90be3c9ddbd Gerrit-Change-Number: 463767 Gerrit-PatchSet: 3 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [bugfix] Fix pagegenerators_tests.TestPagesFromPageidGenerator
by jenkins-bot (Code Review) 01 Oct '18

01 Oct '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463755 ) Change subject: [bugfix] Fix pagegenerators_tests.TestPagesFromPageidGenerator ...................................................................... [bugfix] Fix pagegenerators_tests.TestPagesFromPageidGenerator Add missing space. Bug: T205858 Change-Id: Ie4fed39cffef4b421bf8b29560fe66ba32ab0fe5 --- M tests/pagegenerators_tests.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: D3r1ck01: Looks good to me, but someone else must approve Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index 63ca9b0..f66629e 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -194,8 +194,8 @@ family = 'wikisource' code = 'en' - base_title = ('Page:06-24-1920 -The Story of the Jones County Calf' - 'Case.pdf/%s') + base_title = ('Page:06-24-1920 -The Story of the Jones County ' + 'Calf Case.pdf/%s') def setUp(self): """Setup tests.""" -- To view, visit https://gerrit.wikimedia.org/r/463755 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: Ie4fed39cffef4b421bf8b29560fe66ba32ab0fe5 Gerrit-Change-Number: 463755 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [doc] Provide a generic pypi link instead of a specific release
by jenkins-bot (Code Review) 01 Oct '18

01 Oct '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463730 ) Change subject: [doc] Provide a generic pypi link instead of a specific release ...................................................................... [doc] Provide a generic pypi link instead of a specific release Change-Id: Icac95f18f36a8ff701066eadcdc6db9ab4ca3888 --- M pywikibot/config2.py M scripts/interwiki.py 2 files changed, 2 insertions(+), 4 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/config2.py b/pywikibot/config2.py index 2067296..956c720 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -577,8 +577,7 @@ # Should interwiki.py output a graph PNG file on conflicts? # You need pydot for this: -# https://pypi.org/project/pydot/1.0.2 -# https://code.google.com/p/pydot/ +# https://pypi.org/project/pydot/ interwiki_graph = False # Specifies that the robot should process that amount of subjects at a time, diff --git a/scripts/interwiki.py b/scripts/interwiki.py index 79aaa9e..4a325a3 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -320,8 +320,7 @@ interwiki_shownew: should interwiki.py display every new link it discovers? interwiki_graph: output a graph PNG file on conflicts? You need pydot for - this: https://pypi.org/project/pydot/1.0.2 - https://code.google.com/p/pydot/ + this: https://pypi.org/project/pydot/ interwiki_graph_format: the file format for interwiki graphs -- To view, visit https://gerrit.wikimedia.org/r/463730 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: Icac95f18f36a8ff701066eadcdc6db9ab4ca3888 Gerrit-Change-Number: 463730 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [bugfix] Fix failing tests of TestPageBotMayEdit.test_bot_may_edit_ge...
by jenkins-bot (Code Review) 01 Oct '18

01 Oct '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463726 ) Change subject: [bugfix] Fix failing tests of TestPageBotMayEdit.test_bot_may_edit_general ...................................................................... [bugfix] Fix failing tests of TestPageBotMayEdit.test_bot_may_edit_general This partly reverts I2afc60004d9b14460ef465b09a46d61cdd719fc3 Bug: T205838 Change-Id: I2d0795d32d5fceedfa4819c89807079789948086 --- M tests/page_tests.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: D3r1ck01: Looks good to me, but someone else must approve Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/page_tests.py b/tests/page_tests.py index d471d66..908706f 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -782,7 +782,7 @@ .format(page.text, page.botMayEdit(), user)) # Ban all compliant bots not in the list, syntax for de wp. - page.text = '{{nobots|{}, HagermanBot,Werdnabot}}'.format(user) + page.text = '{{nobots|%s, HagermanBot,Werdnabot}}' % user self.assertFalse(page.botMayEdit(), '{}: {} but user={}' .format(page.text, page.botMayEdit(), user)) @@ -811,13 +811,13 @@ .format(page.text, page.botMayEdit(), user)) # Ban all compliant bots not in the list. - page.text = '{{bots|allow={}, HagermanBot}}'.format(user) + page.text = '{{bots|allow=%s, HagermanBot}}' % user self.assertTrue(page.botMayEdit(), '{}: {} but user={}' .format(page.text, page.botMayEdit(), user)) # Ban all compliant bots in the list. - page.text = '{{bots|deny={}, HagermanBot}}'.format(user) + page.text = '{{bots|deny=%s, HagermanBot}}' % user self.assertFalse(page.botMayEdit(), '{}: {} but user={}' .format(page.text, page.botMayEdit(), user)) -- To view, visit https://gerrit.wikimedia.org/r/463726 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: I2d0795d32d5fceedfa4819c89807079789948086 Gerrit-Change-Number: 463726 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] cleanup tests/[page_tests.py-python_tests.py]
by jenkins-bot (Code Review) 01 Oct '18

01 Oct '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463372 ) Change subject: [cleanup] cleanup tests/[page_tests.py-python_tests.py] ...................................................................... [cleanup] cleanup tests/[page_tests.py-python_tests.py] - use single quotes for string literals - remove preleading "u" fron strings - indentation to make sure code lines are less than 79 characters - use str.format(...) instead of modulo for type specifier arguments Change-Id: I2afc60004d9b14460ef465b09a46d61cdd719fc3 --- 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 6 files changed, 298 insertions(+), 248 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/page_tests.py b/tests/page_tests.py index f2f3b14..d471d66 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -65,42 +65,42 @@ cached = True - namespaces = {0: [u""], # en.wikipedia.org namespaces for testing - 1: [u"Talk:"], # canonical form first, then others - 2: [u"User:"], # must end with : - 3: [u"User talk:", u"User_talk:"], - 4: [u"Wikipedia:", u"Project:", u"WP:"], - 5: [u"Wikipedia talk:", u"Project talk:", u"Wikipedia_talk:", - u"Project_talk:", u"WT:"], - 6: [u"File:"], - 7: [u"Image talk:", u"Image_talk:"], - 8: [u"MediaWiki:"], - 9: [u"MediaWiki talk:", u"MediaWiki_talk:"], - 10: [u"Template:"], - 11: [u"Template talk:", u"Template_talk:"], - 12: [u"Help:"], - 13: [u"Help talk:", u"Help_talk:"], - 14: [u"Category:"], - 15: [u"Category talk:", u"Category_talk:"], - 100: [u"Portal:"], - 101: [u"Portal talk:", u"Portal_talk:"], + namespaces = {0: [''], # en.wikipedia.org namespaces for testing + 1: ['Talk:'], # canonical form first, then others + 2: ['User:'], # must end with : + 3: ['User talk:', 'User_talk:'], + 4: ['Wikipedia:', 'Project:', 'WP:'], + 5: ['Wikipedia talk:', 'Project talk:', 'Wikipedia_talk:', + 'Project_talk:', 'WT:'], + 6: ['File:'], + 7: ['Image talk:', 'Image_talk:'], + 8: ['MediaWiki:'], + 9: ['MediaWiki talk:', 'MediaWiki_talk:'], + 10: ['Template:'], + 11: ['Template talk:', 'Template_talk:'], + 12: ['Help:'], + 13: ['Help talk:', 'Help_talk:'], + 14: ['Category:'], + 15: ['Category talk:', 'Category_talk:'], + 100: ['Portal:'], + 101: ['Portal talk:', 'Portal_talk:'], } titles = { # just a bunch of randomly selected titles # input format : expected output format - u"Cities in Burkina Faso": u"Cities in Burkina Faso", - u"eastern Sayan": u"Eastern Sayan", - u"The_Addams_Family_(pinball)": u"The Addams Family (pinball)", - u"Hispanic (U.S. Census)": u"Hispanic (U.S. Census)", - u"Stołpce": u"Stołpce", - u"Nowy_Sącz": u"Nowy Sącz", - u"battle of Węgierska Górka": u"Battle of Węgierska Górka", + 'Cities in Burkina Faso': 'Cities in Burkina Faso', + 'eastern Sayan': 'Eastern Sayan', + 'The_Addams_Family_(pinball)': 'The Addams Family (pinball)', + 'Hispanic (U.S. Census)': 'Hispanic (U.S. Census)', + 'Stołpce': 'Stołpce', + 'Nowy_Sącz': 'Nowy Sącz', + 'battle of Węgierska Górka': 'Battle of Węgierska Górka', } # random bunch of possible section titles - sections = [u"", - u"#Phase_2", - u"#History", - u"#later life", + sections = ['', + '#Phase_2', + '#History', + '#later life', ] def testNamespaces(self): @@ -157,10 +157,12 @@ # wikisource:it kept Autore as canonical name l2 = pywikibot.page.Link('Autore:Albert Einstein', source=self.itws) self.assertEqual(l2.ns_title(), 'Autore:Albert Einstein') - self.assertEqual(l2.ns_title(onsite=self.enws), 'Author:Albert Einstein') + self.assertEqual(l2.ns_title(onsite=self.enws), + 'Author:Albert Einstein') # Translation namespace does not exist on wikisource:it - l3 = pywikibot.page.Link('Translation:Albert Einstein', source=self.enws) + l3 = pywikibot.page.Link('Translation:Albert Einstein', + source=self.enws) self.assertEqual(l3.ns_title(), 'Translation:Albert Einstein') self.assertRaisesRegex(pywikibot.Error, 'No corresponding namespace found for ' @@ -186,43 +188,43 @@ family_name = (site.family.name + ':' if pywikibot.config2.family != site.family.name - else u'') - self.assertEqual(str(mainpage), u"[[%s%s:%s]]" - % (family_name, site.code, - mainpage.title())) + else '') + self.assertEqual(str(mainpage), '[[{}{}:{}]]' + .format(family_name, site.code, + mainpage.title())) self.assertLess(mainpage, maintalk) def testHelpTitle(self): """Test title() method options in Help namespace.""" site = self.get_site() - p1 = pywikibot.Page(site, u"Help:Test page#Testing") - ns_name = u"Help" + p1 = pywikibot.Page(site, 'Help:Test page#Testing') + ns_name = 'Help' if site.namespaces[12][0] != ns_name: ns_name = site.namespaces[12][0] self.assertEqual(p1.title(), - ns_name + u":Test page#Testing") + ns_name + ':Test page#Testing') self.assertEqual(p1.title(underscore=True), - ns_name + u":Test_page#Testing") + ns_name + ':Test_page#Testing') self.assertEqual(p1.title(with_ns=False), - u"Test page#Testing") + 'Test page#Testing') self.assertEqual(p1.title(with_section=False), - ns_name + u":Test page") + ns_name + ':Test page') self.assertEqual(p1.title(with_ns=False, with_section=False), - u"Test page") + 'Test page') self.assertEqual(p1.title(as_url=True), - ns_name + "%3ATest_page%23Testing") + ns_name + '%3ATest_page%23Testing') self.assertEqual(p1.title(as_link=True, insite=site), - u"[[" + ns_name + u":Test page#Testing]]") + '[[' + ns_name + ':Test page#Testing]]') self.assertEqual( p1.title(as_link=True, force_interwiki=True, insite=site), '[[en:' + ns_name + ':Test page#Testing]]') self.assertEqual(p1.title(as_link=True, textlink=True, insite=site), p1.title(as_link=True, textlink=False, insite=site)) self.assertEqual(p1.title(as_link=True, with_ns=False, insite=site), - u"[[" + ns_name + u":Test page#Testing|Test page]]") + '[[' + ns_name + ':Test page#Testing|Test page]]') self.assertEqual(p1.title(as_link=True, force_interwiki=True, with_ns=False, insite=site), - u"[[en:" + ns_name + ":Test page#Testing|Test page]]") + '[[en:' + ns_name + ':Test page#Testing|Test page]]') self.assertEqual(p1.title(as_link=True, textlink=True, with_ns=False, insite=site), p1.title(as_link=True, textlink=False, @@ -232,39 +234,42 @@ """Test title() method options in File namespace.""" # also test a page with non-ASCII chars and a different namespace site = self.get_site() - p2 = pywikibot.Page(site, u"File:Jean-Léon Gérôme 003.jpg") - ns_name = u"File" + p2 = pywikibot.Page(site, 'File:Jean-Léon Gérôme 003.jpg') + ns_name = 'File' if site.namespaces[6][0] != ns_name: ns_name = site.namespaces[6][0] self.assertEqual(p2.title(), - u"File:Jean-Léon Gérôme 003.jpg") + 'File:Jean-Léon Gérôme 003.jpg') self.assertEqual(p2.title(underscore=True), - u"File:Jean-Léon_Gérôme_003.jpg") + 'File:Jean-Léon_Gérôme_003.jpg') self.assertEqual(p2.title(with_ns=False), - u"Jean-Léon Gérôme 003.jpg") + 'Jean-Léon Gérôme 003.jpg') self.assertEqual(p2.title(with_section=False), - u"File:Jean-Léon Gérôme 003.jpg") + 'File:Jean-Léon Gérôme 003.jpg') self.assertEqual(p2.title(with_ns=False, with_section=False), - u"Jean-Léon Gérôme 003.jpg") + 'Jean-Léon Gérôme 003.jpg') self.assertEqual(p2.title(as_url=True), - u"File%3AJean-L%C3%A9on_G%C3%A9r%C3%B4me_003.jpg") + 'File%3AJean-L%C3%A9on_G%C3%A9r%C3%B4me_003.jpg') self.assertEqual(p2.title(as_link=True, insite=site), - u"[[File:Jean-Léon Gérôme 003.jpg]]") + '[[File:Jean-Léon Gérôme 003.jpg]]') self.assertEqual( p2.title(as_link=True, force_interwiki=True, insite=site), '[[en:File:Jean-Léon Gérôme 003.jpg]]') self.assertEqual(p2.title(as_link=True, textlink=True, insite=site), - u"[[:File:Jean-Léon Gérôme 003.jpg]]") + '[[:File:Jean-Léon Gérôme 003.jpg]]') self.assertEqual(p2.title(as_filename=True), - u"File_Jean-Léon_Gérôme_003.jpg") - self.assertEqual(p2.title(as_link=True, with_ns=False, insite=site), - u"[[File:Jean-Léon Gérôme 003.jpg|Jean-Léon Gérôme 003.jpg]]") - self.assertEqual(p2.title(as_link=True, force_interwiki=True, - with_ns=False, insite=site), - u"[[en:File:Jean-Léon Gérôme 003.jpg|Jean-Léon Gérôme 003.jpg]]") - self.assertEqual(p2.title(as_link=True, textlink=True, - with_ns=False, insite=site), - u"[[:File:Jean-Léon Gérôme 003.jpg|Jean-Léon Gérôme 003.jpg]]") + 'File_Jean-Léon_Gérôme_003.jpg') + self.assertEqual( + p2.title(as_link=True, with_ns=False, insite=site), + '[[File:Jean-Léon Gérôme 003.jpg|Jean-Léon Gérôme 003.jpg]]') + self.assertEqual( + p2.title(as_link=True, force_interwiki=True, + with_ns=False, insite=site), + '[[en:File:Jean-Léon Gérôme 003.jpg|Jean-Léon Gérôme 003.jpg]]') + self.assertEqual( + p2.title(as_link=True, textlink=True, + with_ns=False, insite=site), + '[[:File:Jean-Léon Gérôme 003.jpg|Jean-Léon Gérôme 003.jpg]]') def testImageAndDataRepository(self): """Test image_repository and data_repository page attributes.""" @@ -283,7 +288,8 @@ """Test Page.oldest_revision.""" mainpage = self.get_mainpage() self.assertEqual(mainpage.oldest_revision.user, 'TwoOneTwo') - self.assertIsInstance(mainpage.oldest_revision.timestamp, pywikibot.Timestamp) + self.assertIsInstance(mainpage.oldest_revision.timestamp, + pywikibot.Timestamp) class TestPageObject(DefaultSiteTestCase): @@ -302,7 +308,7 @@ mainpage = self.get_mainpage() maintalk = mainpage.toggleTalkPage() - if u':' not in mainpage.title(): + if ':' not in mainpage.title(): self.assertEqual(mainpage.namespace(), 0) self.assertEqual(maintalk.namespace(), mainpage.namespace() + 1) @@ -318,7 +324,7 @@ # Empty string or None as title raises error. page = pywikibot.page.BasePage(site) self.assertRaisesRegex(InvalidTitle, INVALID_TITLE_RE, page.title) - page = pywikibot.page.BasePage(site, title=u'') + page = pywikibot.page.BasePage(site, title='') self.assertRaisesRegex(InvalidTitle, INVALID_TITLE_RE, page.title) self.assertRaisesRegex(ValueError, 'Title cannot be None.', pywikibot.page.BasePage, site, title=None) @@ -348,11 +354,11 @@ """Test title() method options in article namespace.""" # at last test article namespace site = self.get_site() - p2 = pywikibot.Page(site, u"Test page") + p2 = pywikibot.Page(site, 'Test page') self.assertEqual(p2.title(), - u"Test page") + 'Test page') self.assertEqual(p2.title(underscore=True), - u"Test_page") + 'Test_page') self.assertEqual(p2.title(), p2.title(with_ns=False)) self.assertEqual(p2.title(), @@ -360,7 +366,7 @@ self.assertEqual(p2.title(as_url=True), p2.title(underscore=True)) self.assertEqual(p2.title(as_link=True, insite=site), - u"[[Test page]]") + '[[Test page]]') self.assertEqual(p2.title(as_filename=True), p2.title(underscore=True)) self.assertEqual(p2.title(underscore=True), @@ -383,24 +389,24 @@ p2.title(with_ns=False, as_filename=True)) self.assertEqual(p2.title(with_ns=False, as_link=True, force_interwiki=True, insite=site), - u"[[" + site.code + u":Test page|Test page]]") + '[[' + site.code + ':Test page|Test page]]') def testSection(self): """Test section() method.""" # use same pages as in previous test site = self.get_site() - p1 = pywikibot.Page(site, u"Help:Test page#Testing") - p2 = pywikibot.Page(site, u"File:Jean-Léon Gérôme 003.jpg") - self.assertEqual(p1.section(), u"Testing") + p1 = pywikibot.Page(site, 'Help:Test page#Testing') + p2 = pywikibot.Page(site, 'File:Jean-Léon Gérôme 003.jpg') + self.assertEqual(p1.section(), 'Testing') self.assertEqual(p2.section(), None) def testIsTalkPage(self): """Test isTalkPage() method.""" site = self.get_site() - p1 = pywikibot.Page(site, u"First page") - p2 = pywikibot.Page(site, u"Talk:First page") - p3 = pywikibot.Page(site, u"User:Second page") - p4 = pywikibot.Page(site, u"User talk:Second page") + p1 = pywikibot.Page(site, 'First page') + p2 = pywikibot.Page(site, 'Talk:First page') + p3 = pywikibot.Page(site, 'User:Second page') + p4 = pywikibot.Page(site, 'User talk:Second page') self.assertEqual(p1.isTalkPage(), False) self.assertEqual(p2.isTalkPage(), True) self.assertEqual(p3.isTalkPage(), False) @@ -409,9 +415,9 @@ def testIsCategory(self): """Test is_categorypage method.""" site = self.get_site() - p1 = pywikibot.Page(site, u"First page") - p2 = pywikibot.Page(site, u"Category:Second page") - p3 = pywikibot.Page(site, u"Category talk:Second page") + p1 = pywikibot.Page(site, 'First page') + p2 = pywikibot.Page(site, 'Category:Second page') + p3 = pywikibot.Page(site, 'Category talk:Second page') self.assertEqual(p1.is_categorypage(), False) self.assertEqual(p2.is_categorypage(), True) self.assertEqual(p3.is_categorypage(), False) @@ -419,9 +425,9 @@ def testIsFile(self): """Test C{Page.is_filepage} check.""" site = self.get_site() - p1 = pywikibot.Page(site, u"First page") - p2 = pywikibot.Page(site, u"File:Second page") - p3 = pywikibot.Page(site, u"Image talk:Second page") + p1 = pywikibot.Page(site, 'First page') + p2 = pywikibot.Page(site, 'File:Second page') + p3 = pywikibot.Page(site, 'Image talk:Second page') self.assertEqual(p1.is_filepage(), False) self.assertEqual(p2.is_filepage(), True) self.assertEqual(p3.is_filepage(), False) @@ -455,8 +461,8 @@ mainpage = self.get_mainpage() maintalk = mainpage.toggleTalkPage() if not maintalk.exists(): - raise unittest.SkipTest("No talk page for %s's main page" - % self.get_site()) + raise unittest.SkipTest("No talk page for {}'s main page" + .format(self.get_site())) self.assertIsInstance(maintalk.get(get_redirect=True), unicode) self.assertEqual(mainpage.toggleTalkPage(), maintalk) self.assertEqual(maintalk.toggleTalkPage(), mainpage) @@ -540,7 +546,8 @@ for page in site.allpages(filterredir=True, total=1): break else: - raise unittest.SkipTest('No redirect pages on site {0!r}'.format(site)) + raise unittest.SkipTest('No redirect pages on site {0!r}' + .format(site)) # This page is already initialised self.assertTrue(hasattr(page, '_isredir')) # call api.update_page without prop=info @@ -681,27 +688,28 @@ super(TestPageRepr, self).tearDown() def test_mainpage_type(self): - u"""Test the return type of repr(Page(<main page>)) is str.""" + """Test the return type of repr(Page(<main page>)) is str.""" mainpage = self.get_mainpage() self.assertIsInstance(repr(mainpage), str) def test_unicode_type(self): - """Test the return type of repr(Page(u'<non-ascii>')) is str.""" - page = pywikibot.Page(self.get_site(), u'Ō') + """Test the return type of repr(Page('<non-ascii>')) is str.""" + page = pywikibot.Page(self.get_site(), 'Ō') self.assertIsInstance(repr(page), str) @unittest.skipIf(not PY2, 'Python 2 specific test') def test_unicode_value(self): - """Test repr(Page(u'<non-ascii>')) is represented simply as utf8.""" - page = pywikibot.Page(self.get_site(), u'Ō') + """Test repr(Page('<non-ascii>')) is represented simply as utf8.""" + page = pywikibot.Page(self.get_site(), 'Ō') self.assertEqual(repr(page), b'Page(\xc5\x8c)') @unittest.skipIf(not PY2, 'Python 2 specific test') def test_unicode_percent_r_failure(self): - """Test u'{x!r}'.format(Page(u'<non-ascii>')) raises exception on Python 2.""" + """Test '{x!r}'.format() raises exception for non-ASCII Page.""" # This raises an exception on Python 2, but passes on Python 3 - page = pywikibot.Page(self.get_site(), u'Ō') - self.assertRaisesRegex(UnicodeDecodeError, '', unicode.format, u'{0!r}', page) + page = pywikibot.Page(self.get_site(), 'Ō') + self.assertRaisesRegex(UnicodeDecodeError, '', unicode.format, + '{0!r}', page) @unittest.skipIf(PY2, 'Python 3+ specific test') def test_unicode_value_py3(self): @@ -736,7 +744,7 @@ @unittest.skipIf(not PY2, 'Python 2 specific test') def test_incapable_encoding(self): - """Test that repr still works even if the console encoding does not.""" + """Test that repr works even if console encoding does not.""" self.assertEqual(repr(self.page), b'Page(\\u014c)') @@ -759,8 +767,8 @@ page = pywikibot.Page(site, 'not_existent_page_for_pywikibot_tests') if page.exists(): raise unittest.SkipTest( - "Page %s exists! Change page name in tests/page_tests.py" - % page.title()) + 'Page {} exists! Change page name in tests/page_tests.py' + .format(page.title())) # Ban all compliant bots (shortcut). page.text = '{{nobots}}' @@ -770,20 +778,20 @@ # Ban all compliant bots not in the list, syntax for de wp. page.text = '{{nobots|HagermanBot,Werdnabot}}' self.assertTrue(page.botMayEdit(), - u'%s: %s but user=%s' - % (page.text, page.botMayEdit(), user)) + '{}: {} but user={}' + .format(page.text, page.botMayEdit(), user)) # Ban all compliant bots not in the list, syntax for de wp. - page.text = '{{nobots|%s, HagermanBot,Werdnabot}}' % user + page.text = '{{nobots|{}, HagermanBot,Werdnabot}}'.format(user) self.assertFalse(page.botMayEdit(), - u'%s: %s but user=%s' - % (page.text, page.botMayEdit(), user)) + '{}: {} but user={}' + .format(page.text, page.botMayEdit(), user)) # Ban all bots, syntax for de wp. page.text = '{{nobots|all}}' self.assertFalse(page.botMayEdit(), - u'%s: %s but user=%s' - % (page.text, page.botMayEdit(), user)) + '{}: {} but user={}' + .format(page.text, page.botMayEdit(), user)) # Allow all bots (shortcut). page.text = '{{bots}}' @@ -793,50 +801,50 @@ # Ban all compliant bots not in the list. page.text = '{{bots|allow=HagermanBot,Werdnabot}}' self.assertFalse(page.botMayEdit(), - u'%s: %s but user=%s' - % (page.text, page.botMayEdit(), user)) + '{}: {} but user={}' + .format(page.text, page.botMayEdit(), user)) # Ban all compliant bots in the list. page.text = '{{bots|deny=HagermanBot,Werdnabot}}' self.assertTrue(page.botMayEdit(), - u'%s: %s but user=%s' - % (page.text, page.botMayEdit(), user)) + '{}: {} but user={}' + .format(page.text, page.botMayEdit(), user)) # Ban all compliant bots not in the list. - page.text = '{{bots|allow=%s, HagermanBot}}' % user + page.text = '{{bots|allow={}, HagermanBot}}'.format(user) self.assertTrue(page.botMayEdit(), - u'%s: %s but user=%s' - % (page.text, page.botMayEdit(), user)) + '{}: {} but user={}' + .format(page.text, page.botMayEdit(), user)) # Ban all compliant bots in the list. - page.text = '{{bots|deny=%s, HagermanBot}}' % user + page.text = '{{bots|deny={}, HagermanBot}}'.format(user) self.assertFalse(page.botMayEdit(), - u'%s: %s but user=%s' - % (page.text, page.botMayEdit(), user)) + '{}: {} but user={}' + .format(page.text, page.botMayEdit(), user)) # Allow all bots. page.text = '{{bots|allow=all}}' self.assertTrue(page.botMayEdit(), - u'%s: %s but user=%s' - % (page.text, page.botMayEdit(), user)) + '{}: {} but user={}' + .format(page.text, page.botMayEdit(), user)) # Ban all compliant bots. page.text = '{{bots|allow=none}}' self.assertFalse(page.botMayEdit(), - u'%s: %s but user=%s' - % (page.text, page.botMayEdit(), user)) + '{}: {} but user={}' + .format(page.text, page.botMayEdit(), user)) # Ban all compliant bots. page.text = '{{bots|deny=all}}' self.assertFalse(page.botMayEdit(), - u'%s: %s but user=%s' - % (page.text, page.botMayEdit(), user)) + '{}: {} but user={}' + .format(page.text, page.botMayEdit(), user)) # Allow all bots. page.text = '{{bots|deny=none}}' self.assertTrue(page.botMayEdit(), - u'%s: %s but user=%s' - % (page.text, page.botMayEdit(), user)) + '{}: {} but user={}' + .format(page.text, page.botMayEdit(), user)) # Ban all users including bots. page.text = '{{in use}}' @@ -905,32 +913,34 @@ def testIsRedirect(self): """Test C{Page.isRedirectPage()} and C{Page.getRedirectTarget}.""" site = self.get_site() - p1 = pywikibot.Page(site, u'User:Legoktm/R1') - p2 = pywikibot.Page(site, u'User:Legoktm/R2') + p1 = pywikibot.Page(site, 'User:Legoktm/R1') + p2 = pywikibot.Page(site, 'User:Legoktm/R2') self.assertTrue(p1.isRedirectPage()) self.assertEqual(p1.getRedirectTarget(), p2) def testPageGet(self): """Test C{Page.get()} on different types of pages.""" site = self.get_site() - p1 = pywikibot.Page(site, u'User:Legoktm/R2') - p2 = pywikibot.Page(site, u'User:Legoktm/R1') - p3 = pywikibot.Page(site, u'User:Legoktm/R3') + p1 = pywikibot.Page(site, 'User:Legoktm/R2') + p2 = pywikibot.Page(site, 'User:Legoktm/R1') + p3 = pywikibot.Page(site, 'User:Legoktm/R3') - text = u'This page is used in the [[mw:Manual:Pywikipediabot]] testing suite.' + text = ('This page is used in the [[mw:Manual:Pywikipediabot]] ' + 'testing suite.') self.assertEqual(p1.get(), text) self.assertRaisesRegex(pywikibot.exceptions.IsRedirectPage, r'{0} is a redirect page\.' .format(re.escape(str(p2))), p2.get) - self.assertRaisesRegex(pywikibot.exceptions.NoPage, NO_PAGE_RE, p3.get) + self.assertRaisesRegex( + pywikibot.exceptions.NoPage, NO_PAGE_RE, p3.get) def test_set_redirect_target(self): """Test set_redirect_target method.""" # R1 redirects to R2 and R3 doesn't exist. site = self.get_site() - p1 = pywikibot.Page(site, u'User:Legoktm/R2') - p2 = pywikibot.Page(site, u'User:Legoktm/R1') - p3 = pywikibot.Page(site, u'User:Legoktm/R3') + p1 = pywikibot.Page(site, 'User:Legoktm/R2') + p2 = pywikibot.Page(site, 'User:Legoktm/R1') + p3 = pywikibot.Page(site, 'User:Legoktm/R3') text = p2.get(get_redirect=True) self.assertRaisesRegex(pywikibot.exceptions.IsNotRedirectPage, @@ -953,7 +963,8 @@ """Test purging the mainpage.""" mainpage = self.get_mainpage() self.assertIsInstance(mainpage.purge(), bool) - self.assertEqual(mainpage.purge(), mainpage.purge(forcelinkupdate=None)) + self.assertEqual(mainpage.purge(), + mainpage.purge(forcelinkupdate=None)) def test_watch(self): """Test Page.watch, with and without unwatch enabled.""" @@ -981,7 +992,7 @@ def test_delete(self): """Test the site.delete and site.undelete method.""" site = self.get_site() - p = pywikibot.Page(site, u'User:Unicodesnowman/DeleteTest') + p = pywikibot.Page(site, 'User:Unicodesnowman/DeleteTest') # Ensure the page exists p.text = 'pywikibot unit test page' p.save('#redirect[[unit test]]', botflag=True) @@ -990,10 +1001,11 @@ p.delete(reason='pywikibot unit test', prompt=False, mark=False) self.assertEqual(p._pageid, 0) self.assertEqual(p.isRedirectPage(), False) - self.assertRaisesRegex(pywikibot.NoPage, NO_PAGE_RE, p.get, force=True) + self.assertRaisesRegex(pywikibot.NoPage, + NO_PAGE_RE, p.get, force=True) # Test undeleting last two revisions del_revs = list(p.loadDeletedRevisions()) - revid = p.getDeletedRevision(del_revs[-1])[u'revid'] + revid = p.getDeletedRevision(del_revs[-1])['revid'] p.markDeletedRevision(del_revs[-1]) p.markDeletedRevision(del_revs[-2]) self.assertRaisesRegex(ValueError, 'is not a deleted revision', @@ -1014,9 +1026,9 @@ def test_applicable_protections(self): """Test Page.applicable_protections.""" site = self.get_site() - p1 = pywikibot.Page(site, u'User:Unicodesnowman/NonexistentPage') - p2 = pywikibot.Page(site, u'User:Unicodesnowman/ProtectTest') - p3 = pywikibot.Page(site, u'File:Wiki.png') + p1 = pywikibot.Page(site, 'User:Unicodesnowman/NonexistentPage') + p2 = pywikibot.Page(site, 'User:Unicodesnowman/ProtectTest') + p3 = pywikibot.Page(site, 'File:Wiki.png') # from the API, since 1.25wmf14 pp1 = p1.applicable_protections() @@ -1049,13 +1061,13 @@ def test_protect(self): """Test Page.protect.""" site = self.get_site() - p1 = pywikibot.Page(site, u'User:Unicodesnowman/ProtectTest') + p1 = pywikibot.Page(site, 'User:Unicodesnowman/ProtectTest') p1.protect(protections={'edit': 'sysop', 'move': 'autoconfirmed'}, reason=u'Pywikibot unit test') self.assertEqual(p1.protection(), - {u'edit': (u'sysop', u'infinity'), - u'move': (u'autoconfirmed', u'infinity')}) + {'edit': ('sysop', 'infinity'), + 'move': ('autoconfirmed', 'infinity')}) p1.protect(protections={'edit': '', 'move': ''}, reason=u'Pywikibot unit test') @@ -1064,17 +1076,17 @@ def test_protect_alt(self): """Test of Page.protect that works around T78522.""" site = self.get_site() - p1 = pywikibot.Page(site, u'User:Unicodesnowman/ProtectTest') + p1 = pywikibot.Page(site, 'User:Unicodesnowman/ProtectTest') p1.protect(protections={'edit': 'sysop', 'move': 'autoconfirmed'}, - reason=u'Pywikibot unit test') + reason='Pywikibot unit test') self.assertEqual(p1.protection(), - {u'edit': (u'sysop', u'infinity'), - u'move': (u'autoconfirmed', u'infinity')}) + {'edit': ('sysop', 'infinity'), + 'move': ('autoconfirmed', 'infinity')}) # workaround - p1 = pywikibot.Page(site, u'User:Unicodesnowman/ProtectTest') + p1 = pywikibot.Page(site, 'User:Unicodesnowman/ProtectTest') p1.protect(protections={'edit': '', 'move': ''}, - reason=u'Pywikibot unit test') + reason='Pywikibot unit test') self.assertEqual(p1.protection(), {}) @@ -1093,18 +1105,25 @@ """Test valid entities.""" self.assertEqual(pywikibot.page.html2unicode('A&O'), 'A&O') self.assertEqual(pywikibot.page.html2unicode('py'), 'py') - self.assertEqual(pywikibot.page.html2unicode('𐀀'), u'\U00010000') - self.assertEqual(pywikibot.page.html2unicode('p&y'), 'p&y') + self.assertEqual(pywikibot.page.html2unicode('𐀀'), + '\U00010000') + self.assertEqual(pywikibot.page.html2unicode('p&y'), + 'p&y') self.assertEqual(pywikibot.page.html2unicode(''), '€') def test_ignore_entities(self): """Test ignore entities.""" - self.assertEqual(pywikibot.page.html2unicode('A&O', [38]), 'A&O') - self.assertEqual(pywikibot.page.html2unicode('A&O', [38]), 'A&O') - self.assertEqual(pywikibot.page.html2unicode('A&O', [38]), 'A&O') + self.assertEqual(pywikibot.page.html2unicode('A&O', [38]), + 'A&O') + self.assertEqual(pywikibot.page.html2unicode('A&O', [38]), + 'A&O') + self.assertEqual(pywikibot.page.html2unicode('A&O', [38]), + 'A&O') self.assertEqual(pywikibot.page.html2unicode('A&O', [37]), 'A&O') - self.assertEqual(pywikibot.page.html2unicode('', [128]), '') - self.assertEqual(pywikibot.page.html2unicode('', [8364]), '') + self.assertEqual(pywikibot.page.html2unicode('', [128]), + '') + self.assertEqual(pywikibot.page.html2unicode('', [8364]), + '') self.assertEqual(pywikibot.page.html2unicode('&#157'), '&#157') @@ -1114,7 +1133,8 @@ def test_invalid_entities(self): """Test texts with invalid entities.""" - self.assertEqual(pywikibot.page.html2unicode('A&notaname;O'), 'A&notaname;O') + self.assertEqual(pywikibot.page.html2unicode('A&notaname;O'), + 'A&notaname;O') self.assertEqual(pywikibot.page.html2unicode('A&#7f;O'), 'A&#7f;O') self.assertEqual(pywikibot.page.html2unicode('&#7f'), '&#7f') self.assertEqual(pywikibot.page.html2unicode('&#x70y'), '&#x70y') diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index 39b8fec..63ca9b0 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -38,22 +38,22 @@ en_wp_page_titles = ( # just a bunch of randomly selected titles for English Wikipedia tests - u"Eastern Sayan", - u"The Addams Family (pinball)", - u"Talk:Nowy Sącz", - u"Talk:Battle of Węgierska Górka", - u"Template:!", - u"Template:Template", + 'Eastern Sayan', + 'The Addams Family (pinball)', + 'Talk:Nowy Sącz', + 'Talk:Battle of Węgierska Górka', + 'Template:!', + 'Template:Template', ) en_wp_nopage_titles = ( - u"Cities in Burkina Faso", - u"Talk:Hispanic (U.S. Census)", - u"Talk:Stołpce", - u"Template:!/Doc", - u"Template:!/Meta", - u"Template:Template/Doc", - u"Template:Template/Meta", + 'Cities in Burkina Faso', + 'Talk:Hispanic (U.S. Census)', + 'Talk:Stołpce', + 'Template:!/Doc', + 'Template:!/Meta', + 'Template:Template/Doc', + 'Template:Template/Meta', ) @@ -80,11 +80,11 @@ def test_module_import(self): """Test module import.""" - self.assertIn("pywikibot.pagegenerators", sys.modules) + self.assertIn('pywikibot.pagegenerators', sys.modules) def test_PagesFromTitlesGenerator(self): """Test PagesFromTitlesGenerator.""" - self.assertFunction("PagesFromTitlesGenerator") + self.assertFunction('PagesFromTitlesGenerator') gen = pagegenerators.PagesFromTitlesGenerator(self.titles, self.site) self.assertPagelistTitles(gen, self.titles) @@ -105,14 +105,13 @@ gen = pagegenerators.NamespaceFilterPageGenerator(gen, (1, 10), site) self.assertEqual(len(tuple(gen)), 10) gen = pagegenerators.PagesFromTitlesGenerator(self.titles, site) - gen = pagegenerators.NamespaceFilterPageGenerator(gen, - ('Talk', 'Template'), - site) + gen = pagegenerators.NamespaceFilterPageGenerator( + gen, ('Talk', 'Template'), site) self.assertEqual(len(tuple(gen)), 10) def test_RegexFilterPageGenerator(self): """Test RegexFilterPageGenerator.""" - self.assertFunction("RegexFilterPageGenerator") + self.assertFunction('RegexFilterPageGenerator') gen = pagegenerators.PagesFromTitlesGenerator(self.titles, self.site) gen = pagegenerators.RegexFilterPageGenerator(gen, '/doc') self.assertPagelistTitles(gen, @@ -137,12 +136,12 @@ quantifier='all') self.assertPagelistTitles(gen, []) gen = pagegenerators.PagesFromTitlesGenerator(self.titles, self.site) - gen = pagegenerators.RegexFilterPageGenerator(gen, ['Template', '/meta'], - quantifier='all') + gen = pagegenerators.RegexFilterPageGenerator( + gen, ['Template', '/meta'], quantifier='all') self.assertPagelistTitles(gen, ('Template:Template/Meta', )) gen = pagegenerators.PagesFromTitlesGenerator(self.titles, self.site) - gen = pagegenerators.RegexFilterPageGenerator(gen, ['template', '/meta'], - quantifier='any') + gen = pagegenerators.RegexFilterPageGenerator( + gen, ['template', '/meta'], quantifier='any') self.assertPagelistTitles(gen, ('Template:Template', 'Template:!/Meta', @@ -150,33 +149,33 @@ 'Template:Template/Meta')) gen = pagegenerators.PagesFromTitlesGenerator(self.titles, site=self.site) - gen = pagegenerators.RegexFilterPageGenerator(gen, ['template', '/meta'], - quantifier='any', - ignore_namespace=False) + gen = pagegenerators.RegexFilterPageGenerator( + gen, ['template', '/meta'], quantifier='any', + ignore_namespace=False) self.assertEqual(len(tuple(gen)), 6) gen = pagegenerators.PagesFromTitlesGenerator(self.titles, site=self.site) - gen = pagegenerators.RegexFilterPageGenerator(gen, ['template', '/meta'], - quantifier='all', - ignore_namespace=False) + gen = pagegenerators.RegexFilterPageGenerator( + gen, ['template', '/meta'], quantifier='all', + ignore_namespace=False) self.assertPagelistTitles(gen, ('Template:!/Meta', 'Template:Template/Meta')) gen = pagegenerators.PagesFromTitlesGenerator(self.titles, site=self.site) - gen = pagegenerators.RegexFilterPageGenerator(gen, ['template', '/meta'], - quantifier='none', - ignore_namespace=False) + gen = pagegenerators.RegexFilterPageGenerator( + gen, ['template', '/meta'], quantifier='none', + ignore_namespace=False) self.assertEqual(len(tuple(gen)), 7) def test_RegexBodyFilterPageGenerator(self): """Test RegexBodyFilterPageGenerator.""" - self.assertFunction("RegexBodyFilterPageGenerator") + self.assertFunction('RegexBodyFilterPageGenerator') gen = pagegenerators.PagesFromTitlesGenerator(self.titles, site=self.site) pages = [] for p in gen: - p.text = u"This is the content of %s as a sample" % p.title() + p.text = 'This is the content of {} as a sample'.format(p.title()) pages.append(p) gen = pagegenerators.RegexBodyFilterPageGenerator(iter(pages), '/doc') self.assertPagelistTitles(gen, @@ -195,7 +194,8 @@ family = 'wikisource' code = 'en' - base_title = 'Page:06-24-1920 -The Story of the Jones County Calf Case.pdf/%s' + base_title = ('Page:06-24-1920 -The Story of the Jones County Calf' + 'Case.pdf/%s') def setUp(self): """Setup tests.""" @@ -222,7 +222,8 @@ family = 'wikisource' code = 'en' - base_title = 'Page:06-24-1920 -The Story of the Jones County Calf Case.pdf/%s' + base_title = ('Page:06-24-1920 -The Story of the Jones County ' + 'Calf Case.pdf/%s') category_list = ['Category:Validated'] def setUp(self): @@ -230,13 +231,15 @@ super(TestCategoryFilterPageGenerator, self).setUp() self.site = self.get_site() self.titles = [self.base_title % i for i in range(1, 11)] - self.catfilter_list = [pywikibot.Category(self.site, cat) for cat in self.category_list] + self.catfilter_list = [pywikibot.Category( + self.site, cat) for cat in self.category_list] def test_CategoryFilterPageGenerator(self): """Test CategoryFilterPageGenerator.""" site = self.site gen = pagegenerators.PagesFromTitlesGenerator(self.titles, site) - gen = pagegenerators.CategoryFilterPageGenerator(gen, self.catfilter_list, site) + gen = pagegenerators.CategoryFilterPageGenerator( + gen, self.catfilter_list, site) self.assertEqual(len(tuple(gen)), 10) @@ -281,9 +284,9 @@ def test_first_edit(self): """Test first edit.""" expect = ( - u'The Addams Family (pinball)', - u'Talk:Nowy Sącz', - u'Template:Template', + 'The Addams Family (pinball)', + 'Talk:Nowy Sącz', + 'Template:Template', ) gen = PagesFromTitlesGenerator(self.titles, self.site) gen = pagegenerators.EdittimeFilterPageGenerator( @@ -361,7 +364,8 @@ def test_petscan(self): """Test PetScanPageGenerator.""" site = self.get_site() - gen = pagegenerators.PetScanPageGenerator(['Pywikibot Protect Test'], True, None, site) + gen = pagegenerators.PetScanPageGenerator(['Pywikibot Protect Test'], + True, None, site) try: self.assertPagelistTitles(gen, titles=( 'User:Sn1per/ProtectTest1', 'User:Sn1per/ProtectTest2'), @@ -369,14 +373,18 @@ except ServerError as e: self.skipTest(e) - gen = pagegenerators.PetScanPageGenerator(['Pywikibot Protect Test'], False, None, site) + gen = pagegenerators.PetScanPageGenerator(['Pywikibot Protect Test'], + False, None, site) self.assertPagelistTitles(gen, titles=('User:Sn1per/ProtectTest1', - 'User:Sn1per/ProtectTest2'), site=site) + 'User:Sn1per/ProtectTest2'), + site=site) - gen = pagegenerators.PetScanPageGenerator(['Pywikibot PetScan Test', - 'Pywikibot Category That Needs&ToBe!Encoded', - 'Test'], True, None, site) - self.assertPagelistTitles(gen, titles=('User:Sn1per/PetScanTest1',), site=site) + gen = pagegenerators.PetScanPageGenerator( + ['Pywikibot PetScan Test', + 'Pywikibot Category That Needs&ToBe!Encoded', + 'Test'], True, None, site) + self.assertPagelistTitles(gen, titles=('User:Sn1per/PetScanTest1',), + site=site) class TestRepeatingGenerator(RecentChangesTestCase): @@ -427,7 +435,8 @@ titles = list(pagegenerators.TextfilePageGenerator(filename, site)) self.assertEqual(len(titles), len(self.expected_titles)) expected_titles = [ - expected_title[self.title_columns[site.namespaces[page.namespace()].case]] + expected_title[self.title_columns[site.namespaces[page.namespace()] + .case]] for expected_title, page in zip(self.expected_titles, titles)] self.assertPageTitlesEqual(titles, expected_titles) @@ -438,7 +447,8 @@ titles = list(pagegenerators.TextfilePageGenerator(filename, site)) self.assertEqual(len(titles), len(self.expected_titles)) expected_titles = [ - expected_title[self.title_columns[site.namespaces[page.namespace()].case]] + expected_title[self.title_columns[site.namespaces[page.namespace()] + .case]] for expected_title, page in zip(self.expected_titles, titles)] self.assertPageTitlesEqual(titles, expected_titles) @@ -451,16 +461,19 @@ """Test YearPageGenerator.""" site = self.get_site() # Some languages are missing (T85681) - if (site.lang not in date.formats['YearBC']) or (site.lang not in date.formats['YearAD']): - raise unittest.SkipTest('Date formats for this language are missing from date.py') + if ((site.lang not in date.formats['YearBC']) or + (site.lang not in date.formats['YearAD'])): + raise unittest.SkipTest( + 'Date formats for this language are missing from date.py') start = -20 end = 2026 i = 0 for page in pagegenerators.YearPageGenerator(start, end, site): self.assertIsInstance(page, pywikibot.Page) - self.assertEqual(date.formatYear(site.lang, start + i), page.title()) - self.assertNotEqual(page.title(), "0") + self.assertEqual(date.formatYear(site.lang, start + i), + page.title()) + self.assertNotEqual(page.title(), '0') i += 1 if start + i == 0: i += 1 @@ -593,7 +606,8 @@ if not page.isTalkPage(): pages.extend([page.toggleTalkPage()]) - self.assertTrue(all(isinstance(page, pywikibot.Page) for page in pages_out)) + self.assertTrue(all(isinstance(page, + pywikibot.Page) for page in pages_out)) self.assertIn(mainpage, pages_out) self.assertIn(mainpage.toggleTalkPage(), pages_out) self.assertEqual(len(pages_out), 2) @@ -608,9 +622,11 @@ """Test TestPreloadingEntityGenerator with ReferringPageGenerator.""" site = self.get_site() instance_of_page = pywikibot.Page(site, 'Property:P31') - ref_gen = pagegenerators.ReferringPageGenerator(instance_of_page, total=5) + ref_gen = pagegenerators.ReferringPageGenerator(instance_of_page, + total=5) gen = pagegenerators.PreloadingEntityGenerator(ref_gen) - self.assertTrue(all(isinstance(item, pywikibot.ItemPage) for item in gen)) + self.assertTrue(all(isinstance(item, + pywikibot.ItemPage) for item in gen)) class DryFactoryGeneratorTest(TestCase): @@ -761,7 +777,7 @@ return pywikibot.Page(site, 'Q37470') def test_valid_qualifiers(self): - """Test ItemClaimFilterPageGenerator on sample page using valid qualifiers.""" + """Test ItemClaimFilterPageGenerator using valid qualifiers.""" qualifiers = { 'P580': pywikibot.WbTime(1950, 1, 1, precision=9, site=self.get_site()), @@ -771,7 +787,7 @@ True) def test_invalid_qualifiers(self): - """Test ItemClaimFilterPageGenerator on sample page using invalid qualifiers.""" + """Test ItemClaimFilterPageGenerator with invalid qualifiers.""" qualifiers = { 'P580': 1950, 'P582': pywikibot.WbTime(1960, 1, 1, precision=9, @@ -796,7 +812,7 @@ False) def test_no_qualifiers(self): - """Test ItemClaimFilterPageGenerator on sample page without qualifiers.""" + """Test ItemClaimFilterPageGenerator without qualifiers.""" self._simple_claim_test('P474', '+91', None, True) self._simple_claim_test('P463', 'Q37470', None, True) self._simple_claim_test('P625', '21,77', None, True) @@ -968,7 +984,7 @@ gf = pagegenerators.GeneratorFactory(site=self.site) gf.handleArg('-ns:1') gf.handleArg('-prefixindex:a') - gf.handleArg("-limit:10") + gf.handleArg('-limit:10') gen = gf.getCombinedGenerator() self.assertIsNotNone(gen) self.assertPagesInNamespaces(gen, 1) @@ -1043,7 +1059,7 @@ # Get by pageids. gf = pagegenerators.GeneratorFactory(site=self.get_site()) - gf.handleArg('-pageid:%s' % pageids) + gf.handleArg('-pageid:{}'.format(pageids)) gen = gf.getCombinedGenerator() self.assertIsNotNone(gen) pages_from_pageid = list(gen) @@ -1175,7 +1191,8 @@ """Test generator of pages with lint errors.""" if not self.site.has_extension('Linter'): raise unittest.SkipTest( - 'The site {0} does not use Linter extension'.format(self.site)) + 'The site {0} does not use Linter extension' + .format(self.site)) gf = pagegenerators.GeneratorFactory(site=self.site) gf.handleArg('-ns:1') gf.handleArg('-limit:3') @@ -1193,7 +1210,8 @@ """Test generator of pages with lint errors.""" if not self.site.has_extension('Linter'): raise unittest.SkipTest( - 'The site {0} does not use Linter extension'.format(self.site)) + 'The site {0} does not use Linter extension' + .format(self.site)) gf = pagegenerators.GeneratorFactory(site=self.site) self.assertRaises(ValueError, gf.handleArg, '-linter:dummy') @@ -1412,8 +1430,8 @@ """Test wrong logevents option.""" factory = pagegenerators.GeneratorFactory gf = factory() - self.assertFalse(gf.handleArg("-log")) - self.assertFalse(gf.handleArg("-log:text_here")) + self.assertFalse(gf.handleArg('-log')) + self.assertFalse(gf.handleArg('-log:text_here')) self.assertRaises(NotImplementedError, gf.handleArg, '-logevents:anyevent') # test that old format log option is not handled by any handler method. @@ -1530,8 +1548,8 @@ self.assertEqual(rcinfo['server_name'], site.hostname()) self.assertEqual(rcinfo['wiki'], site.dbName()) - for key in ["id", "type", "namespace", "title", "comment", "timestamp", - "user", "bot"]: + for key in ['id', 'type', 'namespace', 'title', 'comment', + 'timestamp', 'user', 'bot']: self.assertIn(key, rcinfo.keys()) diff --git a/tests/paraminfo_tests.py b/tests/paraminfo_tests.py index dff6d65..92e273d 100644 --- a/tests/paraminfo_tests.py +++ b/tests/paraminfo_tests.py @@ -83,7 +83,7 @@ if self.site.mw_version >= '1.24': types.append('unread') - known = types + ['!%s' % item for item in types] + known = types + ['!{}'.format(item) for item in types] self._check_param_subset(self.site, 'query+watchlist', 'show', known) diff --git a/tests/patrolbot_tests.py b/tests/patrolbot_tests.py index 1f9fca1..17be8a1 100644 --- a/tests/patrolbot_tests.py +++ b/tests/patrolbot_tests.py @@ -24,7 +24,8 @@ * [[User:Test_2]]: [[Page 2]], [[Page 4]], [[Page 6]] == Others == -* [[User:Prefixed]]: [[Special:PrefixIndex/Page 1]], [[Special:PREFIXINDEX/Page 2]] +* [[User:Prefixed]]: [[Special:PrefixIndex/Page 1]], + [[Special:PREFIXINDEX/Page 2]] == More test 1 == * [[User:Test_1]]: [[Page 3]] @@ -57,13 +58,16 @@ """Test the method which returns whether a page is in the list.""" # Return the title if there is an exact match self.assertEqual(self.bot.in_list(['Foo', 'Foobar'], 'Foo'), 'Foo') - self.assertEqual(self.bot.in_list(['Foo', 'Foobar'], 'Foobar'), 'Foobar') + self.assertEqual(self.bot.in_list(['Foo', 'Foobar'], 'Foobar'), + 'Foobar') # Return the first entry which starts with the title if there is no # exact match self.assertEqual(self.bot.in_list(['Foo', 'Foobar'], 'Foob'), 'Foo') - self.assertEqual(self.bot.in_list(['Foo', 'Foobar'], 'Foobarz'), 'Foo') - self.assertEqual(self.bot.in_list(['Foo', 'Foobar', 'Bar'], 'Barz'), 'Bar') + self.assertEqual(self.bot.in_list(['Foo', 'Foobar'], 'Foobarz'), + 'Foo') + self.assertEqual(self.bot.in_list(['Foo', 'Foobar', 'Bar'], 'Barz'), + 'Bar') # '' returns .* if there is no exact match self.assertEqual(self.bot.in_list([''], 'Foo'), '.*') diff --git a/tests/plural_tests.py b/tests/plural_tests.py index 8ec053d..f89ca8c 100644 --- a/tests/plural_tests.py +++ b/tests/plural_tests.py @@ -36,10 +36,11 @@ index = rule['plural'](num) self.assertLess(index, rule['nplurals'], msg='Plural for {0} created an index {1} ' - '(greater than {2})'.format(num, index, - rule['nplurals'])) + '(greater than {2})' + .format(num, index, rule['nplurals'])) num_plurals.add(index) - self.assertCountEqual(num_plurals, list(range(rule['nplurals']))) + self.assertCountEqual(num_plurals, + list(range(rule['nplurals']))) # Don't already fail on creation if callable(rule.get('plural')): diff --git a/tests/proofreadpage_tests.py b/tests/proofreadpage_tests.py index ff8fe3b..0f69c73 100644 --- a/tests/proofreadpage_tests.py +++ b/tests/proofreadpage_tests.py @@ -55,7 +55,8 @@ self._test_return_datatypes() -class TestLoadRevisionsCachingProofreadPage(BasePageLoadRevisionsCachingTestBase): +class TestLoadRevisionsCachingProofreadPage( + BasePageLoadRevisionsCachingTestBase): """Test site.loadrevisions() caching.""" @@ -143,11 +144,12 @@ 'index': 'Index:Popular Science Monthly Volume 1.djvu', 'ql': 4, 'user': 'T. Mazzei', - 'header': u"{{rh|2|''THE POPULAR SCIENCE MONTHLY.''}}", - 'footer': u'\n{{smallrefs}}', - 'url_image': ('https://upload.wikimedia.org/wikipedia/commons/thumb/a/ac/' - 'Popular_Science_Monthly_Volume_1.djvu/' - 'page12-1024px-Popular_Science_Monthly_Volume_1.djvu.jpg'), + 'header': "{{rh|2|''THE POPULAR SCIENCE MONTHLY.''}}", + 'footer': '\n{{smallrefs}}', + 'url_image': ('https://upload.wikimedia.org/wikipedia/commons/' + 'thumb/a/ac/Popular_Science_Monthly_Volume_1.djvu/' + 'page12-1024px-Popular_Science_Monthly_Volume_1.djvu' + '.jpg'), } valid_redlink = { @@ -200,7 +202,7 @@ self.assertEqual(page.title(), fixed_source.title()) def test_invalid_not_existing_page_source_wrong_ns(self): - """Test ProofreadPage from Page not existing in non-Page ns as source.""" + """Test ProofreadPage from Page not existing in non-Page ns.""" source = pywikibot.Page(self.site, self.not_existing_invalid['title1']) self.assertRaises(ValueError, ProofreadPage, source) @@ -242,7 +244,8 @@ # Fetch page text to instantiate page._full_header, in order to allow # for proper test result preparation. page.text - class_pagetext, div = self.class_pagetext_fmt[page._full_header._has_div] + class_pagetext, div = self.class_pagetext_fmt[ + page._full_header._has_div] self.assertEqual(page.text, self.fmt.format(user=self.site.username(), class_pagetext=class_pagetext, @@ -253,7 +256,8 @@ """Test ProofreadPage page decomposing/composing text.""" page = ProofreadPage(self.site, 'Page:dummy test page') page.text = '' - class_pagetext, div = self.class_pagetext_fmt[page._full_header._has_div] + class_pagetext, div = self.class_pagetext_fmt[ + page._full_header._has_div] self.assertEqual(page.text, self.fmt.format(user=self.site.username(), class_pagetext=class_pagetext, @@ -361,8 +365,10 @@ # Page without Index. page = ProofreadPage(self.site, self.existing_multilinked['title']) - index_page_1 = IndexPage(self.site, self.existing_multilinked['index_1']) - index_page_2 = IndexPage(self.site, self.existing_multilinked['index_2']) + index_page_1 = IndexPage(self.site, + self.existing_multilinked['index_1']) + index_page_2 = IndexPage(self.site, + self.existing_multilinked['index_2']) self.assertEqual(page.index, index_page_1) self.assertNotEqual(page.index, index_page_2) self.assertEqual(page._index, (index_page_1, [index_page_2])) @@ -610,7 +616,8 @@ page_set) # Error if label does not exists. - self.assertRaises(KeyError, index_page.get_page_from_label, 'dummy label') + self.assertRaises(KeyError, index_page.get_page_from_label, + 'dummy label') # Test get_page. for n in num_set: -- To view, visit https://gerrit.wikimedia.org/r/463372 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: I2afc60004d9b14460ef465b09a46d61cdd719fc3 Gerrit-Change-Number: 463372 Gerrit-PatchSet: 12 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] cleanup tests/[l10n_tests.py-oauth_tests.py]
by jenkins-bot (Code Review) 01 Oct '18

01 Oct '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463498 ) Change subject: [cleanup] cleanup tests/[l10n_tests.py-oauth_tests.py] ...................................................................... [cleanup] cleanup tests/[l10n_tests.py-oauth_tests.py] - use single quotes for string literals - remove preleading "u" fron strings - indentation to make sure code lines are less than 79 characters - use str.format(...) instead of modulo for type specifier arguments Change-Id: Iadc49eb171d0b4953958440be247fb4de624102b --- M tests/l10n_tests.py M tests/link_tests.py M tests/logentry_tests.py M tests/login_tests.py M tests/mediawikiversion_tests.py M tests/namespace_tests.py 6 files changed, 151 insertions(+), 135 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/l10n_tests.py b/tests/l10n_tests.py index 316a161..2e4f26d 100644 --- a/tests/l10n_tests.py +++ b/tests/l10n_tests.py @@ -44,8 +44,8 @@ if site.code == 'simple': raise unittest.SkipTest( "'simple' wiki has 'en' language code but " - "missing template. Must be solved by the " - "corresponding script.") + 'missing template. Must be solved by the ' + 'corresponding script.') # check whether template exists title = templates[0][0] page = pywikibot.Page(site, title, ns=10) @@ -60,8 +60,8 @@ # create test methods for package messages processed by unittest if not i18n.messages_available(): - raise unittest.SkipTest("i18n messages package '%s' not available." - % i18n._messages_package_name) + raise unittest.SkipTest("i18n messages package '{}' not available." + .format(i18n._messages_package_name)) site = pywikibot.Site(dct['code'], dct['family']) codes = site.family.languages_by_size @@ -70,7 +70,8 @@ keys = i18n.twget_keys(package) for code in codes: current_site = pywikibot.Site(code, dct['family']) - test_name = ("test_%s_%s" % (package, code)).replace('-', '_') + test_name = ('test_{}_{}' + .format(package, code)).replace('-', '_') cls.add_method( dct, test_name, test_method(current_site), doc_suffix='{0} and language {1}'.format( @@ -105,8 +106,8 @@ keys = i18n.twget_keys(package) for key in keys: self.assertIn(key, languages, - "'%s' - json key '%s' is not a site language" - % (package, key)) + "'{}' - json key '{}' is not a site language" + .format(package, key)) if __name__ == '__main__': # pragma: no cover diff --git a/tests/link_tests.py b/tests/link_tests.py index 1e7cc72..2e22a5b 100644 --- a/tests/link_tests.py +++ b/tests/link_tests.py @@ -76,21 +76,28 @@ self.assertEqual(Link('~', self.get_site()).title, '~') self.assertEqual(Link('"', self.get_site()).title, '"') self.assertEqual(Link('\'', self.get_site()).title, '\'') - self.assertEqual(Link('Talk:Sandbox', self.get_site()).title, 'Sandbox') - self.assertEqual(Link('Talk:Foo:Sandbox', self.get_site()).title, 'Foo:Sandbox') - self.assertEqual(Link('File:Example.svg', self.get_site()).title, 'Example.svg') - self.assertEqual(Link('File_talk:Example.svg', self.get_site()).title, 'Example.svg') - self.assertEqual(Link('Foo/.../Sandbox', self.get_site()).title, 'Foo/.../Sandbox') - self.assertEqual(Link('Sandbox/...', self.get_site()).title, 'Sandbox/...') + self.assertEqual(Link('Talk:Sandbox', self.get_site()).title, + 'Sandbox') + self.assertEqual(Link('Talk:Foo:Sandbox', self.get_site()).title, + 'Foo:Sandbox') + self.assertEqual(Link('File:Example.svg', self.get_site()).title, + 'Example.svg') + self.assertEqual(Link('File_talk:Example.svg', self.get_site()).title, + 'Example.svg') + self.assertEqual(Link('Foo/.../Sandbox', self.get_site()).title, + 'Foo/.../Sandbox') + self.assertEqual(Link('Sandbox/...', self.get_site()).title, + 'Sandbox/...') self.assertEqual(Link('A~~', self.get_site()).title, 'A~~') self.assertEqual(Link(':A', self.get_site()).title, 'A') # Length is 256 total, but only title part matters - self.assertEqual(Link('Category:' + 'X' * 248, self.get_site()).title, 'X' * 248) + self.assertEqual(Link('Category:' + 'X' * 248, self.get_site()).title, + 'X' * 248) self.assertEqual(Link('X' * 252, self.get_site()).title, 'X' * 252) self.assertEqual(Link('A%20B', self.get_site()).title, 'A B') - self.assertEqual(Link('A é B', self.get_site()).title, u'A é B') - self.assertEqual(Link('A é B', self.get_site()).title, u'A é B') - self.assertEqual(Link('A é B', self.get_site()).title, u'A é B') + self.assertEqual(Link('A é B', self.get_site()).title, 'A é B') + self.assertEqual(Link('A é B', self.get_site()).title, 'A é B') + self.assertEqual(Link('A é B', self.get_site()).title, 'A é B') self.assertEqual(Link('A   B', self.get_site()).title, 'A B') self.assertEqual(Link('A   B', self.get_site()).title, 'A B') @@ -119,9 +126,8 @@ # Bad characters forbidden regardless of wgLegalTitleChars def generate_contains_illegal_chars_exc_regex(text): exc_regex = ( - r'^(u|)\'%s\' contains illegal char$s$ (u|)\'%s\'$' % ( - re.escape(text), re.escape(text[2]) - )) + r'^(u|)\'{}\' contains illegal char$s$ (u|)\'{}\'$' + .format(re.escape(text), re.escape(text[2]))) return exc_regex texts_to_test = ['A [ B', 'A ] B', 'A { B', 'A } B', 'A < B', 'A > B'] @@ -149,10 +155,8 @@ # Directory navigation def generate_contains_dot_combinations_exc_regex(text): - exc_regex = ( - r'^$contains \. / combinations$: (u|)\'%s\'$' % re.escape( - text) - ) + exc_regex = (r'^$contains \. / combinations$: (u|)\'{}\'$' + .format(re.escape(text))) return exc_regex texts_to_test = ['.', '..', './Sandbox', '../Sandbox', 'Foo/./Sandbox', @@ -192,7 +196,7 @@ # Namespace prefix without actual title def generate_has_no_title_exc_regex(text): - exc_regex = r'^(u|)\'%s\' has no title\.$' % re.escape(text) + exc_regex = r'^(u|)\'{}\' has no title\.$'.format(re.escape(text)) return exc_regex texts_to_test = ['Talk:', 'Category: ', 'Category: #bar'] @@ -831,7 +835,7 @@ self.assertEqual(link.namespace, 4) def test_fully_qualified_NS1_code(self): - """Test 'en:wikipedia:Talk:Main Page' on wikidata is not namespace 1.""" + """Test 'en:wikipedia:Talk:Main Page' on wikidata isn't namespace 1.""" config.mylang = 'wikidata' config.family = 'wikidata' link = Link('en:wikipedia:Talk:Main Page') @@ -984,7 +988,8 @@ """Test that Link doesn't allow empty.""" link = Link('', self.get_site()) self.assertRaisesRegex( - InvalidTitle, "The link does not contain a page title", link.parse) + InvalidTitle, 'The link does not contain a page title', + link.parse) def test_namespace_lookalike(self): """Test that Link does only detect valid namespaces.""" diff --git a/tests/logentry_tests.py b/tests/logentry_tests.py index b163211..264a305 100644 --- a/tests/logentry_tests.py +++ b/tests/logentry_tests.py @@ -30,10 +30,11 @@ """ Base class for log entry tests. - It uses the German Wikipedia for a current representation of the log entries - and the test Wikipedia for the future representation. It also tests on a - wiki with MW 1.19 or older to check that it can still read the older format. - It currently uses lyricwiki which as of this commit uses 1.19.24. + It uses the German Wikipedia for a current representation of the + log entries and the test Wikipedia for the future representation. + It also tests on a wiki with MW 1.19 or older to check that it can + still read the older format. It currently uses lyricwiki which as of + this commit uses 1.19.24. """ sites = { @@ -123,7 +124,7 @@ # create test methods for the support logtype classes for logtype in LogEntryFactory._logtypes: - cls.add_method(dct, 'test_%sEntry' % logtype.title(), + cls.add_method(dct, 'test_{}Entry'.format(logtype.title()), test_method(logtype)) return super(TestLogentriesMeta, cls).__new__(cls, name, bases, dct) @@ -144,8 +145,8 @@ def test_simple_entries(self, key): """Test those entries which don't have an extra LogEntry subclass.""" # Unfortunately it's not possible to use the metaclass to create a - # bunch of test methods for this too as the site instances haven't been - # initialized yet. + # bunch of test methods for this too as the site instances haven't + # been initialized yet. for simple_type in (self.site.logtypes - set(LogEntryFactory._logtypes)): if not simple_type: @@ -172,10 +173,13 @@ # Check that there are no empty strings self.assertTrue(all(logentry.flags())) if logentry.expiry() is not None: - self.assertIsInstance(logentry.expiry(), pywikibot.Timestamp) - self.assertIsInstance(logentry.duration(), datetime.timedelta) - self.assertEqual(logentry.timestamp() + logentry.duration(), - logentry.expiry()) + self.assertIsInstance(logentry.expiry(), + pywikibot.Timestamp) + self.assertIsInstance(logentry.duration(), + datetime.timedelta) + self.assertEqual( + logentry.timestamp() + logentry.duration(), + logentry.expiry()) else: self.assertIsNone(logentry.duration()) break @@ -305,8 +309,8 @@ with self.assertRaises(pywikibot.NoPage): self.get_mainpage(site).getMovedTarget() - self.assertOneDeprecationParts('pywikibot.page.BasePage.getMovedTarget', - 'moved_target()') + self.assertOneDeprecationParts( + 'pywikibot.page.BasePage.getMovedTarget', 'moved_target()') def test_moved_target_fail_de(self): """Test getMovedTarget method failing on de-wiki.""" @@ -314,8 +318,8 @@ with self.assertRaises(pywikibot.NoPage): page.getMovedTarget() - self.assertOneDeprecationParts('pywikibot.page.BasePage.getMovedTarget', - 'moved_target()') + self.assertOneDeprecationParts( + 'pywikibot.page.BasePage.getMovedTarget', 'moved_target()') if __name__ == '__main__': # pragma: no cover diff --git a/tests/login_tests.py b/tests/login_tests.py index d46f1b9..1eb85b4 100644 --- a/tests/login_tests.py +++ b/tests/login_tests.py @@ -27,17 +27,17 @@ class FakeFamily(object): """Mock.""" - name = "~FakeFamily" + name = '~FakeFamily' class FakeSite(object): """Mock.""" - code = "~FakeCode" + code = '~FakeCode' family = FakeFamily -FakeUsername = "~FakeUsername" +FakeUsername = '~FakeUsername' class FakeConfig(object): @@ -47,8 +47,8 @@ usernames[FakeFamily.name] = {FakeSite.code: FakeUsername} -(a)mock.patch("pywikibot.Site", FakeSite) -(a)mock.patch("pywikibot.login.config", FakeConfig) +(a)mock.patch('pywikibot.Site', FakeSite) +(a)mock.patch('pywikibot.login.config', FakeConfig) class TestOfflineLoginManager(DefaultDrySiteTestCase): """Test offline operation of login.LoginManager.""" @@ -82,7 +82,7 @@ self.assertEqual(lm.username, FakeUsername) -(a)mock.patch("pywikibot.Site", FakeSite) +(a)mock.patch('pywikibot.Site', FakeSite) class TestPasswordFile(DefaultDrySiteTestCase): """Test parsing password files.""" @@ -95,18 +95,18 @@ def setUp(self): """Patch a variety of dependencies.""" super(TestPasswordFile, self).setUp() - self.config = self.patch("pywikibot.login.config") + self.config = self.patch('pywikibot.login.config') self.config.usernames = FakeConfig.usernames - self.config.password_file = "~FakeFile" + self.config.password_file = '~FakeFile' self.config.private_files_permission = 0o600 - self.config.base_dir = "" # ensure that no path modifies password_file + self.config.base_dir = '' # ensure that no path modifies password_file - self.stat = self.patch("os.stat") + self.stat = self.patch('os.stat') self.stat.return_value.st_mode = 0o100600 - self.chmod = self.patch("os.chmod") + self.chmod = self.patch('os.chmod') - self.open = self.patch("codecs.open") + self.open = self.patch('codecs.open') self.open.return_value = StringIO() def test_auto_chmod_OK(self): @@ -142,43 +142,43 @@ """Test global username/password declaration.""" self._test_pwfile(""" ('~FakeUsername', '~FakePassword') - """, "~FakePassword") + """, '~FakePassword') def test_match_family_username(self): """Test matching by family.""" self._test_pwfile(""" ('~FakeFamily', '~FakeUsername', '~FakePassword') - """, "~FakePassword") + """, '~FakePassword') def test_match_code_username(self): """Test matching by full configuration.""" self._test_pwfile(""" ('~FakeCode', '~FakeFamily', '~FakeUsername', '~FakePassword') - """, "~FakePassword") + """, '~FakePassword') def test_ordering(self): """Test that the last matching password is selected.""" self._test_pwfile(""" ('~FakeCode', '~FakeFamily', '~FakeUsername', '~FakePasswordA') ('~FakeUsername', '~FakePasswordB') - """, "~FakePasswordB") + """, '~FakePasswordB') self._test_pwfile(""" ('~FakeUsername', '~FakePasswordA') ('~FakeCode', '~FakeFamily', '~FakeUsername', '~FakePasswordB') - """, "~FakePasswordB") + """, '~FakePasswordB') def test_BotPassword(self): """Test BotPassword entries. - When a BotPassword is used, the login_name changes to contain a suffix, - while the password is read from an object (instead of being read from - the password file directly). + When a BotPassword is used, the login_name changes to contain a + suffix, while the password is read from an object (instead of being + read from the password file directly). """ obj = self._test_pwfile(""" ('~FakeUsername', BotPassword('~FakeSuffix', '~FakePassword')) """, '~FakePassword') - self.assertEqual(obj.login_name, "~FakeUsername@~FakeSuffix") + self.assertEqual(obj.login_name, '~FakeUsername@~FakeSuffix') if __name__ == '__main__': # pragma: no cover diff --git a/tests/mediawikiversion_tests.py b/tests/mediawikiversion_tests.py index 1d8cecc..495e5ba 100644 --- a/tests/mediawikiversion_tests.py +++ b/tests/mediawikiversion_tests.py @@ -74,9 +74,12 @@ def test_invalid_versions(self): """Verify that insufficient version fail creating.""" - self.assertRaisesRegex(ValueError, self.INVALID_VERSION_RE, MediaWikiVersion, 'invalid') - self.assertRaisesRegex(ValueError, self.INVALID_VERSION_RE, MediaWikiVersion, '1number') - self.assertRaisesRegex(ValueError, self.INVALID_VERSION_RE, MediaWikiVersion, '1.missing') + self.assertRaisesRegex(ValueError, self.INVALID_VERSION_RE, + MediaWikiVersion, 'invalid') + self.assertRaisesRegex(ValueError, self.INVALID_VERSION_RE, + MediaWikiVersion, '1number') + self.assertRaisesRegex(ValueError, self.INVALID_VERSION_RE, + MediaWikiVersion, '1.missing') self.assertRaisesRegex(AssertionError, 'Found \"wmf\" in \"wmf-1\"', MediaWikiVersion, '1.23wmf-1') @@ -86,7 +89,8 @@ self.assertEqual(MediaWikiVersion.from_generator('MediaWiki 1.2.3'), self._make('1.2.3')) self.assertRaisesRegex(ValueError, self.GENERATOR_STRING_RE, - MediaWikiVersion.from_generator, 'Invalid 1.2.3') + MediaWikiVersion.from_generator, + 'Invalid 1.2.3') if __name__ == '__main__': # pragma: no cover diff --git a/tests/namespace_tests.py b/tests/namespace_tests.py index 11904e9..ae870f0 100644 --- a/tests/namespace_tests.py +++ b/tests/namespace_tests.py @@ -46,7 +46,8 @@ file_builtin_ns = dict(_base_builtin_ns) file_builtin_ns['File'] = 6 file_builtin_ns['File talk'] = 7 -builtin_ns = dict(list(image_builtin_ns.items()) + list(file_builtin_ns.items())) +builtin_ns = dict(list(image_builtin_ns.items()) + + list(file_builtin_ns.items())) def builtin_NamespacesDict(): @@ -80,37 +81,37 @@ def testNamespaceConstructor(self): """Test Namespace constructor.""" - kwargs = {u'case': u'first-letter'} - y = Namespace(id=6, custom_name=u'dummy', canonical_name=u'File', - aliases=[u'Image', u'Immagine'], **kwargs) + kwargs = {'case': 'first-letter'} + y = Namespace(id=6, custom_name='dummy', canonical_name='File', + aliases=['Image', 'Immagine'], **kwargs) self.assertEqual(y.id, 6) - self.assertEqual(y.custom_name, u'dummy') - self.assertEqual(y.canonical_name, u'File') + self.assertEqual(y.custom_name, 'dummy') + self.assertEqual(y.canonical_name, 'File') - self.assertNotEqual(y.custom_name, u'Dummy') - self.assertNotEqual(y.canonical_name, u'file') + self.assertNotEqual(y.custom_name, 'Dummy') + self.assertNotEqual(y.canonical_name, 'file') - self.assertIn(u'Image', y.aliases) - self.assertIn(u'Immagine', y.aliases) + self.assertIn('Image', y.aliases) + self.assertIn('Immagine', y.aliases) self.assertEqual(len(y), 4) - self.assertEqual(list(y), ['dummy', u'File', u'Image', u'Immagine']) - self.assertEqual(y.case, u'first-letter') + self.assertEqual(list(y), ['dummy', 'File', 'Image', 'Immagine']) + self.assertEqual(y.case, 'first-letter') def testNamespaceNameCase(self): """Namespace names are always case-insensitive.""" - kwargs = {u'case': u'first-letter'} - y = Namespace(id=6, custom_name=u'dummy', canonical_name=u'File', - aliases=[u'Image', u'Immagine'], **kwargs) - self.assertIn(u'dummy', y) - self.assertIn(u'Dummy', y) - self.assertIn(u'file', y) - self.assertIn(u'File', y) - self.assertIn(u'image', y) - self.assertIn(u'Image', y) - self.assertIn(u'immagine', y) - self.assertIn(u'Immagine', y) + kwargs = {'case': 'first-letter'} + y = Namespace(id=6, custom_name='dummy', canonical_name='File', + aliases=['Image', 'Immagine'], **kwargs) + self.assertIn('dummy', y) + self.assertIn('Dummy', y) + self.assertIn('file', y) + self.assertIn('File', y) + self.assertIn('image', y) + self.assertIn('Image', y) + self.assertIn('immagine', y) + self.assertIn('Immagine', y) def testNamespaceToString(self): """Test Namespace __str__ and __unicode__.""" @@ -120,19 +121,19 @@ self.assertEqual(str(ns[1]), 'Talk:') self.assertEqual(str(ns[6]), ':File:') - self.assertEqual(unicode(ns[0]), u':') - self.assertEqual(unicode(ns[1]), u'Talk:') - self.assertEqual(unicode(ns[6]), u':File:') + self.assertEqual(unicode(ns[0]), ':') + self.assertEqual(unicode(ns[1]), 'Talk:') + self.assertEqual(unicode(ns[6]), ':File:') - kwargs = {u'case': u'first-letter'} - y = Namespace(id=6, custom_name=u'ملف', canonical_name=u'File', - aliases=[u'Image', u'Immagine'], **kwargs) + kwargs = {'case': 'first-letter'} + y = Namespace(id=6, custom_name='ملف', canonical_name='File', + aliases=['Image', 'Immagine'], **kwargs) self.assertEqual(str(y), ':File:') if PY2: - self.assertEqual(unicode(y), u':ملف:') + self.assertEqual(unicode(y), ':ملف:') self.assertEqual(y.canonical_prefix(), ':File:') - self.assertEqual(y.custom_prefix(), u':ملف:') + self.assertEqual(y.custom_prefix(), ':ملف:') def testNamespaceCompare(self): """Test Namespace comparisons.""" @@ -146,12 +147,12 @@ self.assertGreater(a, -1) - x = Namespace(id=6, custom_name=u'dummy', canonical_name=u'File', - aliases=[u'Image', u'Immagine']) - y = Namespace(id=6, custom_name=u'ملف', canonical_name=u'File', - aliases=[u'Image', u'Immagine']) - z = Namespace(id=7, custom_name=u'dummy 7', canonical_name=u'File', - aliases=[u'Image', u'Immagine']) + x = Namespace(id=6, custom_name='dummy', canonical_name='File', + aliases=['Image', 'Immagine']) + y = Namespace(id=6, custom_name='ملف', canonical_name='File', + aliases=['Image', 'Immagine']) + z = Namespace(id=7, custom_name='dummy 7', canonical_name='File', + aliases=['Image', 'Immagine']) self.assertEqual(x, x) self.assertEqual(x, y) @@ -159,20 +160,20 @@ self.assertNotEqual(x, z) self.assertEqual(x, 6) - self.assertEqual(x, u'dummy') - self.assertEqual(x, u'Dummy') - self.assertEqual(x, u'file') - self.assertEqual(x, u'File') - self.assertEqual(x, u':File') - self.assertEqual(x, u':File:') - self.assertEqual(x, u'File:') - self.assertEqual(x, u'image') - self.assertEqual(x, u'Image') + self.assertEqual(x, 'dummy') + self.assertEqual(x, 'Dummy') + self.assertEqual(x, 'file') + self.assertEqual(x, 'File') + self.assertEqual(x, ':File') + self.assertEqual(x, ':File:') + self.assertEqual(x, 'File:') + self.assertEqual(x, 'image') + self.assertEqual(x, 'Image') self.assertFalse(x < 6) self.assertFalse(x > 6) - self.assertEqual(y, u'ملف') + self.assertEqual(y, 'ملف') self.assertLess(a, x) self.assertLess(x, z) @@ -188,40 +189,41 @@ def testNamespaceNormalizeName(self): """Test Namespace.normalize_name.""" - self.assertEqual(Namespace.normalize_name(u'File'), u'File') - self.assertEqual(Namespace.normalize_name(u':File'), u'File') - self.assertEqual(Namespace.normalize_name(u'File:'), u'File') - self.assertEqual(Namespace.normalize_name(u':File:'), u'File') + self.assertEqual(Namespace.normalize_name('File'), 'File') + self.assertEqual(Namespace.normalize_name(':File'), 'File') + self.assertEqual(Namespace.normalize_name('File:'), 'File') + self.assertEqual(Namespace.normalize_name(':File:'), 'File') - self.assertEqual(Namespace.normalize_name(u''), u'') + self.assertEqual(Namespace.normalize_name(''), '') - self.assertEqual(Namespace.normalize_name(u':'), False) - self.assertEqual(Namespace.normalize_name(u'::'), False) - self.assertEqual(Namespace.normalize_name(u':::'), False) - self.assertEqual(Namespace.normalize_name(u':File::'), False) - self.assertEqual(Namespace.normalize_name(u'::File:'), False) - self.assertEqual(Namespace.normalize_name(u'::File::'), False) + self.assertEqual(Namespace.normalize_name(':'), False) + self.assertEqual(Namespace.normalize_name('::'), False) + self.assertEqual(Namespace.normalize_name(':::'), False) + self.assertEqual(Namespace.normalize_name(':File::'), False) + self.assertEqual(Namespace.normalize_name('::File:'), False) + self.assertEqual(Namespace.normalize_name('::File::'), False) def test_repr(self): """Test Namespace.__repr__.""" - a = Namespace(id=0, canonical_name=u'Foo') + a = Namespace(id=0, canonical_name='Foo') s = repr(a) - r = "Namespace(id=0, custom_name=%r, canonical_name=%r, aliases=[])" \ - % (unicode('Foo'), unicode('Foo')) + r = 'Namespace(id=0, custom_name={!r}, canonical_name={!r}, ' \ + 'aliases=[])'.format(unicode('Foo'), unicode('Foo')) self.assertEqual(s, r) a.defaultcontentmodel = 'bar' s = repr(a) - r = ('Namespace(id=0, custom_name=%r, canonical_name=%r, aliases=[], ' - 'defaultcontentmodel=%r)' % - (unicode('Foo'), unicode('Foo'), unicode('bar'))) + r = ('Namespace(id=0, custom_name={!r}, canonical_name={!r}, ' + 'aliases=[], defaultcontentmodel={!r})' + .format(unicode('Foo'), unicode('Foo'), unicode('bar'))) self.assertEqual(s, r) a.case = 'upper' s = repr(a) - r = ('Namespace(id=0, custom_name=%r, canonical_name=%r, aliases=[], ' - 'case=%r, defaultcontentmodel=%r)' % - (unicode('Foo'), unicode('Foo'), unicode('upper'), unicode('bar'))) + r = ('Namespace(id=0, custom_name={!r}, canonical_name={!r}, ' + 'aliases=[], case={!r}, defaultcontentmodel={!r})' + .format(unicode('Foo'), unicode('Foo'), unicode('upper'), + unicode('bar'))) self.assertEqual(s, r) b = eval(repr(a)) @@ -236,7 +238,7 @@ r'identifiers contains inappropriate types: (.*?)' ) INTARGNOTSTRINGORNUMBER_RE = ( - r"int argument must be a string(, a bytes-like object)? " + r'int argument must be a string(, a bytes-like object)? ' r"or a number, not '(.*?)'" ) NAMESPACEIDNOTRECOGNISED_RE = ( -- To view, visit https://gerrit.wikimedia.org/r/463498 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: Iadc49eb171d0b4953958440be247fb4de624102b Gerrit-Change-Number: 463498 Gerrit-PatchSet: 6 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] cleanup tests/[data_ingestion_tests.py-exceptions_tests.py]
by jenkins-bot (Code Review) 01 Oct '18

01 Oct '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463604 ) Change subject: [cleanup] cleanup tests/[data_ingestion_tests.py-exceptions_tests.py] ...................................................................... [cleanup] cleanup tests/[data_ingestion_tests.py-exceptions_tests.py] - use single quotes for string literals - remove preleading "u" fron strings - indentation to make sure code lines are less than 79 characters - use str.format(...) instead of modulo for type specifier arguments Bug: T89589 Change-Id: I5b4240872fe4503f091e6889ae947f47e17da1cd --- 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/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 10 files changed, 221 insertions(+), 163 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/data_ingestion_tests.py b/tests/data_ingestion_tests.py index dbce145..f9e026e 100644 --- a/tests/data_ingestion_tests.py +++ b/tests/data_ingestion_tests.py @@ -31,10 +31,14 @@ def setUp(self): """Set up unit test.""" super(TestPhoto, self).setUp() + url = ('http://upload.wikimedia.org/wikipedia/commons/f/' + 'fc/MP_sounds.png') + + meta_url = 'http://commons.wikimedia.org/wiki/File:Sound-icon.svg' self.obj = data_ingestion.Photo( - URL='http://upload.wikimedia.org/wikipedia/commons/f/fc/MP_sounds.png', + URL=url, metadata={'description.en': '"Sounds" icon', - 'source': 'http://commons.wikimedia.org/wiki/File:Sound-icon.svg', + 'source': meta_url, 'author': 'KDE artists | Silstor', 'license': 'LGPL', 'set': 'Crystal SVG icon set', @@ -49,7 +53,8 @@ def test_findDuplicateImages(self): """Test finding duplicates on Wikimedia Commons.""" duplicates = self.obj.findDuplicateImages() - self.assertIn('MP sounds.png', [dup.replace("_", " ") for dup in duplicates]) + self.assertIn('MP sounds.png', + [dup.replace('_', ' ') for dup in duplicates]) def test_getTitle(self): """Test getTitle().""" @@ -86,8 +91,9 @@ def test_PhotoURL(self): """Test PhotoURL().""" - self.assertEqual(self.obj.URL, - 'http://upload.wikimedia.org/wikipedia/commons/f/fc/MP_sounds.png') + self.assertEqual( + self.obj.URL, + 'http://upload.wikimedia.org/wikipedia/commons/f/fc/MP_sounds.png') def test_getTitle(self): """Test getTitle().""" diff --git a/tests/date_tests.py b/tests/date_tests.py index 80abd68..5308049 100644 --- a/tests/date_tests.py +++ b/tests/date_tests.py @@ -37,15 +37,15 @@ for value in range(start, stop, step): self.assertTrue( predicate(value), - "date.formats['%s']['%s']:\ninvalid value %d" - % (formatname, code, value)) + "date.formats['{}']['{}']:\ninvalid value {}" + .format(formatname, code, value)) new_value = convert(convert(value)) self.assertEqual( new_value, value, - "date.formats['%s']['%s']:\n" - "value %d does not match %s" - % (formatname, code, new_value, value)) + "date.formats['{}']['{}']:\n" + 'value {} does not match {}' + .format(formatname, code, new_value, value)) return testMapEntry for formatname in date.formats: @@ -73,26 +73,38 @@ def test_apply_positive_delta(self): """Test adding months to a date.""" - self.assertEqual(datetime(2012, 3, 10), date.apply_month_delta(datetime(2012, 1, 10), 2)) - self.assertEqual(datetime(2012, 3, 31), date.apply_month_delta(datetime(2012, 1, 31), 2)) - self.assertEqual(datetime(2012, 2, 29), date.apply_month_delta(datetime(2012, 1, 31))) - self.assertEqual(datetime(2012, 3, 2), date.apply_month_delta(datetime(2012, 1, 31), + self.assertEqual(datetime(2012, 3, 10), + date.apply_month_delta(datetime(2012, 1, 10), 2)) + self.assertEqual(datetime(2012, 3, 31), + date.apply_month_delta(datetime(2012, 1, 31), 2)) + self.assertEqual(datetime(2012, 2, 29), + date.apply_month_delta(datetime(2012, 1, 31))) + self.assertEqual(datetime(2012, 3, 2), + date.apply_month_delta(datetime(2012, 1, 31), add_overlap=True)) def test_apply_negative_delta(self): """Test adding months to a date.""" - self.assertEqual(datetime(2012, 1, 10), date.apply_month_delta(datetime(2012, 3, 10), -2)) - self.assertEqual(datetime(2012, 1, 31), date.apply_month_delta(datetime(2012, 3, 31), -2)) - self.assertEqual(datetime(2012, 2, 29), date.apply_month_delta(datetime(2012, 3, 31), -1)) - self.assertEqual(datetime(2012, 3, 2), date.apply_month_delta(datetime(2012, 3, 31), -1, + self.assertEqual(datetime(2012, 1, 10), + date.apply_month_delta(datetime(2012, 3, 10), -2)) + self.assertEqual(datetime(2012, 1, 31), + date.apply_month_delta(datetime(2012, 3, 31), -2)) + self.assertEqual(datetime(2012, 2, 29), + date.apply_month_delta(datetime(2012, 3, 31), -1)) + self.assertEqual(datetime(2012, 3, 2), + date.apply_month_delta(datetime(2012, 3, 31), -1, add_overlap=True)) def test_get_delta(self): """Test that the delta is calculated correctly.""" - self.assertEqual(date.get_month_delta(datetime(2012, 1, 31), datetime(2012, 3, 31)), 2) - self.assertEqual(date.get_month_delta(datetime(2012, 3, 31), datetime(2012, 1, 31)), -2) - self.assertEqual(date.get_month_delta(datetime(2012, 3, 31), datetime(2013, 1, 31)), 10) - self.assertEqual(date.get_month_delta(datetime(2014, 3, 31), datetime(2013, 3, 31)), -12) + self.assertEqual(date.get_month_delta(datetime(2012, 1, 31), + datetime(2012, 3, 31)), 2) + self.assertEqual(date.get_month_delta(datetime(2012, 3, 31), + datetime(2012, 1, 31)), -2) + self.assertEqual(date.get_month_delta(datetime(2012, 3, 31), + datetime(2013, 1, 31)), 10) + self.assertEqual(date.get_month_delta(datetime(2014, 3, 31), + datetime(2013, 3, 31)), -12) if __name__ == '__main__': # pragma: no cover diff --git a/tests/deletionbot_tests.py b/tests/deletionbot_tests.py index 6fcd981..b7d991f 100644 --- a/tests/deletionbot_tests.py +++ b/tests/deletionbot_tests.py @@ -62,7 +62,7 @@ """Test marking User:Unicodesnowman/DeleteMark for deletion.""" site = self.get_site() if site.username(sysop=True): - raise unittest.SkipTest('can\'t test mark with sysop account') + raise unittest.SkipTest("can't test mark with sysop account") p1 = pywikibot.Page(site, 'User:Unicodesnowman/DeleteMark') if not p1.exists(): diff --git a/tests/deprecation_tests.py b/tests/deprecation_tests.py index 569f233c..9fb91e9 100644 --- a/tests/deprecation_tests.py +++ b/tests/deprecation_tests.py @@ -307,11 +307,11 @@ (deprecated_func, 'Deprecated.\n\nDeprecated function.'), (deprecated_func_docstring, 'DEPRECATED. Deprecated function.'), (deprecated_func2, 'Deprecated.\n\nDeprecated function.'), - (deprecated_func2_docstring, 'DEPRECATED, don\'t use this. ' + (deprecated_func2_docstring, "DEPRECATED, don't use this. " 'Deprecated function.'), (deprecated_func_instead, 'Deprecated; use baz instead.\n\n' 'Deprecated function.'), - (deprecated_func_instead_docstring, 'DEPRECATED, don\'t use ' + (deprecated_func_instead_docstring, "DEPRECATED, don't use " 'this. Deprecated function.'), (deprecated_func_docstring_arg, 'Deprecated.\n\n' '@param foo: Foo. DEPRECATED.'), @@ -449,9 +449,8 @@ self.assertRaisesRegex( TypeError, - r"deprecated_func_arg2? got multiple values for (keyword )?argument 'foo'", - func, - 'a', bah='b' + r'deprecated_func_arg2? got multiple values for ' + "(keyword )?argument 'foo'", func, 'a', bah='b' ) self._reset_messages() @@ -493,36 +492,36 @@ rv = deprecated_all(foo=42) self.assertEqual(rv, None) self.assertDeprecation( - "The trailing arguments ('foo', 'bar') of %s.deprecated_all are " + "The trailing arguments ('foo', 'bar') of {}.deprecated_all are " "deprecated. The value(s) provided for 'foo' have been " - "dropped." % __name__) + 'dropped.'.format(__name__)) self._reset_messages() rv = deprecated_all(42) self.assertEqual(rv, None) self.assertDeprecation( - "The trailing arguments ('foo', 'bar') of %s.deprecated_all are " + "The trailing arguments ('foo', 'bar') of {}.deprecated_all are " "deprecated. The value(s) provided for 'foo' have been " - "dropped." % __name__) + 'dropped.'.format(__name__)) self._reset_messages() rv = deprecated_all(foo=42, bar=47) self.assertEqual(rv, None) self.assertDeprecation( - "The trailing arguments ('foo', 'bar') of %s.deprecated_all are " + "The trailing arguments ('foo', 'bar') of {}.deprecated_all are " "deprecated. The value(s) provided for 'foo', 'bar' have been " - "dropped." % __name__) + 'dropped.'.format(__name__)) self._reset_messages() rv = deprecated_all(42, 47) self.assertEqual(rv, None) self.assertDeprecation( - "The trailing arguments ('foo', 'bar') of %s.deprecated_all are " + "The trailing arguments ('foo', 'bar') of {}.deprecated_all are " "deprecated. The value(s) provided for 'foo', 'bar' have been " - "dropped." % __name__) + 'dropped.'.format(__name__)) self._reset_messages() @@ -537,9 +536,9 @@ rv = deprecated_all2(42, bar=47) self.assertEqual(rv, 42) self.assertDeprecation( - "The trailing arguments ('bar') of %s.deprecated_all2 are " + "The trailing arguments ('bar') of {}.deprecated_all2 are " "deprecated. The value(s) provided for 'bar' have been " - "dropped." % __name__) + 'dropped.'.format(__name__)) self._reset_messages() @@ -555,8 +554,9 @@ self.assertEqual(rv, None) self.assertDeprecation( "The trailing arguments ('foo', 'bar') of " - "%s.DeprecatedMethodClass.deprecated_all are deprecated. " - "The value(s) provided for 'foo' have been dropped." % __name__) + '{}.DeprecatedMethodClass.deprecated_all are deprecated. ' + "The value(s) provided for 'foo' have been dropped." + .format(__name__)) self._reset_messages() @@ -564,8 +564,9 @@ self.assertEqual(rv, None) self.assertDeprecation( "The trailing arguments ('foo', 'bar') of " - "%s.DeprecatedMethodClass.deprecated_all are deprecated. " - "The value(s) provided for 'foo' have been dropped." % __name__) + '{}.DeprecatedMethodClass.deprecated_all are deprecated. ' + "The value(s) provided for 'foo' have been dropped." + .format(__name__)) self._reset_messages() @@ -573,8 +574,9 @@ self.assertEqual(rv, None) self.assertDeprecation( "The trailing arguments ('foo', 'bar') of " - "%s.DeprecatedMethodClass.deprecated_all are deprecated. The " - "value(s) provided for 'foo', 'bar' have been dropped." % __name__) + '{}.DeprecatedMethodClass.deprecated_all are deprecated. The ' + "value(s) provided for 'foo', 'bar' have been dropped." + .format(__name__)) self._reset_messages() @@ -582,8 +584,9 @@ self.assertEqual(rv, None) self.assertDeprecation( "The trailing arguments ('foo', 'bar') of " - "%s.DeprecatedMethodClass.deprecated_all are deprecated. The " - "value(s) provided for 'foo', 'bar' have been dropped." % __name__) + '{}.DeprecatedMethodClass.deprecated_all are deprecated. The ' + "value(s) provided for 'foo', 'bar' have been dropped." + .format(__name__)) self._reset_messages() @@ -599,18 +602,19 @@ self.assertEqual(rv, 42) self.assertDeprecation( "The trailing arguments ('bar') of " - "%s.DeprecatedMethodClass.deprecated_all2 are deprecated. " - "The value(s) provided for 'bar' have been dropped." % __name__) + '{}.DeprecatedMethodClass.deprecated_all2 are deprecated. ' + "The value(s) provided for 'bar' have been dropped." + .format(__name__)) def test_remove_last_args_invalid(self): """Test invalid @remove_last_args on functions.""" self.assertRaisesRegex( TypeError, # Python 3 - r"(deprecated_all2 missing 1 required positional argument: " + r'(deprecated_all2 missing 1 required positional argument: ' r"'foo'|" # Python 2 - r"deprecated_all2 takes exactly 1 argument $0 given$)", + r'deprecated_all2 takes exactly 1 argument $0 given$)', deprecated_all2) self.assertRaisesRegex( @@ -631,10 +635,10 @@ self.assertRaisesRegex( TypeError, # Python 3 - r"(deprecated_all2 missing 1 required positional argument: " + r'(deprecated_all2 missing 1 required positional argument: ' r"'foo'|" # Python 2 - r"deprecated_all2 takes exactly 2 arguments $1 given$)", + r'deprecated_all2 takes exactly 2 arguments $1 given$)', f.deprecated_all2) self.assertRaisesRegex( @@ -760,13 +764,15 @@ self.assertEqual(rv, 'a') self.assertEqual(f.foo, 'a') self.assertOneDeprecationParts( - __name__ + '.DeprecatedMethodClass.deprecated_instance_method_and_arg') + __name__ + + '.DeprecatedMethodClass.deprecated_instance_method_and_arg') rv = f.deprecated_instance_method_and_arg(bah='b') self.assertEqual(rv, 'b') self.assertEqual(f.foo, 'b') self.assertDeprecationParts( - __name__ + '.DeprecatedMethodClass.deprecated_instance_method_and_arg') + __name__ + + '.DeprecatedMethodClass.deprecated_instance_method_and_arg') self.assertDeprecationParts( 'bah argument of ' + __name__ + '.DeprecatedMethodClass.' 'deprecated_instance_method_and_arg', 'foo') @@ -777,7 +783,8 @@ self.assertEqual(rv, 1) self.assertEqual(f.foo, 1) self.assertOneDeprecationParts( - __name__ + '.DeprecatedMethodClass.deprecated_instance_method_and_arg') + __name__ + + '.DeprecatedMethodClass.deprecated_instance_method_and_arg') def test_deprecated_instance_method_and_arg2(self): """Test @deprecated and @deprecate_arg with instance methods.""" @@ -787,13 +794,15 @@ self.assertEqual(rv, 'a') self.assertEqual(f.foo, 'a') self.assertOneDeprecationParts( - __name__ + '.DeprecatedMethodClass.deprecated_instance_method_and_arg2') + __name__ + + '.DeprecatedMethodClass.deprecated_instance_method_and_arg2') rv = f.deprecated_instance_method_and_arg2(bah='b') self.assertEqual(rv, 'b') self.assertEqual(f.foo, 'b') self.assertDeprecationParts( - __name__ + '.DeprecatedMethodClass.deprecated_instance_method_and_arg2') + __name__ + + '.DeprecatedMethodClass.deprecated_instance_method_and_arg2') self.assertDeprecationParts( 'bah argument of ' + __name__ + '.DeprecatedMethodClass.' 'deprecated_instance_method_and_arg2', 'foo') @@ -804,7 +813,8 @@ self.assertEqual(rv, 1) self.assertEqual(f.foo, 1) self.assertOneDeprecationParts( - __name__ + '.DeprecatedMethodClass.deprecated_instance_method_and_arg2') + __name__ + + '.DeprecatedMethodClass.deprecated_instance_method_and_arg2') if __name__ == '__main__': # pragma: no cover diff --git a/tests/diff_tests.py b/tests/diff_tests.py index 9bba2ce..bfe2382 100644 --- a/tests/diff_tests.py +++ b/tests/diff_tests.py @@ -194,16 +194,17 @@ newtext = 'new' # output messages expected during testing - diff_message = '\x03{lightred}- old\n\x03{default}\x03{lightgreen}+ new\n\x03{default}' + diff_message = ('\x03{lightred}- old\n\x03{default}\x03{lightgreen}+ ' + 'new\n\x03{default}') none_message = '\x03{{lightpurple}}{0: ^50}\x03{{default}}'.format('None.') header_base = '\n\x03{{lightpurple}}{0:*^50}\x03{{default}}\n' headers = [' ALL CHANGES ', ' REVIEW CHANGES ', ' APPROVED CHANGES '] - diff_by_letter_message = ("\x03{lightred}- o\n\x03{default}" - "\x03{lightred}- l\n\x03{default}" - "\x03{lightred}- d\n\x03{default}" - "\x03{lightgreen}+ n\n\x03{default}" - "\x03{lightgreen}+ e\n\x03{default}" - "\x03{lightgreen}+ w\n\x03{default}") + diff_by_letter_message = ('\x03{lightred}- o\n\x03{default}' + '\x03{lightred}- l\n\x03{default}' + '\x03{lightred}- d\n\x03{default}' + '\x03{lightgreen}+ n\n\x03{default}' + '\x03{lightgreen}+ e\n\x03{default}' + '\x03{lightgreen}+ w\n\x03{default}') def check_headers(self, mock): """Check if all headers were added to ouput.""" @@ -211,7 +212,8 @@ mock.assert_any_call(self.header_base.format(header)) @patch('pywikibot.output') - @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', return_value='y') + @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', + return_value='y') def test_accept(self, input, mock): """Check output of cherry_pick if changes accepted.""" self.assertEqual(cherry_pick(self.oldtext, self.newtext), self.newtext) @@ -219,7 +221,8 @@ mock.assert_any_call(self.diff_message) @patch('pywikibot.output') - @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', return_value='n') + @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', + return_value='n') def test_reject(self, input, mock): """Check output of cherry_pick if changes rejected.""" self.assertEqual(cherry_pick(self.oldtext, self.newtext), self.oldtext) @@ -228,7 +231,8 @@ mock.assert_any_call(self.none_message) @patch('pywikibot.output') - @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', return_value='q') + @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', + return_value='q') def test_quit(self, input, mock): """Check output of cherry_pick if quitted.""" self.assertEqual(cherry_pick(self.oldtext, self.newtext), self.oldtext) @@ -237,18 +241,28 @@ mock.assert_any_call(self.none_message) @patch('pywikibot.output') - @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', return_value='y') + @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', + return_value='y') def test_by_letter_accept(self, input, mock): - """Check output of cherry_pick if by_letter diff is enabled and changes accepted.""" - self.assertEqual(cherry_pick(self.oldtext, self.newtext, by_letter=True), self.newtext) + """Check cherry_pick output. + + If by_letter diff is enabled and changes accepted. + """ + self.assertEqual(cherry_pick(self.oldtext, self.newtext, + by_letter=True), self.newtext) self.check_headers(mock) mock.assert_any_call(self.diff_by_letter_message) @patch('pywikibot.output') - @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', return_value='q') + @patch('pywikibot.userinterfaces.terminal_interface_base.UI.input', + return_value='q') def test_by_letter_quit(self, input, mock): - """Check output of cherry_pick if by_letter diff is enabled and quitted during review.""" - self.assertEqual(cherry_pick(self.oldtext, self.newtext, by_letter=True), self.oldtext) + """Check cherry_pick output. + + If by_letter diff is enabled and quitted during review. + """ + self.assertEqual(cherry_pick(self.oldtext, self.newtext, + by_letter=True), self.oldtext) self.check_headers(mock) mock.assert_any_call(self.diff_by_letter_message) mock.assert_any_call(self.none_message) diff --git a/tests/djvu_tests.py b/tests/djvu_tests.py index ea9b010..ffc65bb 100644 --- a/tests/djvu_tests.py +++ b/tests/djvu_tests.py @@ -51,7 +51,7 @@ def test_repr_method(self): """Test __repr__() method.""" djvu = DjVuFile(self.file_djvu) - expected = "pywikibot.tools.djvu.DjVuFile('%s')" % self.file_djvu + expected = "pywikibot.tools.djvu.DjVuFile('{}')".format(self.file_djvu) if PY2: expected = expected.encode('utf-8') self.assertEqual(repr(djvu), expected) @@ -59,7 +59,7 @@ def test_str_method(self): """Test __str__() method.""" djvu = DjVuFile(self.file_djvu) - expected = "DjVuFile('%s')" % self.file_djvu + expected = "DjVuFile('{}')".format(self.file_djvu) if PY2: expected = expected.encode('utf-8') self.assertEqual(str(djvu), expected) @@ -67,7 +67,7 @@ def test_unicode_method(self): """Test __unicode__() method.""" djvu = DjVuFile(self.file_djvu) - expected = "DjVuFile('%s')" % self.file_djvu + expected = "DjVuFile('{}')".format(self.file_djvu) if PY2: self.assertEqual(unicode(djvu), expected) else: diff --git a/tests/dry_api_tests.py b/tests/dry_api_tests.py index d5056ec..a377d53 100644 --- a/tests/dry_api_tests.py +++ b/tests/dry_api_tests.py @@ -68,7 +68,8 @@ def test_expiry_formats(self): """Test using a timedelta as expiry.""" self.assertEqual(self.req.expiry, - CachedRequest(datetime.timedelta(days=1), site=self.basesite, + CachedRequest(datetime.timedelta(days=1), + site=self.basesite, parameters=self.parms).expiry) def test_expired(self): @@ -101,24 +102,31 @@ def test_create_file_name(self): """Test the file names for the cache.""" - self.assertEqual(self.req._create_file_name(), self.req._create_file_name()) - self.assertEqual(self.req._create_file_name(), self.expreq._create_file_name()) + self.assertEqual(self.req._create_file_name(), + self.req._create_file_name()) + self.assertEqual(self.req._create_file_name(), + self.expreq._create_file_name()) self.assertEqual(self.req._create_file_name(), self.deprecated_explicit._create_file_name()) self.assertEqual(self.req._create_file_name(), self.deprecated_asterisks._create_file_name()) - self.assertNotEqual(self.req._create_file_name(), self.diffreq._create_file_name()) + self.assertNotEqual(self.req._create_file_name(), + self.diffreq._create_file_name()) def test_cachefile_path(self): """Test the file paths for the cache.""" - self.assertEqual(self.req._cachefile_path(), self.req._cachefile_path()) - self.assertEqual(self.req._cachefile_path(), self.expreq._cachefile_path()) + self.assertEqual(self.req._cachefile_path(), + self.req._cachefile_path()) + self.assertEqual(self.req._cachefile_path(), + self.expreq._cachefile_path()) self.assertEqual(self.req._cachefile_path(), self.deprecated_explicit._cachefile_path()) self.assertEqual(self.req._cachefile_path(), self.deprecated_asterisks._cachefile_path()) - self.assertNotEqual(self.req._cachefile_path(), self.diffreq._cachefile_path()) - self.assertNotEqual(self.req._cachefile_path(), self.diffsite._cachefile_path()) + self.assertNotEqual(self.req._cachefile_path(), + self.diffreq._cachefile_path()) + self.assertNotEqual(self.req._cachefile_path(), + self.diffsite._cachefile_path()) class MockCachedRequestKeyTests(TestCase): @@ -169,21 +177,21 @@ return self._siteinfo def __repr__(self): - return "MockSite()" + return 'MockSite()' def __getattr__(self, attr): - raise Exception("Attribute %r not defined" % attr) + raise Exception('Attribute {!r} not defined'.format(attr)) self.mocksite = MockSite() super(MockCachedRequestKeyTests, self).setUp() def test_cachefile_path_different_users(self): - """Test and compare the file paths when different usernames are used.""" + """Test and compare file paths when different usernames are used.""" req = CachedRequest(expiry=1, site=self.mocksite, parameters={'action': 'query', 'meta': 'siteinfo'}) anonpath = req._cachefile_path() - self.mocksite._userinfo = {'name': u'MyUser'} + self.mocksite._userinfo = {'name': 'MyUser'} self.mocksite._loginstatus = 0 req = CachedRequest(expiry=1, site=self.mocksite, parameters={'action': 'query', 'meta': 'siteinfo'}) @@ -191,7 +199,7 @@ self.assertNotEqual(anonpath, userpath) - self.mocksite._userinfo = {'name': u'MySysop'} + self.mocksite._userinfo = {'name': 'MySysop'} self.mocksite._loginstatus = 1 req = CachedRequest(expiry=1, site=self.mocksite, parameters={'action': 'query', 'meta': 'siteinfo'}) @@ -202,19 +210,19 @@ def test_unicode(self): """Test caching with Unicode content.""" - self.mocksite._userinfo = {'name': u'محمد الفلسطيني'} + self.mocksite._userinfo = {'name': 'محمد الفلسطيني'} self.mocksite._loginstatus = 0 req = CachedRequest(expiry=1, site=self.mocksite, parameters={'action': 'query', 'meta': 'siteinfo'}) en_user_path = req._cachefile_path() - self.mocksite._namespaces = {2: [u'مستخدم']} + self.mocksite._namespaces = {2: ['مستخدم']} req = CachedRequest(expiry=1, site=self.mocksite, parameters={'action': 'query', 'meta': 'siteinfo'}) - expect = (u'MockSite()User(User:محمد الفلسطيني)' + + expect = ('MockSite()User(User:محمد الفلسطيني)' + "[('action', 'query'), ('meta', 'siteinfo')]") self.assertEqual(repr(req._uniquedescriptionstr()), repr(expect)) @@ -315,53 +323,53 @@ """Test extracting data from the ParamInfo.""" prop_info_param_data = { # data from 1.25 - "name": "info", - "classname": "ApiQueryInfo", - "path": "query+info", - "group": "prop", - "prefix": "in", - "parameters": [ + 'name': 'info', + 'classname': 'ApiQueryInfo', + 'path': 'query+info', + 'group': 'prop', + 'prefix': 'in', + 'parameters': [ { - "name": "prop", - "multi": "", - "limit": 500, - "lowlimit": 50, - "highlimit": 500, - "type": [ - "protection", - "talkid", - "watched", - "watchers", - "notificationtimestamp", - "subjectid", - "url", - "readable", - "preload", - "displaytitle" + 'name': 'prop', + 'multi': '', + 'limit': 500, + 'lowlimit': 50, + 'highlimit': 500, + 'type': [ + 'protection', + 'talkid', + 'watched', + 'watchers', + 'notificationtimestamp', + 'subjectid', + 'url', + 'readable', + 'preload', + 'displaytitle' ] }, { - "name": "token", - "deprecated": "", - "multi": "", - "limit": 500, - "lowlimit": 50, - "highlimit": 500, - "type": [ - "edit", - "delete", - "protect", - "move", - "block", - "unblock", - "email", - "import", - "watch" + 'name': 'token', + 'deprecated': '', + 'multi': '', + 'limit': 500, + 'lowlimit': 50, + 'highlimit': 500, + 'type': [ + 'edit', + 'delete', + 'protect', + 'move', + 'block', + 'unblock', + 'email', + 'import', + 'watch' ] }, { - "name": "continue", - "type": "string" + 'name': 'continue', + 'type': 'string' } ], "querytype": "prop" diff --git a/tests/dry_site_tests.py b/tests/dry_site_tests.py index c67435c..441fe50 100644 --- a/tests/dry_site_tests.py +++ b/tests/dry_site_tests.py @@ -66,36 +66,38 @@ self.assertEqual(x.username(), user_agent(x, format_string='{username}')) - x._userinfo = {'name': u'!'} - x._username = (u'!', None) + x._userinfo = {'name': '!'} + x._username = ('!', None) self.assertEqual('!', user_agent(x, format_string='{username}')) - x._userinfo = {'name': u'foo bar'} - x._username = (u'foo bar', None) + x._userinfo = {'name': 'foo bar'} + x._username = ('foo bar', None) self.assertEqual('foo_bar', user_agent(x, format_string='{username}')) old_config = '{script}/{version} Pywikibot/2.0 (User:{username})' pywikibot.version.getversiondict() - script_value = pywikibot.calledModuleName() + '/' + pywikibot.version.cache['rev'] + script_value = (pywikibot.calledModuleName() + '/' + + pywikibot.version.cache['rev']) self.assertEqual(script_value + ' Pywikibot/2.0 (User:foo_bar)', user_agent(x, format_string=old_config)) - x._userinfo = {'name': u'⁂'} - x._username = (u'⁂', None) + x._userinfo = {'name': '⁂'} + x._username = ('⁂', None) self.assertEqual('%E2%81%82', user_agent(x, format_string='{username}')) - x._userinfo = {'name': u'127.0.0.1'} + x._userinfo = {'name': '127.0.0.1'} x._username = (None, None) self.assertEqual('Foo', user_agent(x, format_string='Foo {username}')) self.assertEqual('Foo (' + x.family.name + ':' + x.code + ')', - user_agent(x, format_string='Foo ({script_comments})')) + user_agent(x, + format_string='Foo ({script_comments})')) class TestSetAction(DeprecationTestCase): @@ -185,7 +187,8 @@ """Test overriding the required group.""" args = (1, 2, 'a', 'b') kwargs = {'i': 'j', 'k': 'l'} - retval = self.call_this_user_req_function(*args, as_group='sysop', **kwargs) + retval = self.call_this_user_req_function( + *args, as_group='sysop', **kwargs) self.assertEqual(retval[0], args) self.assertEqual(retval[1], kwargs) self.assertEqual(self._logged_in_as, 'sysop') @@ -195,7 +198,8 @@ self.obsolete = True args = (1, 2, 'a', 'b') kwargs = {'i': 'j', 'k': 'l'} - self.assertRaises(UnknownSite, self.call_this_user_req_function, args, kwargs) + self.assertRaises(UnknownSite, self.call_this_user_req_function, + args, kwargs) class TestNeedVersion(DeprecationTestCase): @@ -209,49 +213,49 @@ def setUp(self): """Set up test method.""" super(TestNeedVersion, self).setUp() - self.version = lambda: "1.13" + self.version = lambda: '1.13' - @need_version("1.14") + @need_version('1.14') def too_new(self): """Method which is to new.""" return True - @need_version("1.13") + @need_version('1.13') def old_enough(self): """Method which is as new as the server.""" return True - @need_version("1.12") + @need_version('1.12') def older(self): """Method which is old enough.""" return True - @need_version("1.14") + @need_version('1.14') @deprecated def deprecated_unavailable_method(self): """Method which is to new and then deprecated.""" return True @deprecated - @need_version("1.14") + @need_version('1.14') def deprecated_unavailable_method2(self): """Method which is deprecated first and then to new.""" return True - @need_version("1.12") + @need_version('1.12') @deprecated def deprecated_available_method(self): """Method which is old enough and then deprecated.""" return True @deprecated - @need_version("1.12") + @need_version('1.12') def deprecated_available_method2(self): """Method which is deprecated first and then old enough.""" return True def test_need_version(self): - """Test need_version when the version is to new, exact or old enough.""" + """Test need_version when the version is new, exact or old enough.""" self.assertRaises(NotImplementedError, self.too_new) self.assertTrue(self.old_enough()) self.assertTrue(self.older()) @@ -261,14 +265,16 @@ # FIXME: The deprecation message should be: # __name__ + '.TestNeedVersion.deprecated_unavailable_method - # The outermost decorator is the version check, so no deprecation message. + # The outermost decorator is the version check, so no + # deprecation message. self.assertRaisesRegex( NotImplementedError, 'deprecated_unavailable_method', self.deprecated_unavailable_method) self.assertNoDeprecation() - # The deprecator is first, but the version check still raises exception. + # The deprecator is first, but the version check still + # raises exception. self.assertRaisesRegex( NotImplementedError, 'deprecated_unavailable_method2', diff --git a/tests/edit_failure_tests.py b/tests/edit_failure_tests.py index f665f4a..9182992 100644 --- a/tests/edit_failure_tests.py +++ b/tests/edit_failure_tests.py @@ -44,7 +44,8 @@ def test_protected(self): """Test that protected titles raise the appropriate exception.""" if self.site.has_group('sysop'): - raise unittest.SkipTest('Testing failure of edit protected with a sysop account') + raise unittest.SkipTest('Testing failure of edit protected with ' + 'a sysop account') page = pywikibot.Page(self.site, 'Wikipedia:Create a new page') self.assertRaises(LockedPage, page.save) @@ -90,7 +91,7 @@ def test_no_recreate(self): """Test that Page.save with recreate disabled fails if page existed.""" page = pywikibot.Page(self.site, 'User:John_Vandenberg/no_recreate') - self.assertRaisesRegex(OtherPageSaveError, 'Page .* doesn\'t exist', + self.assertRaisesRegex(OtherPageSaveError, "Page .* doesn't exist", page.save, recreate=False) @@ -112,8 +113,8 @@ mysite.tokens['move'] except KeyError: raise unittest.SkipTest( - "movepage test requires 'move' token not given to user on %s" - % self.site) + "movepage test requires 'move' token not given to user on {}" + .format(self.site)) self.assertRaises(Error, mysite.movepage, mainpage, mainpage.title(), 'test') @@ -160,10 +161,11 @@ item.addClaim, claim) def test_WbMonolingualText_invalid_text(self): - """Attempt adding a monolingual text with an invalid non-string text.""" + """Attempt adding a monolingual text with invalid non-string text.""" repo = self.get_repo() item = pywikibot.ItemPage(repo, 'Q68') - claim = self._make_WbMonolingualText_claim(repo, text=123456, language='en') + claim = self._make_WbMonolingualText_claim(repo, text=123456, + language='en') self.assertRaisesRegex( OtherPageSaveError, r'Edit to page \[\[(wikidata:test:)?Q68]] failed:\n' diff --git a/tests/edit_tests.py b/tests/edit_tests.py index 0b1fed8..bf638a5 100644 --- a/tests/edit_tests.py +++ b/tests/edit_tests.py @@ -206,11 +206,11 @@ self.assertTrue(self.site.logged_in()) ts = str(time.time()) p = pywikibot.Page(self.site, - 'User:%s/edit test' % self.site.username()) + 'User:{}/edit test'.format(self.site.username())) p.site.editpage(p, appendtext=ts) revision_id = p.latest_revision_id p = pywikibot.Page(self.site, - 'User:%s/edit test' % self.site.username()) + 'User:{}/edit test'.format(self.site.username())) self.assertEqual(revision_id, p.latest_revision_id) self.assertTrue(p.text.endswith(ts)) -- To view, visit https://gerrit.wikimedia.org/r/463604 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: I5b4240872fe4503f091e6889ae947f47e17da1cd Gerrit-Change-Number: 463604 Gerrit-PatchSet: 3 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits October 2018