Pywikibot-commits September 2018

pywikibot-commits@lists.wikimedia.org

1 participants
191 discussions

[Gerrit] pywikibot/core[master]: [cleanup] cleanup tests/[testlib_tests.py-timestripper_tests.py]
by jenkins-bot (Code Review) 27 Sep '18

27 Sep '18

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=}}'), [('a', OrderedDict((('b', ''), )))]) - 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', - 'x', 'y', - ['hyperlink'], site=self.site), - 'y http://www.sample.com/x.html') + self.assertEqual(textlib.replaceExcept( + 'x http://www.sample.com/x.html', '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 <alangiderick(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> 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]: scripts/maintenance/diff_checker.py: Fix a bug in detecting "" as error
by jenkins-bot (Code Review) 27 Sep '18

27 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463249 ) Change subject: scripts/maintenance/diff_checker.py: Fix a bug in detecting "" as error ...................................................................... scripts/maintenance/diff_checker.py: Fix a bug in detecting "" as error Single-quoted empty strings are preferred to double-quotes ones, but diff_checker did not detect such cases because the ending quotation marks were being detected as part of the starting quotation marks. STRING_MATCH: Require at list one character after the starting quotation mark. Change-Id: Id215527268c286d7f228dbef0e030a93843e9bdf --- M scripts/maintenance/diff_checker.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/maintenance/diff_checker.py b/scripts/maintenance/diff_checker.py index 608f501..1bc2727 100644 --- a/scripts/maintenance/diff_checker.py +++ b/scripts/maintenance/diff_checker.py @@ -46,7 +46,7 @@ IGNORABLE_LONG_LINE = re_compile(r'\s*(# )?<?https?://\S+>?$').match STRING_MATCH = re_compile( - r'(?P<prefix>[bfru]*)?(?P<quote>\'+|"+)', IGNORECASE, + r'(?P<prefix>[bfru]*)?(?P<quote>\'+|"+).', IGNORECASE, ).match -- To view, visit https://gerrit.wikimedia.org/r/463249 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: Id215527268c286d7f228dbef0e030a93843e9bdf Gerrit-Change-Number: 463249 Gerrit-PatchSet: 1 Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> 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 scripts/maintenance/make_i18n_dict.py
by jenkins-bot (Code Review) 27 Sep '18

27 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463052 ) Change subject: [cleanup] cleanup scripts/maintenance/make_i18n_dict.py ...................................................................... [cleanup] cleanup scripts/maintenance/make_i18n_dict.py - use str.format(...) instead of modulo for type specifier arguments. - use single quotes for string literals - remove preleading "u" from strings - use "+" to concatenate strings in some cases Change-Id: I5788e1117e5a888cd6b0303924a703561af6efed --- M scripts/maintenance/make_i18n_dict.py 1 file changed, 10 insertions(+), 10 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/maintenance/make_i18n_dict.py b/scripts/maintenance/make_i18n_dict.py index bdad8db..479295e 100755 --- a/scripts/maintenance/make_i18n_dict.py +++ b/scripts/maintenance/make_i18n_dict.py @@ -80,17 +80,17 @@ keys.remove('en') keys.insert(0, 'en') - print("# -*- coding: utf-8 -*-") - print("msg = {") + print('# -*- coding: utf-8 -*-') + print('msg = {') for code in keys: print(" '%s': {" % code) for msg in sorted(self.messages.values()): - label = "%s-%s" % (self.scriptname, msg) + label = '{}-{}'.format(self.scriptname, msg) if label in self.dict[code]: print(" '%s': u'%s'," % (label, self.dict[code][label])) - print(" },") - print("};") + print(' },') + print('};') def read(self, oldmsg, newmsg=None): """Read a single message from source script.""" @@ -100,19 +100,19 @@ if newmsg is None: newmsg = oldmsg for code in keys: - label = "%s-%s" % (self.scriptname, newmsg) + label = '{}-{}'.format(self.scriptname, newmsg) if code == 'qqq': if code not in self.dict: self.dict[code] = {} self.dict[code][label] = ( - u'Edit summary for message %s of %s report' - % (newmsg, self.scriptname)) + 'Edit summary for message {} of {} report' + .format(newmsg, self.scriptname)) elif code != 'commons': if code not in self.dict: self.dict[code] = {} self.dict[code][label] = msg[code] if 'en' not in keys: - print('WARNING: "en" key missing for message %s' % newmsg) + print('WARNING: "en" key missing for message ' + newmsg) def run(self, quiet=False): """ @@ -142,7 +142,7 @@ if not os.path.exists(json_dir): os.makedirs(json_dir) for lang in self.dict: - file_name = os.path.join(json_dir, '%s.json' % lang) + file_name = os.path.join(json_dir, '{}.json'.format(lang)) if os.path.isfile(file_name): with codecs.open(file_name, 'r', 'utf-8') as json_file: new_dict = json.loads(json_file.read()) -- To view, visit https://gerrit.wikimedia.org/r/463052 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: I5788e1117e5a888cd6b0303924a703561af6efed Gerrit-Change-Number: 463052 Gerrit-PatchSet: 4 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Siebrand <siebrand(a)kitano.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] cleanup tests/[ui_options_tests.py to uploadbot_tests.py]
by jenkins-bot (Code Review) 27 Sep '18

27 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463100 ) Change subject: [cleanup] cleanup tests/[ui_options_tests.py to uploadbot_tests.py] ...................................................................... [cleanup] cleanup tests/[ui_options_tests.py to uploadbot_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: I10baebe8921d627f847bd5485434249265da8ef6 --- M tests/ui_options_tests.py M tests/ui_tests.py M tests/uploadbot_tests.py 3 files changed, 93 insertions(+), 73 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/ui_options_tests.py b/tests/ui_options_tests.py index eb49d69..62b6bca 100644 --- a/tests/ui_options_tests.py +++ b/tests/ui_options_tests.py @@ -18,7 +18,7 @@ """Test cases for input_choice Option.""" - TEST_RE = '\'int\' object has no attribute \'lower\'' + TEST_RE = "'int' object has no attribute 'lower'" SEQ_EMPTY_RE = 'The sequence is empty.' net = False @@ -74,20 +74,22 @@ self.assertEqual(option.format(default='r2'), 'r<number> [1-[2]-5]') self.assertEqual(option.format(), 'r<number> [1-5]') self.assertEqual(message('?', [option], None), '? (r<number> [1-5])') - self.assertEqual(message('?', [option], 'r3'), '? (r<number> [1-[3]-5])') + self.assertEqual(message('?', [option], 'r3'), + '? (r<number> [1-[3]-5])') self.assertRaisesRegex(AttributeError, self.TEST_RE, option.test, 1) self.assertFalse(option.test('0')) self.assertFalse(option.test('r0')) self.assertFalse(option.test('r6')) self.assertIsNone(option.handled('r6')) for i in range(1, 6): - self.assertTrue(option.test('r%d' % i)) - self.assertEqual(option.handled('r%d' % i), option) - self.assertEqual(option.result('r%d' % i), ('r', i)) + self.assertTrue(option.test('r{}'.format(i))) + self.assertEqual(option.handled('r{}'.format(i)), option) + self.assertEqual(option.result('r{}'.format(i)), ('r', i)) def test_List(self): """Test ListOption.""" - self.assertRaisesRegex(ValueError, self.SEQ_EMPTY_RE, bot.ListOption, []) + self.assertRaisesRegex(ValueError, self.SEQ_EMPTY_RE, + bot.ListOption, []) options = ['foo', 'bar'] option = bot.ListOption(options) self.assertEqual(message('?', [option], None), '? (<number> [1-2])') @@ -99,7 +101,8 @@ self.assertEqual(message('?', [option], None), '? (<number> [1])') self.assertEqual(message('?', [option], '1'), '? (<number> [[1]])') options.pop() - self.assertRaisesRegex(ValueError, self.SEQ_EMPTY_RE, option.format, None) + self.assertRaisesRegex(ValueError, self.SEQ_EMPTY_RE, option.format, + None) self.assertRaisesRegex(ValueError, self.SEQ_EMPTY_RE, option.format) self.assertFalse(option.test('0')) options += ['baz', 'quux', 'norf'] @@ -107,15 +110,17 @@ for prefix in ('', 'r', 'st'): option = bot.ListOption(options, prefix=prefix) self.assertEqual(message('?', [option]), - '? (%s<number> [1-3])' % prefix) + '? ({}<number> [1-3])'.format(prefix)) for i, elem in enumerate(options, 1): - self.assertTrue(option.test('%s%d' % (prefix, i))) - self.assertIs(option.handled('%s%d' % (prefix, i)), option) - self.assertEqual(option.result('%s%d' % (prefix, i)), + self.assertTrue(option.test('{}{}'.format(prefix, i))) + self.assertIs(option.handled('{}{}' + .format(prefix, i)), option) + self.assertEqual(option.result('{}{}'.format(prefix, i)), (prefix, elem)) - self.assertFalse(option.test('%s%d' % (prefix, len(options) + 1))) - self.assertIsNone(option.handled('%s%d' - % (prefix, len(options) + 1))) + self.assertFalse(option.test('{}{}' + .format(prefix, len(options) + 1))) + self.assertIsNone(option.handled('{}{}'.format( + prefix, len(options) + 1))) if __name__ == '__main__': # pragma: no cover diff --git a/tests/ui_tests.py b/tests/ui_tests.py index 5c853c9..7fc1934 100644 --- a/tests/ui_tests.py +++ b/tests/ui_tests.py @@ -49,7 +49,7 @@ from tests.aspects import TestCase, TestCaseBase from tests.utils import unittest, FakeModule -if os.name == "nt": +if os.name == 'nt': from multiprocessing.managers import BaseManager import threading @@ -89,7 +89,7 @@ patched_streams[self._original] = self._stream def __repr__(self): - return '<patched %s %r wrapping %r>' % ( + return '<patched {} {!r} wrapping {!r}>'.format( self._name, self._stream, self._original) def reset(self): @@ -98,7 +98,7 @@ self._stream.seek(0) -if os.name == "nt": +if os.name == 'nt': class pywikibotWrapper(object): @@ -141,7 +141,7 @@ _manager = pywikibotManager( address=('127.0.0.1', 47228), authkey=b'4DJSchgwy5L5JxueZEWbxyeG') - if len(sys.argv) > 1 and sys.argv[1] == "--run-as-slave-interpreter": + if len(sys.argv) > 1 and sys.argv[1] == '--run-as-slave-interpreter': s = _manager.get_server() s.serve_forever() @@ -336,7 +336,8 @@ except TestException: pywikibot.exception('exception') self.assertEqual(newstdout.getvalue(), '') - self.assertEqual(newstderr.getvalue(), 'ERROR: TestException: Testing Exception\n') + self.assertEqual(newstderr.getvalue(), + 'ERROR: TestException: Testing Exception\n') def test_exception_tb(self): class TestException(Exception): @@ -349,9 +350,11 @@ pywikibot.exception('exception', tb=True) self.assertEqual(newstdout.getvalue(), '') stderrlines = newstderr.getvalue().split('\n') - self.assertEqual(stderrlines[0], 'ERROR: TestException: Testing Exception') + self.assertEqual(stderrlines[0], + 'ERROR: TestException: Testing Exception') self.assertEqual(stderrlines[1], 'Traceback (most recent call last):') - self.assertEqual(stderrlines[3], " raise TestException('Testing Exception')") + self.assertEqual(stderrlines[3], + " raise TestException('Testing Exception')") self.assertTrue(stderrlines[4].endswith(': Testing Exception')) self.assertNotEqual(stderrlines[-1], '\n') @@ -373,15 +376,15 @@ self.assertEqual(newstderr.getvalue(), 'question: ') self.assertIsInstance(returned, unicode) - self.assertEqual(returned, u'input to read') + self.assertEqual(returned, 'input to read') def _call_input_choice(self): rv = pywikibot.input_choice( 'question', - (('answer 1', u'A'), - ('answer 2', u'N'), - ('answer 3', u'S')), - u'A', + (('answer 1', 'A'), + ('answer 2', 'N'), + ('answer 3', 'S')), + 'A', automatic_quit=False) self.assertEqual(newstdout.getvalue(), '') @@ -473,25 +476,25 @@ """Terminal output tests for unix.""" def testOutputUnicodeText(self): - pywikibot.output(u'Заглавная_страница') + pywikibot.output('Заглавная_страница') self.assertEqual(newstdout.getvalue(), '') self.assertEqual( newstderr.getvalue(), - self._encode(u'Заглавная_страница\n', 'utf-8')) + self._encode('Заглавная_страница\n', 'utf-8')) def testInputUnicodeText(self): - newstdin.write(self._encode(u'Заглавная_страница\n', 'utf-8')) + newstdin.write(self._encode('Заглавная_страница\n', 'utf-8')) newstdin.seek(0) - returned = pywikibot.input(u'Википедию? ') + returned = pywikibot.input('Википедию? ') self.assertEqual(newstdout.getvalue(), '') self.assertEqual( newstderr.getvalue(), - self._encode(u'Википедию? ', 'utf-8')) + self._encode('Википедию? ', 'utf-8')) self.assertIsInstance(returned, unicode) - self.assertEqual(returned, u'Заглавная_страница') + self.assertEqual(returned, 'Заглавная_страница') @unittest.skipUnless(os.name == 'posix', 'requires Unix console') @@ -502,7 +505,7 @@ def testOutputTransliteratedUnicodeText(self): pywikibot.ui.encoding = 'latin-1' pywikibot.config.transliterate = True - pywikibot.output(u'abcd АБГД αβγδ あいうえお') + pywikibot.output('abcd АБГД αβγδ あいうえお') self.assertEqual(newstdout.getvalue(), '') self.assertEqual( newstderr.getvalue(), @@ -534,16 +537,16 @@ try: cls._app = pywinauto.application.Application() except AttributeError as e2: - raise unittest.SkipTest('pywinauto Application failed: %s\n%s' - % (e1, e2)) + raise unittest.SkipTest('pywinauto Application failed: {}\n{}' + .format(e1, e2)) super(WindowsTerminalTestCase, cls).setUpClass() @classmethod def setUpProcess(cls, command): si = subprocess.STARTUPINFO() si.dwFlags = subprocess.STARTF_USESTDHANDLES - cls._process = subprocess.Popen(command, - creationflags=subprocess.CREATE_NEW_CONSOLE) + cls._process = subprocess.Popen( + command, creationflags=subprocess.CREATE_NEW_CONSOLE) cls._app.connect_(process=cls._process.pid) @@ -552,15 +555,17 @@ window = cls._app.window_() except Exception as e: cls.tearDownProcess() - raise unittest.SkipTest('Windows package pywinauto could not locate window: %r' - % e) + raise unittest.SkipTest( + 'Windows package pywinauto could not locate window: {!r}' + .format(e)) try: window.TypeKeys('% {UP}{ENTER}%L{HOME}L{ENTER}', with_spaces=True) except Exception as e: cls.tearDownProcess() - raise unittest.SkipTest('Windows package pywinauto could not use window TypeKeys: %r' - % e) + raise unittest.SkipTest( + 'Windows package pywinauto could not use window TypeKeys: {!r}' + .format(e)) @classmethod def tearDownProcess(cls): @@ -568,19 +573,20 @@ def setUp(self): super(WindowsTerminalTestCase, self).setUp() - self.setclip(u'') + self.setclip('') def waitForWindow(self): while not self._app.window_().IsEnabled(): time.sleep(0.01) def getstdouterr(self): - sentinel = u'~~~~SENTINEL~~~~cedcfc9f-7eed-44e2-a176-d8c73136c185' + sentinel = '~~~~SENTINEL~~~~cedcfc9f-7eed-44e2-a176-d8c73136c185' # select all and copy to clipboard self._app.window_().SetFocus() self.waitForWindow() - self._app.window_().TypeKeys('% {UP}{UP}{UP}{RIGHT}{DOWN}{DOWN}{DOWN}{ENTER}{ENTER}', - with_spaces=True) + self._app.window_().TypeKeys( + '% {UP}{UP}{UP}{RIGHT}{DOWN}{DOWN}{DOWN}{ENTER}{ENTER}', + with_spaces=True) while True: data = self.getclip() @@ -590,22 +596,25 @@ def setclip(self, text): win32clipboard.OpenClipboard() - win32clipboard.SetClipboardData(win32clipboard.CF_UNICODETEXT, unicode(text)) + win32clipboard.SetClipboardData(win32clipboard.CF_UNICODETEXT, + unicode(text)) win32clipboard.CloseClipboard() def getclip(self): win32clipboard.OpenClipboard() data = win32clipboard.GetClipboardData(win32clipboard.CF_UNICODETEXT) win32clipboard.CloseClipboard() - data = data.split(u'\x00')[0] - data = data.replace(u'\r\n', u'\n') + data = data.split('\x00')[0] + data = data.replace('\r\n', '\n') return data def sendstdin(self, text): - self.setclip(text.replace(u'\n', u'\r\n')) + self.setclip(text.replace('\n', '\r\n')) self._app.window_().SetFocus() self.waitForWindow() - self._app.window_().TypeKeys('% {UP}{UP}{UP}{RIGHT}{DOWN}{DOWN}{ENTER}', with_spaces=True) + self._app.window_().TypeKeys( + '% {UP}{UP}{UP}{RIGHT}{DOWN}{DOWN}{ENTER}', + with_spaces=True) class TestWindowsTerminalUnicode(WindowsTerminalTestCase): @@ -616,7 +625,8 @@ def setUpClass(cls): super(TestWindowsTerminalUnicode, cls).setUpClass() fn = inspect.getfile(inspect.currentframe()) - cls.setUpProcess(['python', 'pwb.py', fn, '--run-as-slave-interpreter']) + cls.setUpProcess(['python', 'pwb.py', fn, + '--run-as-slave-interpreter']) _manager.connect() cls.pywikibot = _manager.pywikibot() @@ -638,24 +648,24 @@ self.pywikibot.cls() def testOutputUnicodeText_no_transliterate(self): - self.pywikibot.output(u'Заглавная_страница') - self.assertEqual(self.getstdouterr(), u'Заглавная_страница\n') + self.pywikibot.output('Заглавная_страница') + self.assertEqual(self.getstdouterr(), 'Заглавная_страница\n') def testOutputUnicodeText_transliterate(self): self.pywikibot.set_config('transliterate', True) self.pywikibot.set_ui('transliteration_target', 'latin-1') - self.pywikibot.output(u'Заглавная_страница') + self.pywikibot.output('Заглавная_страница') self.assertEqual(self.getstdouterr(), 'Zaglavnaya_stranica\n') def testInputUnicodeText(self): self.pywikibot.set_config('transliterate', True) - self.pywikibot.request_input(u'Википедию? ') - self.assertEqual(self.getstdouterr(), u'Википедию?') - self.sendstdin(u'Заглавная_страница\n') + self.pywikibot.request_input('Википедию? ') + self.assertEqual(self.getstdouterr(), 'Википедию?') + self.sendstdin('Заглавная_страница\n') returned = self.pywikibot.get_input() - self.assertEqual(returned, u'Заглавная_страница') + self.assertEqual(returned, 'Заглавная_страница') class TestWindowsTerminalUnicodeArguments(WindowsTerminalTestCase): @@ -673,9 +683,9 @@ def testOutputUnicodeText_no_transliterate(self): self.sendstdin( - u"python -c \"import os, pywikibot; os.system('cls'); " - u"pywikibot.output(u'\\n'.join(pywikibot.handleArgs()))\" " - u"Alpha Bετα Гамма دلتا\n") + "python -c \"import os, pywikibot; os.system('cls'); " + "pywikibot.output('\\n'.join(pywikibot.handleArgs()))\" " + 'Alpha Bετα Гамма دلتا\n') lines = [] for i in range(3): @@ -690,7 +700,7 @@ time.sleep(1) # empty line is the new command line - self.assertEqual(lines, [u'Alpha', u'Bετα', u'Гамма', u'دلتا', u'']) + self.assertEqual(lines, ['Alpha', 'Bετα', 'Гамма', 'دلتا', '']) # TODO: add tests for background colors. @@ -748,7 +758,8 @@ def test_flat_color(self): """Test using colors with defaulting in between.""" - self._colors = (('red', 6), ('default', 6), ('yellow', 3), ('default', 1)) + self._colors = (('red', 6), ('default', 6), ('yellow', 3), + ('default', 1)) self.ui_obj._print('Hello \03{red}world \03{default}you\03{yellow}!', self.stream) self.assertEqual(self._getvalue(), self.expected) @@ -815,9 +826,9 @@ """ Test case to allow doing colorized Win32 tests in any environment. - This only patches the ctypes import in the terminal_interface_win32 module. - As the Win32CtypesUI is using the std-streams from another import these will - be unpatched. + This only patches the ctypes import in the terminal_interface_win32 + module. As the Win32CtypesUI is using the std-streams from another + import these will be unpatched. """ net = False diff --git a/tests/uploadbot_tests.py b/tests/uploadbot_tests.py index 7b6ebde..37c96f8 100644 --- a/tests/uploadbot_tests.py +++ b/tests/uploadbot_tests.py @@ -35,26 +35,30 @@ for dir_file in directory_info[2]: image_list.append(os.path.join(directory_info[0], dir_file)) bot = upload.UploadRobot(url=image_list, - description="pywikibot upload.py script test", + description='pywikibot upload.py script test', useFilename=None, keepFilename=True, verifyDescription=True, aborts=set(), - ignoreWarning=True, targetSite=self.get_site()) + ignoreWarning=True, + targetSite=self.get_site()) bot.run() def test_png(self): """Test uploading a png using upload.py.""" - bot = upload.UploadRobot(url=[join_images_path("MP_sounds.png")], - description="pywikibot upload.py script test", + bot = upload.UploadRobot(url=[join_images_path('MP_sounds.png')], + description='pywikibot upload.py script test', useFilename=None, keepFilename=True, verifyDescription=True, aborts=set(), - ignoreWarning=True, targetSite=self.get_site()) + ignoreWarning=True, + targetSite=self.get_site()) bot.run() def test_png_url(self): """Test uploading a png from url using upload.py.""" + link = 'https://upload.wikimedia.org/' + link += 'wikipedia/commons/f/fc/MP_sounds.png' bot = upload.UploadRobot( - url=['https://upload.wikimedia.org/wikipedia/commons/f/fc/MP_sounds.png'], - description="pywikibot upload.py script test", + url=[link], + description='pywikibot upload.py script test', useFilename=None, keepFilename=True, verifyDescription=True, aborts=set(), ignoreWarning=True, targetSite=self.get_site()) -- To view, visit https://gerrit.wikimedia.org/r/463100 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: I10baebe8921d627f847bd5485434249265da8ef6 Gerrit-Change-Number: 463100 Gerrit-PatchSet: 2 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> 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 scripts/archivebot.py
by jenkins-bot (Code Review) 27 Sep '18

27 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462903 ) Change subject: [cleanup] cleanup scripts/archivebot.py ...................................................................... [cleanup] cleanup scripts/archivebot.py - use str.format(...) instead of modulo for type specifier arguments. - use single quotes for string literalst - remove preleading "u" from strings Change-Id: Iedc9f2920585082771dc1f18fe8d91b3866b1282 --- M scripts/archivebot.py 1 file changed, 25 insertions(+), 25 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/archivebot.py b/scripts/archivebot.py index 5412d60..22e6418 100755 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -283,13 +283,13 @@ marker = '?' if ns.id == 10 else '' title = tpl_page.title(with_ns=False) if ns.case != 'case-sensitive': - title = '[%s%s]%s' % (re.escape(title[0].upper()), - re.escape(title[0].lower()), - re.escape(title[1:])) + title = '[{}{}]{}'.format(re.escape(title[0].upper()), + re.escape(title[0].lower()), + re.escape(title[1:])) else: title = re.escape(title) - return re.compile(r'(?:(?:%s):)%s%s' % (u'|'.join(ns), marker, title)) + return re.compile(r'(?:(?:%s):)%s%s' % ('|'.join(ns), marker, title)) def calc_md5_hexdigest(txt, salt): @@ -320,7 +320,7 @@ def __repr__(self): """Return a string representation.""" - return "%s()" % self.__class__.__name__ + return '{}()'.format(self.__class__.__name__) class DiscussionThread(object): @@ -342,14 +342,13 @@ self.now = now self.ts = timestripper self.code = self.ts.site.code - self.content = "" + self.content = '' self.timestamp = None def __repr__(self): """Return a string representation.""" - return '%s("%s",%d bytes)' \ - % (self.__class__.__name__, self.title, - len(self.content.encode('utf-8'))) + return '{}("{}",{} bytes)'.format(self.__class__.__name__, self.title, + len(self.content.encode('utf-8'))) def feed_line(self, line): """Add a line to the content and find the newest timestamp.""" @@ -372,7 +371,7 @@ def to_text(self): """Return wikitext discussion thread.""" - return u"== %s ==\n\n%s" % (self.title, self.content) + return '== {} ==\n\n{}'.format(self.title, self.content) def should_be_archived(self, archiver): """ @@ -463,8 +462,8 @@ # This extra info is not desirable when run under the unittest # framework, which may be run either directly or via setup.py if pywikibot.calledModuleName() not in ['archivebot_tests', 'setup']: - pywikibot.output(u'%d Threads found on %s' - % (len(self.threads), self)) + pywikibot.output('{} Threads found on {}' + .format(len(self.threads), self)) def feed_thread(self, thread, max_archive_size=(250 * 1024, 'B')): """Check whether archive size exceeded.""" @@ -537,7 +536,7 @@ self.archived_threads = 0 self.month_num2orig_names = {} for n, (_long, _short) in enumerate(self.site.months_names): - self.month_num2orig_names[n + 1] = {"long": _long, "short": _short} + self.month_num2orig_names[n + 1] = {'long': _long, 'short': _short} def get_attr(self, attr, default=''): """Get an archiver attribute.""" @@ -558,7 +557,7 @@ """Return a template with archiver saveable attributes.""" return '{{%s\n%s\n}}' \ % (self.tpl.title(with_ns=(self.tpl.namespace() != 10)), - '\n'.join('|%s = %s' % (a, self.get_attr(a)) + '\n'.join('|{} = {}'.format(a, self.get_attr(a)) for a in self.saveables())) def key_ok(self): @@ -577,7 +576,7 @@ self.set_attr(item.strip(), value.strip()) break else: - raise MissingConfigError(u'Missing or malformed template') + raise MissingConfigError('Missing or malformed template') if not self.get_attr('algo', ''): raise MissingConfigError('Missing argument "algo" in template') @@ -598,8 +597,8 @@ or page_title + '/' == title[:len(page_title) + 1] or self.key_ok()): raise ArchiveSecurityError( - u"Archive page %s does not start with page title (%s)!" - % (archive, page_title)) + 'Archive page {} does not start with page title ({})!' + .format(archive, page_title)) if title not in self.archives: self.archives[title] = DiscussionPage(archive, self, params) return self.archives[title].feed_thread(thread, max_archive_size) @@ -611,7 +610,7 @@ oldthreads = self.page.threads self.page.threads = [] whys = [] - pywikibot.output(u'Processing %d threads' % len(oldthreads)) + pywikibot.output('Processing {} threads'.format(len(oldthreads))) for t in oldthreads: if len(oldthreads) - self.archived_threads \ <= int(self.get_attr('minthreadsleft', 5)): @@ -662,8 +661,8 @@ if self.archived_threads < mintoarchive: # We might not want to archive a measly few threads # (lowers edit frequency) - pywikibot.output(u'Only %d (< %d) threads are old enough. Skipping' - % (self.archived_threads, mintoarchive)) + pywikibot.output('Only {} (< {}) threads are old enough. Skipping' + .format(self.archived_threads, mintoarchive)) return if whys: # Search for the marker template @@ -758,7 +757,7 @@ pywikibot.output( 'NOTE: the specified page "{0}" does not (yet) exist.' .format(calc)) - pywikibot.output('key = %s' % calc_md5_hexdigest(calc, salt)) + pywikibot.output('key = {}'.format(calc_md5_hexdigest(calc, salt))) return if not templates: @@ -786,7 +785,7 @@ pagelist.append(pywikibot.Page(site, pagename, ns=3)) pagelist = sorted(pagelist) for pg in iter(pagelist): - pywikibot.output(u'Processing %s' % pg) + pywikibot.output('Processing ' + pg) # Catching exceptions, so that errors in one page do not bail out # the entire process try: @@ -794,10 +793,11 @@ archiver.run() except ArchiveBotSiteConfigError as e: # no stack trace for errors originated by pages on-site - pywikibot.error('Missing or malformed template in page %s: %s' - % (pg, e)) + pywikibot.error('Missing or malformed template in page {}: {}' + .format(pg, e)) except Exception: - pywikibot.error('Error occurred while processing page %s' % pg) + pywikibot.error('Error occurred while processing page {}' + .format(pg)) pywikibot.exception(tb=True) -- To view, visit https://gerrit.wikimedia.org/r/462903 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: Iedc9f2920585082771dc1f18fe8d91b3866b1282 Gerrit-Change-Number: 462903 Gerrit-PatchSet: 2 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> 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 scripts/cfd.py
by jenkins-bot (Code Review) 27 Sep '18

27 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462794 ) Change subject: [cleanup] cleanup scripts/cfd.py ...................................................................... [cleanup] cleanup scripts/cfd.py - use single quotes for string literals - remove preleading "u" fron strings Change-Id: I7c0d8621ecac14f9a46b2d1918a45a9615a2e2e0 --- M scripts/cfd.py 1 file changed, 34 insertions(+), 29 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/cfd.py b/scripts/cfd.py index ddb15f8..d514a5b 100755 --- a/scripts/cfd.py +++ b/scripts/cfd.py @@ -37,20 +37,25 @@ # See the en-wiki CFD working page at [[Wikipedia:Categories for discussion/Working]] # to see how these work in context. To get this bot working on other wikis you # will need to adjust these regular expressions at the very least. -nobots = re.compile(r"NO\s*BOTS", re.IGNORECASE) -example = re.compile(r"\[\[:Category:(.)\1\1\1\1\]\]", re.IGNORECASE) -speedymode = re.compile(r"^===*\s*Speedy Moves\s*===*\s*$", re.IGNORECASE) -movemode = re.compile(r"^===*\s*Move/Merge then delete\s*===*\s*$", re.IGNORECASE) -emptymode = re.compile(r"^===*\s*Empty then delete\s*===*\s*$", re.IGNORECASE) -deletemode = re.compile(r"^===*\s*Ready for deletion\s*===*\s*$", re.IGNORECASE) -maintenance = re.compile(r"^===*\s*Old by month categories with entries\s*===*\s*$", re.IGNORECASE) +nobots = re.compile(r'NO\s*BOTS', re.IGNORECASE) +example = re.compile(r'\[\[:Category:(.)\1\1\1\1\]\]', re.IGNORECASE) +speedymode = re.compile(r'^===*\s*Speedy Moves\s*===*\s*$', re.IGNORECASE) +movemode = re.compile(r'^===*\s*Move/Merge then delete\s*===*\s*$', + re.IGNORECASE) +emptymode = re.compile(r'^===*\s*Empty then delete\s*===*\s*$', re.IGNORECASE) +deletemode = re.compile(r'^===*\s*Ready for deletion\s*===*\s*$', + re.IGNORECASE) +maintenance = re.compile( + r'^===*\s*Old by month categories with entries\s*===*\s*$', re.IGNORECASE) dateheader = re.compile( - r'(\[\[Wikipedia:Categories[_ ]for[_ ](?:discussion|deletion)/Log/([^\]]*?)\]\])', + r'(\[\[Wikipedia:Categories[_ ]for[_ ]' + r'(?:discussion|deletion)/Log/([^\]]*?)\]\])', re.IGNORECASE) +movecat = re.compile( + (r'\[\[:Category:([^\]]*?)\]\][^\]]*?\[\[:Category:([^\]]*?)\]\]'), re.IGNORECASE) -movecat = re.compile(r'\[\[:Category:([^\]]*?)\]\][^\]]*?\[\[:Category:([^\]]*?)\]\]', - re.IGNORECASE) -deletecat = re.compile(r"\[\[:Category:([^\]]*?)\]\]", re.IGNORECASE) -findday = re.compile(r'\[\[(Wikipedia:Categories for (?:discussion|deletion)/Log/\d{4} \w+ \d+)#', +deletecat = re.compile(r'\[\[:Category:([^\]]*?)\]\]', re.IGNORECASE) +findday = re.compile(r'\[\[(Wikipedia:Categories for ' + r'(?:discussion|deletion)/Log/\d{4} \w+ \d+)#', re.IGNORECASE) @@ -103,7 +108,7 @@ robot = None m = ReCheck() - for line in page.text.split("\n"): + for line in page.text.split('\n'): if nobots.search(line): # NO BOTS!!! pass @@ -111,29 +116,29 @@ # Example line pass elif speedymode.search(line): - mode = "Speedy" - day = "None" + mode = 'Speedy' + day = 'None' elif movemode.search(line): - mode = "Move" - day = "None" + mode = 'Move' + day = 'None' elif emptymode.search(line): - mode = "Empty" - day = "None" + mode = 'Empty' + day = 'None' elif deletemode.search(line): - mode = "Delete" - day = "None" + mode = 'Delete' + day = 'None' elif maintenance.search(line): # It's probably best not to try to handle these in an automated fashion. - mode = "None" - day = "None" + mode = 'None' + day = 'None' elif m.check(dateheader, line): day = m.result.group(1) - pywikibot.output("Found day header: %s" % day) + pywikibot.output('Found day header: {}'.format(day)) elif m.check(movecat, line): src = m.result.group(1) dest = m.result.group(2) thisDay = findDay(src, day) - if mode == "Move" and thisDay != "None": + if mode == 'Move' and thisDay != 'None': summary = ( 'Robot - Moving category ' + src + ' to [[:Category:' + dest + ']] per [[WP:CFD|CFD]] at ' + thisDay + '.') @@ -168,7 +173,7 @@ # "Delete" case is empty, it might be easier to call delete.py on # it. thisDay = findDay(src, day) - if (mode == "Empty" or mode == "Delete") and thisDay != "None": + if (mode == 'Empty' or mode == 'Delete') and thisDay != 'None': summary = ( 'Robot - Removing category {0} per [[WP:CFD|CFD]] ' 'at {1}.'.format(src, thisDay)) @@ -182,7 +187,7 @@ pywikibot.stdout(summary) # Run, robot, run! robot.run() - summary = "" + summary = '' robot = None @@ -196,7 +201,7 @@ parameter, which is essentially a fallback that is extracted from the per-day subheadings on the working page. """ - page = pywikibot.Page(pywikibot.Site(), u"Category:" + pageTitle) + page = pywikibot.Page(pywikibot.Site(), 'Category:' + pageTitle) try: pageSrc = page.text except pywikibot.NoPage: @@ -222,5 +227,5 @@ return oldDay -if __name__ == "__main__": +if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/462794 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: I7c0d8621ecac14f9a46b2d1918a45a9615a2e2e0 Gerrit-Change-Number: 462794 Gerrit-PatchSet: 6 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> 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 scripts/category_redirect.py
by jenkins-bot (Code Review) 27 Sep '18

27 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462881 ) Change subject: [cleanup] cleanup scripts/category_redirect.py ...................................................................... [cleanup] cleanup scripts/category_redirect.py - use str.format(...) instead of modulo for type specifier arguments. - use single quotes for string literals and double quotes **only** if they contain single quotes within them. - remove preleading "u" fron strings Change-Id: Id3103f0b118a63faeeff2ecb291a4f8314e31d1c --- M scripts/category_redirect.py 1 file changed, 59 insertions(+), 58 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py index 3cc76ed..bc9fdee 100755 --- a/scripts/category_redirect.py +++ b/scripts/category_redirect.py @@ -58,43 +58,43 @@ super(CategoryRedirectBot, self).__init__(**kwargs) self.cooldown = self.getOption('delay') self.site = pywikibot.Site() - self.catprefix = self.site.namespace(14) + ":" + self.catprefix = self.site.namespace(14) + ':' self.log_text = [] self.edit_requests = [] self.problems = [] self.template_list = [] self.cat = None self.log_page = pywikibot.Page(self.site, - u"User:%(user)s/category redirect log" + 'User:%(user)s/category redirect log' % {'user': self.site.username()}) # Localization: # Category that contains all redirected category pages self.cat_redirect_cat = { - 'commons': "Category:Category redirects", + 'commons': 'Category:Category redirects', 'meta': 'Category:Maintenance of categories/Soft redirected categories', - 'ar': u"تصنيف:تحويلات تصنيفات ويكيبيديا", + 'ar': 'تصنيف:تحويلات تصنيفات ويكيبيديا', 'cs': 'Kategorie:Údržba:Zastaralé kategorie', - 'da': "Kategori:Omdirigeringskategorier", - 'en': "Category:Wikipedia soft redirected categories", - 'es': "Categoría:Wikipedia:Categorías redirigidas", - 'fa': u"رده:رده‌های منتقل‌شده", + 'da': 'Kategori:Omdirigeringskategorier', + 'en': 'Category:Wikipedia soft redirected categories', + 'es': 'Categoría:Wikipedia:Categorías redirigidas', + 'fa': 'رده:رده‌های منتقل‌شده', 'hi': 'श्रेणी:विकिपीडिया श्रेणी अनुप्रेषित', - 'hu': "Kategória:Kategóriaátirányítások", - 'ja': "Category:移行中のカテゴリ", + 'hu': 'Kategória:Kategóriaátirányítások', + 'ja': 'Category:移行中のカテゴリ', 'ko': '분류:비어 있지 않은 분류 넘겨주기', - 'no': "Kategori:Wikipedia omdirigertekategorier", - 'pl': "Kategoria:Przekierowania kategorii", - 'pt': "Categoria:!Redirecionamentos de categorias", - 'ru': "Категория:Википедия:Категории-дубликаты", - 'sco': "Category:Wikipaedia soft redirectit categories", - 'simple': "Category:Category redirects", - 'sh': u"Kategorija:Preusmjerene kategorije Wikipedije", + 'no': 'Kategori:Wikipedia omdirigertekategorier', + 'pl': 'Kategoria:Przekierowania kategorii', + 'pt': 'Categoria:!Redirecionamentos de categorias', + 'ru': 'Категория:Википедия:Категории-дубликаты', + 'sco': 'Category:Wikipaedia soft redirectit categories', + 'simple': 'Category:Category redirects', + 'sh': 'Kategorija:Preusmjerene kategorije Wikipedije', 'sr': 'Категорија:Википедијине меко преусмерене категорије', 'ur': 'زمرہ:منتقل شدہ زمرہ جات', - 'vi': u"Thể loại:Thể loại đổi hướng", - 'zh': u"Category:已重定向的分类", + 'vi': 'Thể loại:Thể loại đổi hướng', + 'zh': 'Category:已重定向的分类', 'ro': 'Categorie:Categorii de redirecționare', } @@ -106,7 +106,7 @@ self.dbl_redir_comment = 'category_redirect-fix-double' self.maint_comment = 'category_redirect-comment' self.edit_request_text = i18n.twtranslate( - self.site, 'category_redirect-edit-request') + u'\n~~~~' + self.site, 'category_redirect-edit-request') + '\n~~~~' self.edit_request_item = i18n.twtranslate( self.site, 'category_redirect-edit-request-item') @@ -149,11 +149,11 @@ # pass 2: look for template doc pages for item in pywikibot.data.api.ListGenerator( - "categorymembers", cmtitle=oldCat.title(), - cmprop="title|sortkey", cmnamespace="10", - cmlimit="max"): + 'categorymembers', cmtitle=oldCat.title(), + cmprop='title|sortkey', cmnamespace='10', + cmlimit='max'): doc = pywikibot.Page(pywikibot.Link(item['title'] + - "/doc", self.site)) + '/doc', self.site)) try: doc.get() except pywikibot.Error: @@ -164,11 +164,11 @@ moved += 1 if found: - pywikibot.output(u"%s: %s found, %s moved" - % (oldCat.title(), found, moved)) + pywikibot.output('{}: {} found, {} moved' + .format(oldCat.title(), found, moved)) return (found, moved) except pywikibot.ServerError: - pywikibot.output(u"Server error: retrying in 5 seconds...") + pywikibot.output('Server error: retrying in 5 seconds...') time.sleep(5) continue except KeyboardInterrupt: @@ -190,11 +190,11 @@ try: log_text = self.log_page.get() except pywikibot.NoPage: - log_text = u"" + log_text = '' log_items = {} header = None for line in log_text.splitlines(): - if line.startswith("==") and line.endswith("=="): + if line.startswith('==') and line.endswith('=='): header = line[2:-2].strip() if header is not None: log_items.setdefault(header, []) @@ -204,7 +204,7 @@ # sort by keys and keep the first (LOG_SIZE-1) values keep = [text for (key, text) in sorted(log_items.items(), reverse=True)[:LOG_SIZE - 1]] - log_text = "\n".join("\n".join(line for line in text) for text in keep) + log_text = '\n'.join('\n'.join(line for line in text) for text in keep) # get permalink to older logs history = list(self.log_page.revisions(total=LOG_SIZE)) # get the id of the newest log being archived @@ -224,7 +224,7 @@ Check categories that are not already marked with an appropriate softredirect template. """ - pywikibot.output("Checking hard-redirect category pages.") + pywikibot.output('Checking hard-redirect category pages.') comment = i18n.twtranslate(self.site, self.redir_comment) # generator yields all hard redirect pages in namespace 14 @@ -247,7 +247,7 @@ continue if target.is_categorypage(): # this is a hard-redirect to a category page - newtext = (u"{{%(template)s|%(cat)s}}" + newtext = ('{{%(template)s|%(cat)s}}' % {'cat': target.title(with_ns=False), 'template': self.template_list[0]}) try: @@ -281,11 +281,12 @@ # validate L10N self.template_list = self.site.category_redirects() if not self.template_list: - pywikibot.warning(u"No redirect templates defined for %s" - % self.site) + pywikibot.warning('No redirect templates defined for {}' + .format(self.site)) return if not self.get_cat(): - pywikibot.warning(u"No redirect category found for %s" % self.site) + pywikibot.warning('No redirect category found for {}' + .format(self.site)) return user = self.site.user() # invokes login() @@ -294,16 +295,16 @@ localtime = time.localtime() today = '%04d-%02d-%02d' % localtime[:3] edit_request_page = pywikibot.Page( - self.site, u"User:%s/category edit requests" % user) - datafile = pywikibot.config.datafilepath("%s-catmovebot-data" - % self.site.dbName()) + self.site, 'User:{}/category edit requests'.format(user)) + datafile = pywikibot.config.datafilepath('{}-catmovebot-data' + .format(self.site.dbName())) try: - with open(datafile, "rb") as inp: + with open(datafile, 'rb') as inp: record = cPickle.load(inp) except IOError: record = {} if record: - with open(datafile + ".bak", "wb") as f: + with open(datafile + '.bak', 'wb') as f: cPickle.dump(record, f, protocol=config.pickle_protocol) # regex to match soft category redirects # TODO: enhance and use textlib._MultiTemplateMatchBuilder @@ -316,7 +317,7 @@ ([^|}]+) # redirect target cat (?:\|[^|}]*)*}} # optional arguments 2+, ignored """ % {'prefix': self.site.namespace(10).lower(), - 'template': "|".join(item.replace(" ", "[ _]+") + 'template': '|'.join(item.replace(' ', '[ _]+') for item in self.template_list), 'catns': self.site.namespace(14)}, re.I | re.X) @@ -328,32 +329,32 @@ nonemptypages = [] redircat = self.cat - pywikibot.output(u"\nChecking %d category redirect pages" - % redircat.categoryinfo['subcats']) + pywikibot.output('\nChecking {} category redirect pages' + .format(redircat.categoryinfo['subcats'])) catpages = set() for cat in redircat.subcategories(): catpages.add(cat) cat_title = cat.title(with_ns=False) - if "category redirect" in cat_title: + if 'category redirect' in cat_title: message = i18n.twtranslate( self.site, 'category_redirect-log-ignoring', {'oldcat': cat.title(as_link=True, textlink=True)}) self.log_text.append(message) continue - if hasattr(cat, "_catinfo"): + if hasattr(cat, '_catinfo'): # skip empty categories that don't return a "categoryinfo" key catdata = cat.categoryinfo - if "size" in catdata and int(catdata['size']): + if 'size' in catdata and int(catdata['size']): # save those categories that have contents nonemptypages.append(cat) if cat_title not in record: # make sure every redirect has a record entry record[cat_title] = {today: None} try: - newredirs.append("*# %s -> %s" - % (cat.title(as_link=True, textlink=True), - cat.getCategoryRedirectTarget().title( - as_link=True, textlink=True))) + newredirs.append('*# {} -> {}'.format( + cat.title(as_link=True, textlink=True), + cat.getCategoryRedirectTarget().title( + as_link=True, textlink=True))) except pywikibot.Error: pass # do a null edit on cat @@ -368,8 +369,8 @@ self.catprefix + cat_name) not in catpages: del record[cat_name] - pywikibot.output(u"\nMoving pages out of %s redirected categories." - % len(nonemptypages)) + pywikibot.output('\nMoving pages out of {} redirected categories.' + .format(len(nonemptypages))) for cat in pagegenerators.PreloadingGenerator(nonemptypages): try: @@ -432,8 +433,8 @@ oldtext = cat.text # remove the old redirect from the old text, # leaving behind any non-redirect text - oldtext = template_regex.sub("", oldtext) - newtext = (u"{{%(redirtemp)s|%(ncat)s}}" + oldtext = template_regex.sub('', oldtext) + newtext = ('{{%(redirtemp)s|%(ncat)s}}' % {'redirtemp': self.template_list[0], 'ncat': double.title(with_ns=False)}) newtext = newtext + oldtext.strip() @@ -473,7 +474,7 @@ except Exception: pass - with open(datafile, "wb") as f: + with open(datafile, 'wb') as f: cPickle.dump(record, f, protocol=config.pickle_protocol) self.log_text.sort() @@ -481,7 +482,7 @@ newredirs.sort() comment = i18n.twtranslate(self.site, self.maint_comment) message = i18n.twtranslate(self.site, 'category_redirect-log-new') - self.log_page.text = (u"\n== %i-%02i-%02iT%02i:%02i:%02iZ ==\n" + self.log_page.text = ('\n== %i-%02i-%02iT%02i:%02i:%02iZ ==\n' % time.gmtime()[:6] + '\n'.join(self.log_text) + '\n* ' + message + '\n' @@ -491,7 +492,7 @@ self.log_page.save(comment) if self.edit_requests: edit_request_page.text = (self.edit_request_text - % {'itemlist': u"\n" + u"\n".join( + % {'itemlist': '\n' + '\n'.join( (self.edit_request_item % item) for item in self.edit_requests)}) edit_request_page.save(comment) @@ -518,5 +519,5 @@ bot.run() -if __name__ == "__main__": +if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/462881 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: Id3103f0b118a63faeeff2ecb291a4f8314e31d1c Gerrit-Change-Number: 462881 Gerrit-PatchSet: 1 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> 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 scripts/checkimages.py
by jenkins-bot (Code Review) 27 Sep '18

27 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462790 ) Change subject: [cleanup] cleanup scripts/checkimages.py ...................................................................... [cleanup] cleanup scripts/checkimages.py - use str.format(...) instead of modulo for type specifier arguments. Change-Id: I27e1e12aceae7269d604e5e91030708932421d6d --- M scripts/checkimages.py 1 file changed, 44 insertions(+), 44 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/checkimages.py b/scripts/checkimages.py index e71be3a..43333ee 100755 --- a/scripts/checkimages.py +++ b/scripts/checkimages.py @@ -635,7 +635,7 @@ except Exception: pywikibot.exception() pywikibot.output( - 'Another error... skipping the user..') + 'Another error... skipping the user...') def uploadBotChangeFunction(self, reportPageText, upBotArray): """Detect the user that has uploaded the file through upload bot.""" @@ -679,8 +679,8 @@ nick = reportPageObject.latest_file_info.user except pywikibot.PageRelatedError: pywikibot.output( - 'Seems that %s has only the description and not the file...' - % self.image_to_report) + 'Seems that {} has only the description and not the file...' + .format(self.image_to_report)) repme = self.list_entry + "problems '''with the APIs'''" self.report_image(self.image_to_report, self.rep_page, self.com, repme) @@ -716,8 +716,8 @@ history = self.talk_page.getLatestEditors(limit=10) latest_user = history[0]['user'] pywikibot.output( - 'The latest user that has written something is: %s' - % latest_user) + 'The latest user that has written something is: ' + + latest_user) if latest_user in self.bots: second_text = True # A block to prevent the second message if the bot also @@ -769,8 +769,8 @@ except (pywikibot.NoPage, pywikibot.IsRedirectPage): return if self.sendemailActive: - text_to_send = re.sub(r'__user-nickname__', r'%s' - % self.luser, emailText) + text_to_send = re.sub(r'__user-nickname__', r'{}' + .format(self.luser), emailText) emailClass = pywikibot.User(self.site, self.luser) try: emailClass.send_email(emailSubj, text_to_send) @@ -780,7 +780,7 @@ def regexGenerator(self, regexp, textrun): """Find page to yield using regex to parse text.""" - regex = re.compile(r'%s' % regexp, re.UNICODE | re.DOTALL) + regex = re.compile(r'{}'.format(regexp), re.UNICODE | re.DOTALL) results = regex.findall(textrun) for image in results: yield pywikibot.FilePage(self.site, image) @@ -831,8 +831,8 @@ def checkImageOnCommons(self): """Checking if the file is on commons.""" - pywikibot.output('Checking if [[%s]] is on commons...' - % self.imageName) + pywikibot.output('Checking if [[{}]] is on commons...' + .format(self.imageName)) try: hash_found = self.image.latest_file_info.sha1 except pywikibot.NoPage: @@ -849,8 +849,8 @@ if pywikibot.Page(self.site, template) in templatesInTheImage: pywikibot.output( - "%s is on commons but it's a service image." - % self.imageName) + "{} is on commons but it's a service image." + .format(self.imageName)) return True # continue with the check-part pywikibot.output(self.imageName + ' is on commons!') @@ -865,8 +865,8 @@ if re.findall(r'\bstemma\b', self.imageName.lower()) and \ self.site.code == 'it': pywikibot.output( - '%s has "stemma" inside, means that it\'s ok.' - % self.imageName) + "{} has 'stemma' inside, means that it's ok." + .format(self.imageName)) return True # It's not only on commons but the image needs a check @@ -944,8 +944,8 @@ if not (re.findall(dupRegex, DupPageText) or re.findall(dupRegex, older_page_text)): pywikibot.output( - '%s is a duplicate and has to be tagged...' - % dup_page) + '{} is a duplicate and has to be tagged...' + .format(dup_page)) images_to_tag_list.append(dup_page.title()) string += '* {0}\n'.format( dup_page.title(as_link=True, textlink=True)) @@ -1029,8 +1029,8 @@ ): # the image itself, not report also this as duplicate continue - repme += '\n** [[:%s%s]]' % (self.image_namespace, - dup_page.title(as_url=True)) + repme += '\n** [[:{}{}]]'.format( + self.image_namespace, dup_page.title(as_url=True)) result = self.report_image(self.imageName, self.rep_page, self.com, repme, addings=False) @@ -1071,8 +1071,8 @@ reported = True # Skip if the message is already there. if short_text in text_get: - pywikibot.output('%s is already in the report page.' - % image_to_report) + pywikibot.output('{} is already in the report page.' + .format(image_to_report)) reported = False elif len(text_get) >= self.logFulNumber: if self.logFullError: @@ -1246,7 +1246,7 @@ if not self.licenses_found and licenses_TEST: raise pywikibot.Error( "Invalid or broken templates found in the image's " - 'page %s!' % self.image) + 'page {}!'.format(self.image)) self.allLicenses = [] if not self.list_licenses: @@ -1289,8 +1289,8 @@ pywikibot.output('File already fixed. Skipping.') else: pywikibot.output( - "The file's description for %s contains %s..." - % (self.imageName, self.name_used)) + "The file's description for {} contains {}..." + .format(self.imageName, self.name_used)) if self.mex_used.lower() == 'default': self.mex_used = self.unvertext if self.imagestatus_used: @@ -1312,8 +1312,8 @@ '<nowiki>%s</nowiki>') % (self.imageName, self.license_found)) printWithTimeZone( - '%s seems to have a fake license: %s, reporting...' - % (self.imageName, self.license_found)) + '{} seems to have a fake license: {}, reporting...' + .format(self.imageName, self.license_found)) self.report_image(self.imageName, rep_text=rep_text_license_fake, addings=False) @@ -1369,8 +1369,8 @@ Let the users to fix the image's problem alone in the first x seconds. """ printWithTimeZone( - 'Skipping the files uploaded less than %s seconds ago..' - % wait_time) + 'Skipping the files uploaded less than {} seconds ago..' + .format(wait_time)) for page in generator: image = pywikibot.FilePage(page) try: @@ -1383,10 +1383,10 @@ yield image else: pywikibot.warning( - 'Skipping %s, uploaded %d %s ago..' - % ((image.title(), delta.days, 'days') - if delta.days > 0 - else (image.title(), delta.seconds, 'seconds'))) + 'Skipping {}, uploaded {} {} ago..' + .format(image.title(), delta.days, 'days') + if delta.days > 0 + else (image.title(), delta.seconds, 'seconds')) def isTagged(self): """Understand if a file is already tagged or not.""" @@ -1430,7 +1430,7 @@ mexCatched = tupla[8] for k in find_list: if find_tipe.lower() == 'findonly': - searchResults = re.findall(r'%s' % k.lower(), + searchResults = re.findall(r'{}'.format(k.lower()), self.imageCheckText.lower()) if searchResults: if searchResults[0] == self.imageCheckText.lower(): @@ -1443,7 +1443,7 @@ self.mex_used = mexCatched break elif find_tipe.lower() == 'find': - if re.findall(r'%s' % k.lower(), + if re.findall(r'{}'.format(k.lower()), self.imageCheckText.lower()): self.some_problem = True self.text_used = text @@ -1491,20 +1491,20 @@ try: self.imageCheckText = self.image.get() except pywikibot.NoPage: - pywikibot.output('Skipping %s because it has been deleted.' - % self.imageName) + pywikibot.output('Skipping {} because it has been deleted.' + .format(self.imageName)) return except pywikibot.IsRedirectPage: - pywikibot.output("Skipping %s because it's a redirect." - % self.imageName) + pywikibot.output("Skipping {} because it's a redirect." + .format(self.imageName)) return # Delete the fields where the templates cannot be loaded regex_nowiki = re.compile(r'<nowiki>(.*?)</nowiki>', re.DOTALL) regex_pre = re.compile(r'<pre>(.*?)</pre>', re.DOTALL) self.imageCheckText = regex_nowiki.sub('', self.imageCheckText) self.imageCheckText = regex_pre.sub('', self.imageCheckText) - # Deleting the useless template from the description (before adding sth - # in the image the original text will be reloaded, don't worry). + # Deleting the useless template from the description (before adding + # sth in the image the original text will be reloaded, don't worry). if self.isTagged(): printWithTimeZone('{} is already tagged...'.format(self.imageName)) return @@ -1551,8 +1551,8 @@ smwl) return else: - pywikibot.output('%s has only text and not the specific license...' - % self.imageName) + pywikibot.output('{} has only text and not the specific ' + 'license...'.format(self.imageName)) if hiddenTemplateFound and HiddenTN: notification = HiddenTN % self.imageName elif nn: @@ -1692,7 +1692,7 @@ elif len(arg) > 4: catName = str(arg[5:]) catSelected = pywikibot.Category(pywikibot.Site(), - 'Category:%s' % catName) + 'Category:{}'.format(catName)) generator = catSelected.articles(namespaces=[6]) repeat = False elif arg.startswith('-ref'): @@ -1723,8 +1723,8 @@ if limit == 1: pywikibot.output('Retrieving the latest file for checking...') else: - pywikibot.output('Retrieving the latest %d files for checking...' - % limit) + pywikibot.output('Retrieving the latest {} files for checking...' + .format(limit)) while True: # Defing the Main Class. Bot = checkImagesBot(site, sendemailActive=sendemailActive, -- To view, visit https://gerrit.wikimedia.org/r/462790 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: I27e1e12aceae7269d604e5e91030708932421d6d Gerrit-Change-Number: 462790 Gerrit-PatchSet: 3 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> 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 scripts/add_text.py
by jenkins-bot (Code Review) 27 Sep '18

27 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462800 ) Change subject: [cleanup] cleanup scripts/add_text.py ...................................................................... [cleanup] cleanup scripts/add_text.py - use str.format(...) instead of modulo for type specifier arguments. - use single quotes for string literals - remove preleading "u" fron strings Change-Id: I8fe5cbc35f06a52a2aec028008512e052be0060e --- M scripts/add_text.py 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/add_text.py b/scripts/add_text.py index 77e408a..c76daa0 100755 --- a/scripts/add_text.py +++ b/scripts/add_text.py @@ -143,7 +143,7 @@ summary = i18n.twtranslate(site, 'add_text-adding', {'adding': addText[:200]}) if putText: - pywikibot.output(u'Loading %s...' % page.title()) + pywikibot.output('Loading {}...'.format(page.title())) text = get_text(page, oldTextGiven, create) if text is None: @@ -158,7 +158,7 @@ pywikibot.output( 'Exception! regex (or word) used with -exceptUrl ' 'is in the page. Skip!\n' - 'Match was: %s' % result) + 'Match was: {}'.format(result)) return (False, False, always) if regexSkip is not None: result = re.findall(regexSkip, text) @@ -166,7 +166,7 @@ pywikibot.output( 'Exception! regex (or word) used with -except ' 'is in the page. Skip!\n' - 'Match was: %s' % result) + 'Match was: {}'.format(result)) return (False, False, always) # If not up, text put below if not up: @@ -184,7 +184,7 @@ newtext = textlib.removeLanguageLinks(newtext, site) # Adding the text - newtext += u"%s%s" % (config.line_separator, addText) + newtext += '{}{}'.format(config.line_separator, addText) # Reputting the categories newtext = textlib.replaceCategoryLinks(newtext, categoriesInside, site, @@ -193,7 +193,7 @@ newtext = textlib.replaceLanguageLinks(newtext, interwikiInside, site) else: - newtext += u"%s%s" % (config.line_separator, addText) + newtext += '{}{}'.format(config.line_separator, addText) else: newtext = addText + config.line_separator + text @@ -305,5 +305,5 @@ create=talkPage) -if __name__ == "__main__": +if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/462800 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: I8fe5cbc35f06a52a2aec028008512e052be0060e Gerrit-Change-Number: 462800 Gerrit-PatchSet: 1 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> 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 scripts/capitalize_redirects.py
by jenkins-bot (Code Review) 27 Sep '18

27 Sep '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462807 ) Change subject: [cleanup] cleanup scripts/capitalize_redirects.py ...................................................................... [cleanup] cleanup scripts/capitalize_redirects.py - use str.format(...) instead of modulo for type specifier arguments. - use single quotes for string literals and double quotes **only** if they contain single quotes within them. - remove preleading "u" fron strings Change-Id: Ibfabce55206328465a6cda640d084dfe32058b0b --- M scripts/capitalize_redirects.py 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/capitalize_redirects.py b/scripts/capitalize_redirects.py index eaf2c4f..59e79a8 100755 --- a/scripts/capitalize_redirects.py +++ b/scripts/capitalize_redirects.py @@ -72,11 +72,11 @@ else: page_cap = pywikibot.Page(site, page_t.capitalize()) if page_cap.exists(): - pywikibot.output(u'%s already exists, skipping...\n' - % page_cap.title(as_link=True)) + pywikibot.output('{} already exists, skipping...\n' + .format(page_cap.title(as_link=True))) else: - pywikibot.output(u'%s doesn\'t exist' - % page_cap.title(as_link=True)) + pywikibot.output("{} doesn't exist" + .format(page_cap.title(as_link=True))) if self.user_confirm('Do you want to create a redirect?'): comment = i18n.twtranslate( site, @@ -118,5 +118,5 @@ return False -if __name__ == "__main__": +if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/462807 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: Ibfabce55206328465a6cda640d084dfe32058b0b Gerrit-Change-Number: 462807 Gerrit-PatchSet: 2 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits September 2018