[Pywikibot-commits] [Gerrit] pywikibot/core[master]: [cleanup] cleanup tests/[testlib_tests.py-timestripper_tests.py]

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463250 ) Change subject: [cleanup] cleanup tests/[testlib_tests.py-timestripper_tests.py] ...................................................................... [cleanup] cleanup tests/[testlib_tests.py-timestripper_tests.py] - use str.format(...) instead of modulo for type specifier arguments - use single quotes for string literals - remove preleading "u" fron strings - indentation to make sure code lines are less than 79 characters Change-Id: I272002c177aa8e95feb2f9b994ea95897f926778 --- M tests/textlib_tests.py M tests/thanks_tests.py M tests/timestripper_tests.py 3 files changed, 215 insertions(+), 139 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index 985383c..4deba27 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -28,10 +28,10 @@ from tests import mock files = {} -dirname = os.path.join(os.path.dirname(__file__), "pages") +dirname = os.path.join(os.path.dirname(__file__), 'pages') -for f in ["enwiki_help_editing"]: - with codecs.open(os.path.join(dirname, f + ".page"), +for f in ['enwiki_help_editing']: + with codecs.open(os.path.join(dirname, f + '.page'), 'r', 'utf-8') as content: files[f] = content.read() @@ -67,7 +67,7 @@ def testSpacesInSection(self): """Test with spaces in section.""" - self.assertContains("enwiki_help_editing", u"Minor_edits") + self.assertContains('enwiki_help_editing', 'Minor_edits') self.assertNotContains('enwiki_help_editing', '#Minor edits', "Incorrect, '#Minor edits' does not work") self.assertNotContains('enwiki_help_editing', 'Minor Edits', @@ -78,8 +78,9 @@ @unittest.expectedFailure # TODO: T133276 def test_encoded_chars_in_section(self): """Test encoded chars in section.""" - self.assertContains('enwiki_help_editing', 'Talk_.28discussion.29_pages', - 'As used in the TOC') + self.assertContains( + 'enwiki_help_editing', 'Talk_.28discussion.29_pages', + 'As used in the TOC') def test_underline_characters_in_section(self): """Test with underline chars in section.""" @@ -88,14 +89,15 @@ def test_spaces_outside_section(self): """Test with spaces around section.""" - self.assertContains("enwiki_help_editing", u"Naming and_moving") - self.assertContains("enwiki_help_editing", u" Naming and_moving ") - self.assertContains("enwiki_help_editing", u" Naming and_moving_") + self.assertContains('enwiki_help_editing', 'Naming and_moving') + self.assertContains('enwiki_help_editing', ' Naming and_moving ') + self.assertContains('enwiki_help_editing', ' Naming and_moving_') def test_link_in_section(self): """Test with link inside section.""" # section is ==[[Wiki markup]]== - self.assertContains("enwiki_help_editing", u"[[Wiki markup]]", "Link as section header") + self.assertContains('enwiki_help_editing', '[[Wiki markup]]', + 'Link as section header') self.assertContains('enwiki_help_editing', '[[:Wiki markup]]', 'section header link with preleading colon') self.assertNotContains('enwiki_help_editing', 'Wiki markup', @@ -227,28 +229,37 @@ cats = textlib.getCategoryLinks(self.old, site=self.site) # Sanity checking - temp = textlib.replaceCategoryInPlace(self.old, cats[0], dummy, site=self.site) + temp = textlib.replaceCategoryInPlace(self.old, cats[0], dummy, + site=self.site) self.assertNotEqual(temp, self.old) - new = textlib.replaceCategoryInPlace(temp, dummy, cats[0], site=self.site) + new = textlib.replaceCategoryInPlace(temp, dummy, cats[0], + site=self.site) self.assertEqual(self.old, new) - temp = textlib.replaceCategoryInPlace(self.old, cats[1], dummy, site=self.site) + temp = textlib.replaceCategoryInPlace(self.old, cats[1], dummy, + site=self.site) self.assertNotEqual(temp, self.old) - new = textlib.replaceCategoryInPlace(temp, dummy, cats[1], site=self.site) + new = textlib.replaceCategoryInPlace(temp, dummy, cats[1], + site=self.site) self.assertEqual(self.old, new) - temp = textlib.replaceCategoryInPlace(self.old, cats[2], dummy, site=self.site) + temp = textlib.replaceCategoryInPlace(self.old, cats[2], dummy, + site=self.site) self.assertNotEqual(temp, self.old) - new = textlib.replaceCategoryInPlace(temp, dummy, cats[2], site=self.site) + new = textlib.replaceCategoryInPlace(temp, dummy, cats[2], + site=self.site) self.assertEqual(self.old, new) - temp = textlib.replaceCategoryInPlace(self.old, cats[3], dummy, site=self.site) + temp = textlib.replaceCategoryInPlace(self.old, cats[3], + dummy, site=self.site) self.assertNotEqual(temp, self.old) - new = textlib.replaceCategoryInPlace(temp, dummy, cats[3], site=self.site) + new = textlib.replaceCategoryInPlace(temp, dummy, cats[3], + site=self.site) self.assertEqual(self.old, new) # Testing removing categories - temp = textlib.replaceCategoryInPlace(self.old, cats[0], None, site=self.site) + temp = textlib.replaceCategoryInPlace(self.old, cats[0], + None, site=self.site) self.assertNotEqual(temp, self.old) temp_cats = textlib.getCategoryLinks(temp, site=self.site) self.assertNotIn(cats[0], temp_cats) @@ -277,7 +288,8 @@ self.assertEqual(cats[3].sortKey, 'key') orig_sortkey = cats[3].sortKey - temp = textlib.replaceCategoryInPlace(self.old, cats[3], dummy, site=self.site) + temp = textlib.replaceCategoryInPlace(self.old, cats[3], + dummy, site=self.site) self.assertNotEqual(self.old, temp) new_dummy = textlib.getCategoryLinks(temp, site=self.site)[3] self.assertIsNotNone(new_dummy.sortKey) @@ -336,33 +348,51 @@ self.assertEqual(func('{{a }}'), [('a', OrderedDict())]) self.assertEqual(func('{{ a }}'), [('a', OrderedDict())]) - self.assertEqual(func('{{a|b=c}}'), [('a', OrderedDict((('b', 'c'), )))]) - self.assertEqual(func('{{a|b|c=d}}'), [('a', OrderedDict((('1', 'b'), ('c', 'd'))))]) + self.assertEqual(func('{{a|b=c}}'), + [('a', OrderedDict((('b', 'c'), )))]) + self.assertEqual(func('{{a|b|c=d}}'), + [('a', OrderedDict((('1', 'b'), ('c', 'd'))))]) self.assertEqual(func('{{a|b=c|f=g|d=e|1=}}'), - [('a', OrderedDict((('b', 'c'), ('f', 'g'), ('d', 'e'), ('1', ''))))]) - self.assertEqual(func('{{a|1=2|c=d}}'), [('a', OrderedDict((('1', '2'), ('c', 'd'))))]) - self.assertEqual(func('{{a|c=d|1=2}}'), [('a', OrderedDict((('c', 'd'), ('1', '2'))))]) - self.assertEqual(func('{{a|5=d|a=b}}'), [('a', OrderedDict((('5', 'd'), ('a', 'b'))))]) - self.assertEqual(func('{{a|=2}}'), [('a', OrderedDict((('', '2'), )))]) + [('a', OrderedDict((('b', 'c'), ('f', 'g'), + ('d', 'e'), ('1', ''))))]) + self.assertEqual(func('{{a|1=2|c=d}}'), + [('a', OrderedDict((('1', '2'), ('c', 'd'))))]) + self.assertEqual(func('{{a|c=d|1=2}}'), + [('a', OrderedDict((('c', 'd'), ('1', '2'))))]) + self.assertEqual(func('{{a|5=d|a=b}}'), + [('a', OrderedDict((('5', 'd'), ('a', 'b'))))]) + self.assertEqual(func('{{a|=2}}'), + [('a', OrderedDict((('', '2'), )))]) self.assertEqual(func('{{a|}}'), [('a', OrderedDict((('1', ''), )))]) - self.assertEqual(func('{{a|=|}}'), [('a', OrderedDict((('', ''), ('1', ''))))]) - self.assertEqual(func('{{a||}}'), [('a', OrderedDict((('1', ''), ('2', ''))))]) + self.assertEqual(func('{{a|=|}}'), + [('a', OrderedDict((('', ''), ('1', ''))))]) + self.assertEqual(func('{{a||}}'), + [('a', OrderedDict((('1', ''), ('2', ''))))]) - self.assertEqual(func('{{a|b={{{1}}}}}'), [('a', OrderedDict((('b', '{{{1}}}'), )))]) + self.assertEqual(func('{{a|b={{{1}}}}}'), + [('a', OrderedDict((('b', '{{{1}}}'), )))]) self.assertEqual(func('{{a|b=<noinclude>{{{1}}}</noinclude>}}'), - [('a', OrderedDict((('b', '<noinclude>{{{1}}}</noinclude>'), )))]) - self.assertEqual(func('{{subst:a|b=c}}'), [('subst:a', OrderedDict((('b', 'c'), )))]) + [('a', OrderedDict( + (('b', '<noinclude>{{{1}}}</noinclude>'), )))]) + self.assertEqual(func('{{subst:a|b=c}}'), + [('subst:a', OrderedDict((('b', 'c'), )))]) self.assertEqual(func('{{safesubst:a|b=c}}'), [('safesubst:a', OrderedDict((('b', 'c'), )))]) - self.assertEqual(func('{{msgnw:a|b=c}}'), [('msgnw:a', OrderedDict((('b', 'c'), )))]) - self.assertEqual(func('{{Template:a|b=c}}'), [('Template:a', OrderedDict((('b', 'c'), )))]) - self.assertEqual(func('{{template:a|b=c}}'), [('template:a', OrderedDict((('b', 'c'), )))]) - self.assertEqual(func('{{:a|b=c}}'), [(':a', OrderedDict((('b', 'c'), )))]) - self.assertEqual(func('{{subst::a|b=c}}'), [('subst::a', OrderedDict((('b', 'c'), )))]) + self.assertEqual(func('{{msgnw:a|b=c}}'), + [('msgnw:a', OrderedDict((('b', 'c'), )))]) + self.assertEqual(func('{{Template:a|b=c}}'), + [('Template:a', OrderedDict((('b', 'c'), )))]) + self.assertEqual(func('{{template:a|b=c}}'), + [('template:a', OrderedDict((('b', 'c'), )))]) + self.assertEqual(func('{{:a|b=c}}'), + [(':a', OrderedDict((('b', 'c'), )))]) + self.assertEqual(func('{{subst::a|b=c}}'), + [('subst::a', OrderedDict((('b', 'c'), )))]) self.assertEqual(func('{{a|b={{{1}}}|c={{{2}}}}}'), - [('a', OrderedDict((('b', '{{{1}}}'), ('c', '{{{2}}}'))))]) + [('a', OrderedDict((('b', '{{{1}}}'), + ('c', '{{{2}}}'))))]) self.assertEqual(func('{{a|b=c}}{{d|e=f}}'), [('a', OrderedDict((('b', 'c'), ))), ('d', OrderedDict((('e', 'f'), )))]) @@ -380,49 +410,69 @@ self.assertEqual(func('{{a|b=<!--{{{1}}}-->}}'), [('a', OrderedDict((('b', '<!--{{{1}}}-->'), )))]) - self.assertEqual(func('{{a| }}'), [('a', OrderedDict((('1', ' '), )))]) - self.assertEqual(func('{{a| | }}'), [('a', OrderedDict((('1', ' '), ('2', ' '))))]) - self.assertEqual(func('{{a| =|}}'), [('a', OrderedDict(((' ', ''), ('1', ''))))]) + self.assertEqual(func('{{a| }}'), + [('a', OrderedDict((('1', ' '), )))]) + self.assertEqual(func('{{a| | }}'), + [('a', OrderedDict((('1', ' '), ('2', ' '))))]) + self.assertEqual(func('{{a| =|}}'), + [('a', OrderedDict(((' ', ''), ('1', ''))))]) - self.assertEqual(func('{{a| b=c}}'), [('a', OrderedDict(((' b', 'c'), )))]) - self.assertEqual(func('{{a|b =c}}'), [('a', OrderedDict((('b ', 'c'), )))]) - self.assertEqual(func('{{a|b= c}}'), [('a', OrderedDict((('b', ' c'), )))]) - self.assertEqual(func('{{a|b=c }}'), [('a', OrderedDict((('b', 'c '), )))]) + self.assertEqual(func('{{a| b=c}}'), + [('a', OrderedDict(((' b', 'c'), )))]) + self.assertEqual(func('{{a|b =c}}'), + [('a', OrderedDict((('b ', 'c'), )))]) + self.assertEqual(func('{{a|b= c}}'), + [('a', OrderedDict((('b', ' c'), )))]) + self.assertEqual(func('{{a|b=c }}'), + [('a', OrderedDict((('b', 'c '), )))]) self.assertEqual(func('{{a| foo |2= bar }}'), - [('a', OrderedDict((('1', ' foo '), ('2', ' bar '))))]) + [('a', OrderedDict((('1', ' foo '), + ('2', ' bar '))))]) # The correct entry 'bar' is removed self.assertEqual(func('{{a| foo |2= bar | baz }}'), - [('a', OrderedDict((('1', ' foo '), ('2', ' baz '))))]) + [('a', OrderedDict((('1', ' foo '), + ('2', ' baz '))))]) # However whitespace prevents the correct item from being removed self.assertEqual(func('{{a| foo | 2 = bar | baz }}'), - [('a', OrderedDict((('1', ' foo '), (' 2 ', ' bar '), ('2', ' baz '))))]) + [('a', OrderedDict((('1', ' foo '), (' 2 ', ' bar '), + ('2', ' baz '))))]) def _stripped(self, func): """Common cases of stripped results.""" - self.assertEqual(func('{{a| }}'), [('a', OrderedDict((('1', ' '), )))]) - self.assertEqual(func('{{a| | }}'), [('a', OrderedDict((('1', ' '), ('2', ' '))))]) - self.assertEqual(func('{{a| =|}}'), [('a', OrderedDict((('', ''), ('1', ''))))]) + self.assertEqual(func('{{a| }}'), + [('a', OrderedDict((('1', ' '), )))]) + self.assertEqual(func('{{a| | }}'), + [('a', OrderedDict((('1', ' '), ('2', ' '))))]) + self.assertEqual(func('{{a| =|}}'), + [('a', OrderedDict((('', ''), ('1', ''))))]) - self.assertEqual(func('{{a| b=c}}'), [('a', OrderedDict((('b', 'c'), )))]) - self.assertEqual(func('{{a|b =c}}'), [('a', OrderedDict((('b', 'c'), )))]) - self.assertEqual(func('{{a|b= c}}'), [('a', OrderedDict((('b', 'c'), )))]) - self.assertEqual(func('{{a|b=c }}'), [('a', OrderedDict((('b', 'c'), )))]) + self.assertEqual(func('{{a| b=c}}'), + [('a', OrderedDict((('b', 'c'), )))]) + self.assertEqual(func('{{a|b =c}}'), + [('a', OrderedDict((('b', 'c'), )))]) + self.assertEqual(func('{{a|b= c}}'), + [('a', OrderedDict((('b', 'c'), )))]) + self.assertEqual(func('{{a|b=c }}'), + [('a', OrderedDict((('b', 'c'), )))]) self.assertEqual(func('{{a| foo |2= bar }}'), [('a', OrderedDict((('1', ' foo '), ('2', 'bar'))))]) # 'bar' is always removed self.assertEqual(func('{{a| foo |2= bar | baz }}'), - [('a', OrderedDict((('1', ' foo '), ('2', ' baz '))))]) + [('a', OrderedDict((('1', ' foo '), + ('2', ' baz '))))]) self.assertEqual(func('{{a| foo | 2 = bar | baz }}'), - [('a', OrderedDict((('1', ' foo '), ('2', ' baz '))))]) + [('a', OrderedDict((('1', ' foo '), + ('2', ' baz '))))]) def _etp_regex_differs(self, func): """Common cases not handled the same by ETP_REGEX.""" # inner {} should be treated as part of the value - self.assertEqual(func('{{a|b={} }}'), [('a', OrderedDict((('b', '{} '), )))]) + self.assertEqual(func('{{a|b={} }}'), + [('a', OrderedDict((('b', '{} '), )))]) def _order_differs(self, func): """Common cases where the order of templates differs.""" @@ -437,7 +487,7 @@ # inner '}' after {{b|c}} should be treated as wikitext self.assertCountEqual(func('{{a|{{b|c}}}|d}}'), [('a', OrderedDict([('1', '{{b|c}}}'), - ('2', u'd')])), + ('2', 'd')])), ('b', OrderedDict([('1', 'c')]))]) @require_modules('mwparserfromhell') @@ -547,9 +597,9 @@ ('2', 'd}} ')]))]) self.assertEqual(func('{{a|{{b|c}}}|d}}'), - [(u'a', OrderedDict([('1', u'{{b'), - ('2', u'c}}}'), - ('3', u'd')]))]) + [('a', OrderedDict([('1', '{{b'), + ('2', 'c}}}'), + ('3', 'd')]))]) # Safe fallback to handle arbitary template levels # by merging top level templates together. @@ -803,9 +853,11 @@ self._count += 1 if link.section: return pywikibot.Link( - '{0}#{1}'.format(self._count, link.section), link.site) + '{0}#{1}' + .format(self._count, link.section), link.site) else: - return pywikibot.Link('{0}'.format(self._count), link.site) + return pywikibot.Link('{0}' + .format(self._count), link.site) self._count = 0 # buffer number of found instances self.assertEqual( textlib.replace_links(self.text, callback, self.wp_site), @@ -845,7 +897,7 @@ '[[B|A]][[B|A]][[C]]') def test_replacements_simplify(self): - """Test a tuple as a replacement removing the need for a piped link.""" + """Test a tuple as replacement removing the need for a piped link.""" self.assertEqual( textlib.replace_links(self.text, ('how', 'are'), @@ -857,8 +909,8 @@ """Test that it respects the namespace.""" self.assertEqual( textlib.replace_links( - '[[File:Meh.png|thumb|Description of [[fancy]]]] [[Fancy]]...', - ('File:Meh.png', 'File:Fancy.png'), + '[[File:Meh.png|thumb|Description of [[fancy]]]] ' + '[[Fancy]]...', ('File:Meh.png', 'File:Fancy.png'), self.wp_site), '[[File:Fancy.png|thumb|Description of [[fancy]]]] [[Fancy]]...') @@ -872,8 +924,8 @@ def test_replace_invalid_link_text(self): """Test that it doesn't pipe a link when it's an invalid link.""" self.assertEqual( - textlib.replace_links('[[Target|Foo:]]', ('Target', 'Foo'), self.wp_site), - '[[Foo|Foo:]]') + textlib.replace_links('[[Target|Foo:]]', ('Target', 'Foo'), + self.wp_site), '[[Foo|Foo:]]') def test_replace_modes(self): """Test replacing with or without label and section.""" @@ -892,42 +944,49 @@ self.wp_site), '[[Bar]]') self.assertEqual( - textlib.replace_links(source_text, ('Foo', 'Bar#snafu'), self.wp_site), - '[[Bar#bar|baz]]') - self.assertEqual( - textlib.replace_links(source_text, - ('Foo', pywikibot.Page(self.wp_site, 'Bar#snafu')), + textlib.replace_links(source_text, ('Foo', 'Bar#snafu'), self.wp_site), '[[Bar#bar|baz]]') self.assertEqual( textlib.replace_links(source_text, - ('Foo', pywikibot.Link('Bar#snafu', self.wp_site)), + ('Foo', pywikibot.Page(self.wp_site, + 'Bar#snafu')), + self.wp_site), + '[[Bar#bar|baz]]') + self.assertEqual( + textlib.replace_links(source_text, + ('Foo', pywikibot.Link('Bar#snafu', + self.wp_site)), self.wp_site), '[[Bar#snafu]]') self.assertEqual( - textlib.replace_links(source_text, ('Foo', 'Bar|foo'), self.wp_site), - '[[Bar#bar|baz]]') + textlib.replace_links(source_text, ('Foo', 'Bar|foo'), + self.wp_site), '[[Bar#bar|baz]]') self.assertEqual( textlib.replace_links(source_text, - ('Foo', pywikibot.Page(self.wp_site, 'Bar|foo')), + ('Foo', pywikibot.Page(self.wp_site, + 'Bar|foo')), self.wp_site), '[[Bar#bar|baz]]') self.assertEqual( textlib.replace_links(source_text, - ('Foo', pywikibot.Link('Bar|foo', self.wp_site)), + ('Foo', pywikibot.Link('Bar|foo', + self.wp_site)), self.wp_site), '[[Bar|foo]]') self.assertEqual( - textlib.replace_links(source_text, ('Foo', 'Bar#snafu|foo'), self.wp_site), - '[[Bar#bar|baz]]') + textlib.replace_links(source_text, ('Foo', 'Bar#snafu|foo'), + self.wp_site), '[[Bar#bar|baz]]') self.assertEqual( textlib.replace_links(source_text, - ('Foo', pywikibot.Page(self.wp_site, 'Bar#snafu|foo')), + ('Foo', pywikibot.Page(self.wp_site, + 'Bar#snafu|foo')), self.wp_site), '[[Bar#bar|baz]]') self.assertEqual( textlib.replace_links(source_text, - ('Foo', pywikibot.Link('Bar#snafu|foo', self.wp_site)), + ('Foo', pywikibot.Link('Bar#snafu|foo', + self.wp_site)), self.wp_site), '[[Bar#snafu|foo]]') @@ -935,13 +994,16 @@ """Test that it uses piped links when the case is different.""" source_text = '[[Foo|Bar]] and [[Foo|bar]]' self.assertEqual( - textlib.replace_links(source_text, ('Foo', 'bar'), self.get_site('wp')), + textlib.replace_links(source_text, ('Foo', 'bar'), + self.get_site('wp')), '[[Bar]] and [[bar]]') self.assertEqual( - textlib.replace_links(source_text, ('Foo', 'bar'), self.get_site('wt')), + textlib.replace_links(source_text, ('Foo', 'bar'), + self.get_site('wt')), '[[bar|Bar]] and [[bar]]') self.assertEqual( - textlib.replace_links(source_text, ('Foo', 'Bar'), self.get_site('wt')), + textlib.replace_links(source_text, ('Foo', 'Bar'), + self.get_site('wt')), '[[Bar]] and [[Bar|bar]]') @unittest.expectedFailure @@ -951,22 +1013,28 @@ # (interwiki and namespace prefixes) which could be then compared # case insensitive. self.assertEqual( - textlib.replace_links('[[Image:Foobar]]', ('File:Foobar', 'File:Foo'), self.wp_site), + textlib.replace_links('[[Image:Foobar]]', + ('File:Foobar', 'File:Foo'), self.wp_site), '[[File:Foo|Image:Foobar]]') self.assertEqual( - textlib.replace_links('[[en:File:Foobar]]', ('File:Foobar', 'File:Foo'), self.wp_site), + textlib.replace_links('[[en:File:Foobar]]', + ('File:Foobar', 'File:Foo'), self.wp_site), '[[File:Foo|en:File:Foobar]]') def test_linktrails(self): """Test that the linktrails are used or applied.""" self.assertEqual( - textlib.replace_links('[[Foobar]]', ('Foobar', 'Foo'), self.wp_site), + textlib.replace_links('[[Foobar]]', ('Foobar', 'Foo'), + self.wp_site), '[[Foo]]bar') self.assertEqual( - textlib.replace_links('[[Talk:test]]s', ('Talk:Test', 'Talk:Tests'), self.wp_site), + textlib.replace_links('[[Talk:test]]s', + ('Talk:Test', 'Talk:Tests'), self.wp_site), '[[Talk:tests]]') self.assertEqual( - textlib.replace_links('[[Talk:test]]s', ('Talk:Test', 'Project:Tests'), self.wp_site), + textlib.replace_links('[[Talk:test]]s', + ('Talk:Test', 'Project:Tests'), + self.wp_site), '[[Project:Tests|Talk:tests]]') def test_unicode_callback(self): @@ -978,8 +1046,8 @@ return 'homewörlder' self.assertEqual( textlib.replace_links(self.text, callback, self.wp_site), - 'Hello homewörlder, [[how|are]] [[you#section|you]]? Are [[you]] a ' - '[[bug:1337]]?') + 'Hello homewörlder, [[how|are]] [[you#section|you]]? ' + 'Are [[you]] a [[bug:1337]]?') def test_bytes_callback(self): """Test returning bytes in the callback.""" @@ -1003,13 +1071,13 @@ """Test converting Latin digits to local digits.""" self.assertEqual(textlib.to_local_digits(299792458, 'en'), 299792458) self.assertEqual( - textlib.to_local_digits(299792458, 'fa'), u"۲۹۹۷۹۲۴۵۸") + textlib.to_local_digits(299792458, 'fa'), '۲۹۹۷۹۲۴۵۸') self.assertEqual( textlib.to_local_digits( - u"299792458 flash", 'fa'), u"۲۹۹۷۹۲۴۵۸ flash") + '299792458 flash', 'fa'), '۲۹۹۷۹۲۴۵۸ flash') self.assertEqual( textlib.to_local_digits( - "299792458", 'km'), u"២៩៩៧៩២៤៥៨") + '299792458', 'km'), '២៩៩៧៩២៤៥៨') class TestReplaceExcept(DefaultDrySiteTestCase): @@ -1052,7 +1120,8 @@ self.assertEqual( textlib.replaceExcept('abc', r'x*', r'-', [], site=self.site), '-a-b-c-') - # This is different from re.sub() as re.sub() doesn't allow None groups + # This is different from re.sub() as re.sub() doesn't + # allow None groups self.assertEqual( textlib.replaceExcept('', r'(a)?', r'\1\1', [], site=self.site), '') @@ -1167,10 +1236,10 @@ 'x', 'y', ['source'], site=self.site), '<source>x</source>') - self.assertEqual(textlib.replaceExcept('<syntaxhighlight lang="xml">x</syntaxhighlight>', - 'x', 'y', ['source'], - site=self.site), - '<syntaxhighlight lang="xml">x</syntaxhighlight>') + self.assertEqual(textlib.replaceExcept( + '<syntaxhighlight lang="xml">x</syntaxhighlight>', + 'x', 'y', ['source'], site=self.site), + '<syntaxhighlight lang="xml">x</syntaxhighlight>') self.assertEqual( textlib.replaceExcept('<syntaxhighlight>x</syntaxhighlight>', 'x', 'y', ['source'], site=self.site), @@ -1199,10 +1268,9 @@ 'x', 'y', ['hyperlink'], site=self.site), 'y [http://www.sample.com y]') - self.assertEqual(textlib.replaceExcept('x http://www.sample.com/x.html'#39;, - 'x', 'y', - ['hyperlink'], site=self.site), - 'y http://www.sample.com/x.html') + self.assertEqual(textlib.replaceExcept( + 'x http://www.sample.com/x.html'#39;, 'x', 'y', + ['hyperlink'], site=self.site), 'y http://www.sample.com/x.html') self.assertEqual(textlib.replaceExcept('<gallery>x</gallery>', 'x', 'y', ['gallery'], site=self.site), @@ -1237,25 +1305,25 @@ self.assertEqual(textlib.replaceExcept('x [[x]] x x', 'x', 'y', [], site=self.site, count=2), 'y [[y]] x x') - self.assertEqual(textlib.replaceExcept('x [[x]] x x', 'x', 'y', ['link'], - site=self.site, count=2), - 'y [[x]] y x') + self.assertEqual(textlib.replaceExcept( + 'x [[x]] x x', 'x', 'y', ['link'], site=self.site, count=2), + 'y [[x]] y x') def test_replace_tag_category(self): """Test replacing not inside category links.""" for ns_name in self.site.namespaces[14]: - self.assertEqual(textlib.replaceExcept('[[%s:x]]' % ns_name, + self.assertEqual(textlib.replaceExcept('[[{}:x]]'.format(ns_name), 'x', 'y', ['category'], site=self.site), - '[[%s:x]]' % ns_name) + '[[{}:x]]'.format(ns_name)) def test_replace_tag_file(self): """Test replacing not inside file links.""" for ns_name in self.site.namespaces[6]: - self.assertEqual(textlib.replaceExcept('[[%s:x]]' % ns_name, + self.assertEqual(textlib.replaceExcept('[[{}:x]]'.format(ns_name), 'x', 'y', ['file'], site=self.site), - '[[%s:x]]' % ns_name) + '[[{}:x]]'.format(ns_name)) self.assertEqual( textlib.replaceExcept( @@ -1360,9 +1428,10 @@ def test_replace_tags_interwiki(self): """Test replacing not inside interwiki links.""" - if 'es' not in self.site.family.langs or 'ey' in self.site.family.langs: - raise unittest.SkipTest('family %s doesnt have languages' - % self.site) + if ('es' not in self.site.family.langs or + 'ey' in self.site.family.langs): + raise unittest.SkipTest("family {} doesn't have languages" + .format(self.site)) self.assertEqual(textlib.replaceExcept('[[es:s]]', 's', 't', ['interwiki'], site=self.site), @@ -1402,14 +1471,14 @@ def test_replace_source_reference(self): """Test replacing in text which contains back references.""" - # Don't use a valid reference number in the original string, in case it - # tries to apply that as a reference. + # Don't use a valid reference number in the original string, + # in case it tries to apply that as a reference. self.assertEqual(textlib.replaceExcept(r'\42', r'^(.*)$', r'X\1X', [], site=self.site), r'X\42X') - self.assertEqual(textlib.replaceExcept(r'\g<bar>', r'^(?P<foo>.*)$', - r'X\g<foo>X', [], site=self.site), - r'X\g<bar>X') + self.assertEqual(textlib.replaceExcept( + r'\g<bar>', r'^(?P<foo>.*)$', r'X\g<foo>X', [], site=self.site), + r'X\g<bar>X') class TestMultiTemplateMatchBuilder(DefaultDrySiteTestCase): @@ -1503,7 +1572,8 @@ def test_getLanguageLinks(self, key): """Test if the function returns the correct titles and sites.""" with mock.patch('pywikibot.output') as m: - lang_links = textlib.getLanguageLinks(self.example_text, self.site) + lang_links = textlib.getLanguageLinks(self.example_text, + self.site) m.assert_called_once_with( '[getLanguageLinks] Text contains invalid interwiki link ' '[[fr:{{PAGENAME}}]].') diff --git a/tests/thanks_tests.py b/tests/thanks_tests.py index 8099d83..b8b403c 100644 --- a/tests/thanks_tests.py +++ b/tests/thanks_tests.py @@ -56,8 +56,8 @@ """Test that thanking oneself causes an error. This test is not in TestThankRevisionErrors because it may require - making a successful edit in order to test the API call thanking the user - running the test. + making a successful edit in order to test the API call thanking + the user running the test. """ site = self.get_site() my_name = self.get_userpage().username diff --git a/tests/timestripper_tests.py b/tests/timestripper_tests.py index 42000ee..f1aafbf 100644 --- a/tests/timestripper_tests.py +++ b/tests/timestripper_tests.py @@ -167,35 +167,40 @@ 'cswiki': { 'family': 'wikipedia', 'code': 'cs', - 'match': u'3. 2. 2011, 19:48 (UTC) 7. 2. 2010 19:48 (UTC)', + 'match': '3. 2. 2011, 19:48 (UTC) 7. 2. 2010 19:48 (UTC)', }, 'enwiki': { 'family': 'wikipedia', 'code': 'en', - 'match': u'3 February 2011 19:48 (UTC) 7 February 2010 19:48 (UTC)', - 'nomatch': u'3. 2. 2011, 19:48 (UTC) 7. 2. 2010 19:48 (UTC)', + 'match': '3 February 2011 19:48 (UTC) ' + '7 February 2010 19:48 (UTC)', + 'nomatch': '3. 2. 2011, 19:48 (UTC) 7. 2. 2010 19:48 (UTC)', }, 'fawiki': { 'family': 'wikipedia', 'code': 'fa', - 'match': u'۳ فوریهٔ ۲۰۱۱، ساعت ۱۹:۴۸ (UTC) ۷ فوریهٔ ۲۰۱۰، ساعت ۱۹:۴۸ (UTC)', - 'nomatch': u'۳ ۲ ۲۰۱۴ ۱۹:۴۸ (UTC) ۷ ۲ ۲۰۱۰ ۱۹:۴۸ (UTC)', + 'match': '۳ فوریهٔ ۲۰۱۱، ساعت ۱۹:۴۸ (UTC) ' + '۷ فوریهٔ ۲۰۱۰، ساعت ۱۹:۴۸ (UTC)', + 'nomatch': '۳ ۲ ۲۰۱۴ ۱۹:۴۸ (UTC) ۷ ۲ ۲۰۱۰ ۱۹:۴۸ (UTC)', }, 'frwiki': { 'family': 'wikipedia', 'code': 'fr', - 'match': u'3 février 2011 à 19:48 (CET) 7 février 2010 à 19:48 (CET)', - 'nomatch': u'3 March 2011 19:48 (CET) 7 March 2010 19:48 (CET)', + 'match': '3 février 2011 à 19:48 (CET) ' + '7 février 2010 à 19:48 (CET)', + 'nomatch': '3 March 2011 19:48 (CET) 7 March 2010 19:48 (CET)', }, 'kowiki': { 'family': 'wikipedia', 'code': 'ko', - 'match': u'2011년 2월 3일 (수) 19:48 (KST) 2010년 2월 7일 (수) 19:48 (KST)', + 'match': '2011년 2월 3일 (수) 19:48 (KST) ' + '2010년 2월 7일 (수) 19:48 (KST)', }, 'nowiki': { 'family': 'wikipedia', 'code': 'no', - 'match': u'3. feb 2011 kl. 19:48 (CET) 7. feb 2010 kl. 19:48 (UTC)', + 'match': '3. feb 2011 kl. 19:48 (CET) ' + '7. feb 2010 kl. 19:48 (UTC)', }, 'ptwiki': { 'family': 'wikipedia', @@ -206,7 +211,8 @@ 'viwiki': { 'family': 'wikipedia', 'code': 'vi', - 'match': '19:48, ngày 3 tháng 2 năm 2011 (UTC) 19:48, ngày 7 tháng 2 năm 2010 (UTC)', + 'match': '19:48, ngày 3 tháng 2 năm 2011 (UTC) ' + '19:48, ngày 7 tháng 2 năm 2010 (UTC)', 'match2': '16:41, ngày 15 tháng 9 năm 2001 (UTC) 16:41, ' 'ngày 12 tháng 9 năm 2008 (UTC)', 'match3': '21:18, ngày 13 tháng 8 năm 2011 (UTC) 21:18, ' @@ -335,8 +341,8 @@ txt_match = '[http://' + self.fake_date + ']' + self.date self.assertEqual(ts(txt_match), self.expected_date) - txt_match = ('%s [http://www.org | link with date %s]' - % (self.date, self.fake_date)) + txt_match = ('{} [http://www.org | link with date {}]' + .format(self.date, self.fake_date)) self.assertEqual(ts(txt_match), self.expected_date) txt_match = '[http://' + self.fake_date + ']' + self.date @@ -346,8 +352,8 @@ """Test that skipping hyperlinks will not make gaps shorter.""" ts = self.ts.timestripper - txt_match = ('%s[http://example.com Here is long enough text]%s' - % (self.date[:9], self.date[9:])) + txt_match = ('{}[http://example.com Here is long enough text]{}' + .format(self.date[:9], self.date[9:])) self.assertEqual(ts(txt_match), None) def test_timestripper_match_wikilink_with_date(self): @@ -370,8 +376,8 @@ """Test that skipping wikilinks will not make gaps shorter.""" ts = self.ts.timestripper - txt_match = ('%s[[Here is long enough text]]%s' - % (self.date[:9], self.date[9:])) + txt_match = ('{}[[Here is long enough text]]{}' + .format(self.date[:9], self.date[9:])) self.assertEqual(ts(txt_match), None) txt_match = self.date[:9] + '[[foo]]' + self.date[9:] -- To view, visit https://gerrit.wikimedia.org/r/463250 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: I272002c177aa8e95feb2f9b994ea95897f926778 Gerrit-Change-Number: 463250 Gerrit-PatchSet: 8 Gerrit-Owner: D3r1ck01 &lt;alangiderick(a)gmail.com&gt; Gerrit-Reviewer: D3r1ck01 &lt;alangiderick(a)gmail.com&gt; Gerrit-Reviewer: John Vandenberg &lt;jayvdb(a)gmail.com&gt; Gerrit-Reviewer: Xqt &lt;info(a)gno.de&gt; Gerrit-Reviewer: jenkins-bot (75)