Pywikibot-commits September 2018

pywikibot-commits@lists.wikimedia.org

1 participants
191 discussions

[Gerrit] pywikibot/core[master]: [bugfix] Fix doc error in page_tests.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463423 ) Change subject: [bugfix] Fix doc error in page_tests.py ...................................................................... [bugfix] Fix doc error in page_tests.py Bug: T187009 Change-Id: I0698ad1e7052d95c85840e480fa3cd917c70a864 --- M tests/aspects.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/aspects.py b/tests/aspects.py index a2a2e8c..352f576 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -869,7 +869,8 @@ # create test methods processed by unittest for (key, sitedata) in dct['sites'].items(): - test_name = test + '_' + key.replace('-', '_') + test_name = (test + '_' + + key.replace('-', '_').replace(':', '_')) cls.add_method(dct, test_name, wrap_method(key, sitedata, dct[test])) -- To view, visit https://gerrit.wikimedia.org/r/463423 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: I0698ad1e7052d95c85840e480fa3cd917c70a864 Gerrit-Change-Number: 463423 Gerrit-PatchSet: 1 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

5 years, 7 months

[Gerrit] pywikibot/core[master]: [IMPR] Use skip_page method to ignore further processing

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/435672 ) Change subject: [IMPR] Use skip_page method to ignore further processing ...................................................................... [IMPR] Use skip_page method to ignore further processing - Move skipping condition from treat_page to skip_page which improves code readability Change-Id: Ibdef249f2caadb87f05cf1bf27eb127eadb43ff7 --- M scripts/delete.py 1 file changed, 29 insertions(+), 29 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/delete.py b/scripts/delete.py index 158acf9..61a8b85 100755 --- a/scripts/delete.py +++ b/scripts/delete.py @@ -183,41 +183,41 @@ for page in islice_with_ellipsis(refs[ns], show_n_pages): pywikibot.output(' {0!s}'.format(page.title())) + def skip_page(self, page): + """Skip the page under some conditions.""" + if self.getOption('undelete') and page.exists(): + pywikibot.output('Skipping: {0} already exists.'.format(page)) + return True + if not self.getOption('undelete') and not page.exists(): + pywikibot.output('Skipping: {0} does not exist.'.format(page)) + return True + return super(DeletionRobot, self).skip_page(page) + def treat_page(self): """Process one page from the generator.""" if self.getOption('undelete'): - if self.current_page.exists(): - pywikibot.output('Skipping: {0} already exists.'.format( - self.current_page)) - else: - self.current_page.undelete(self.summary) + self.current_page.undelete(self.summary) else: - if self.current_page.exists(): + if (self.getOption('isorphan') is not False and + not self.getOption('always')): + self.display_references() - if (self.getOption('isorphan') is not False and - not self.getOption('always')): - self.display_references() + if self.getOption('orphansonly'): + namespaces = self.getOption('orphansonly') + ns_with_ref = self.current_page.namespaces_with_ref_to_page( + namespaces) + ns_with_ref = sorted(list(ns_with_ref)) + if ns_with_ref: + ns_names = ', '.join(str(ns.id) for ns in ns_with_ref) + pywikibot.output( + 'Skipping: {0} is not orphan in ns: {1}.'.format( + self.current_page, ns_names)) + return # Not an orphan, do not delete. - if self.getOption('orphansonly'): - namespaces = self.getOption('orphansonly') - ns_with_ref = \ - self.current_page.namespaces_with_ref_to_page( - namespaces) - ns_with_ref = sorted(list(ns_with_ref)) - if ns_with_ref: - ns_names = ', '.join(str(ns.id) for ns in ns_with_ref) - pywikibot.output( - 'Skipping: {0} is not orphan in ns: {1}.'.format( - self.current_page, ns_names)) - return # Not an orphan, do not delete. - - self.current_page.delete(self.summary, - not self.getOption('always'), - self.getOption('always'), - quit=True) - else: - pywikibot.output('Skipping: {0} does not exist.'.format( - self.current_page)) + self.current_page.delete(self.summary, + not self.getOption('always'), + self.getOption('always'), + quit=True) def main(*args): -- To view, visit https://gerrit.wikimedia.org/r/435672 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: Ibdef249f2caadb87f05cf1bf27eb127eadb43ff7 Gerrit-Change-Number: 435672 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

5 years, 7 months

[Gerrit] pywikibot/core[master]: Fix all diff_checker related errors in pywikibot/**

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463419 ) Change subject: Fix all diff_checker related errors in pywikibot/** ...................................................................... Fix all diff_checker related errors in pywikibot/** Change-Id: I01354c293744eb5a9c079cd5c6d7fd29323f8e7b --- M pywikibot/__init__.py M pywikibot/bot.py M pywikibot/bot_choice.py M pywikibot/botirc.py M pywikibot/comms/http.py M pywikibot/comms/threadedhttp.py M pywikibot/compat/query.py M pywikibot/config2.py M pywikibot/cosmetic_changes.py M pywikibot/data/api.py M pywikibot/data/sparql.py M pywikibot/data/wikistats.py M pywikibot/date.py M pywikibot/diff.py M pywikibot/echo.py M pywikibot/editor.py M pywikibot/exceptions.py M pywikibot/families/i18n_family.py M pywikibot/families/omegawiki_family.py M pywikibot/families/osm_family.py M pywikibot/families/vikidia_family.py M pywikibot/families/wikia_family.py M pywikibot/family.py M pywikibot/fixes.py M pywikibot/i18n.py M pywikibot/interwiki_graph.py M pywikibot/logentries.py M pywikibot/logging.py M pywikibot/login.py M pywikibot/page.py M pywikibot/pagegenerators.py M pywikibot/plural.py M pywikibot/proofreadpage.py M pywikibot/site.py M pywikibot/site_detect.py M pywikibot/specialbots.py M pywikibot/textlib.py M pywikibot/throttle.py M pywikibot/titletranslate.py M pywikibot/tools/__init__.py M pywikibot/tools/_logging.py M pywikibot/tools/ip.py M pywikibot/userinterfaces/gui.py M pywikibot/userinterfaces/terminal_interface_base.py M pywikibot/userinterfaces/transliteration.py M pywikibot/userinterfaces/win32_unicode.py M pywikibot/version.py M pywikibot/weblib.py M pywikibot/xmlreader.py M tox.ini 50 files changed, 1,475 insertions(+), 1,413 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/463419 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: I01354c293744eb5a9c079cd5c6d7fd29323f8e7b Gerrit-Change-Number: 463419 Gerrit-PatchSet: 3 Gerrit-Owner: Dalba <dalba.wiki(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)

5 years, 7 months

[Gerrit] pywikibot/core[master]: [cleanup] cleanup tests/[redirect_bot_tests.py-replacebot_tests.py]

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463354 ) Change subject: [cleanup] cleanup tests/[redirect_bot_tests.py-replacebot_tests.py] ...................................................................... [cleanup] cleanup tests/[redirect_bot_tests.py-replacebot_tests.py] - use single quotes for string literals - remove preleading "u" fron strings - indentation to make sure code lines are less than 79 characters Change-Id: Ifde117e2d27dc68ed2983c225f98e7de77d32cfd --- M tests/reflinks_tests.py M tests/replacebot_tests.py 2 files changed, 19 insertions(+), 18 deletions(-) Approvals: Dalba: Verified jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tests/reflinks_tests.py b/tests/reflinks_tests.py index 15a258f..1d30fb3 100644 --- a/tests/reflinks_tests.py +++ b/tests/reflinks_tests.py @@ -40,7 +40,7 @@ namespaces=[0, 1], site=self.get_site()) pages = list(gen) - self.assertPagelistTitles(pages, (u'Fake page', u'Talk:Fake page'), + self.assertPagelistTitles(pages, ('Fake page', 'Talk:Fake page'), site=self.get_site()) def test_namespace_empty_list(self): @@ -51,7 +51,7 @@ namespaces=[], site=self.get_site()) pages = list(gen) - self.assertPagelistTitles(pages, (u'Fake page', u'Talk:Fake page'), + self.assertPagelistTitles(pages, ('Fake page', 'Talk:Fake page'), site=self.get_site()) def test_namespace_None(self): @@ -62,7 +62,7 @@ namespaces=None, site=self.get_site()) pages = list(gen) - self.assertPagelistTitles(pages, (u'Fake page', u'Talk:Fake page'), + self.assertPagelistTitles(pages, ('Fake page', 'Talk:Fake page'), site=self.get_site()) def test_namespace_string_ids(self): @@ -70,10 +70,10 @@ gen = XmlDumpPageGenerator( filename=join_xml_data_path('dummy-reflinks.xml'), start='Fake page', - namespaces=["0", "1"], + namespaces=['0', '1'], site=self.get_site()) pages = list(gen) - self.assertPagelistTitles(pages, (u'Fake page', u'Talk:Fake page'), + self.assertPagelistTitles(pages, ('Fake page', 'Talk:Fake page'), site=self.get_site()) def test_namespace_names(self): @@ -81,10 +81,10 @@ gen = XmlDumpPageGenerator( filename=join_xml_data_path('dummy-reflinks.xml'), start='Fake page', - namespaces=["Talk"], + namespaces=['Talk'], site=self.get_site()) pages = list(gen) - self.assertPagelistTitles(pages, (u'Talk:Fake page', ), + self.assertPagelistTitles(pages, ('Talk:Fake page', ), site=self.get_site()) def test_start_with_underscore(self): @@ -95,7 +95,7 @@ namespaces=[0, 1], site=self.get_site()) pages = list(gen) - self.assertPagelistTitles(pages, (u'Fake page', u'Talk:Fake page'), + self.assertPagelistTitles(pages, ('Fake page', 'Talk:Fake page'), site=self.get_site()) def test_without_start(self): @@ -106,7 +106,7 @@ namespaces=[0, 1], site=self.get_site()) pages = list(gen) - self.assertPagelistTitles(pages, (u'Fake page', u'Talk:Fake page'), + self.assertPagelistTitles(pages, ('Fake page', 'Talk:Fake page'), site=self.get_site()) def test_start_prefix(self): @@ -117,7 +117,7 @@ namespaces=[0, 1], site=self.get_site()) pages = list(gen) - self.assertPagelistTitles(pages, (u'Fake page', u'Talk:Fake page'), + self.assertPagelistTitles(pages, ('Fake page', 'Talk:Fake page'), site=self.get_site()) @@ -152,7 +152,7 @@ """Test the generator without any narrowing.""" main('-xml:' + join_xml_data_path('dummy-reflinks.xml')) gen = self.constructor_args[0] - self.assertPageTitlesCountEqual(gen, [u'Fake page', u'Talk:Fake page'], + self.assertPageTitlesCountEqual(gen, ['Fake page', 'Talk:Fake page'], site=self.get_site()) def test_xml_one_namespace(self): @@ -161,7 +161,7 @@ '-namespace:1') gen = self.constructor_args[0] pages = list(gen) - self.assertPagelistTitles(pages, [u'Talk:Fake page'], + self.assertPagelistTitles(pages, ['Talk:Fake page'], site=self.get_site()) def test_xml_multiple_namespace_ids(self): @@ -169,7 +169,7 @@ main('-xml:' + join_xml_data_path('dummy-reflinks.xml'), '-namespace:0', '-namespace:1', '-xmlstart:Fake page') gen = self.constructor_args[0] - self.assertPageTitlesCountEqual(gen, [u'Fake page', u'Talk:Fake page'], + self.assertPageTitlesCountEqual(gen, ['Fake page', 'Talk:Fake page'], site=self.get_site()) def test_xml_multiple_namespace_ids_2(self): @@ -177,7 +177,7 @@ main('-xml:' + join_xml_data_path('dummy-reflinks.xml'), '-namespace:0,1', '-xmlstart:Fake page') gen = self.constructor_args[0] - self.assertPageTitlesCountEqual(gen, [u'Fake page', u'Talk:Fake page'], + self.assertPageTitlesCountEqual(gen, ['Fake page', 'Talk:Fake page'], site=self.get_site()) def test_xml_start_prefix(self): @@ -186,7 +186,7 @@ '-namespace:1', '-xmlstart:Fake') gen = self.constructor_args[0] pages = list(gen) - self.assertPagelistTitles(pages, [u'Talk:Fake page'], + self.assertPagelistTitles(pages, ['Talk:Fake page'], site=self.get_site()) def test_xml_start_underscore(self): @@ -195,7 +195,7 @@ '-namespace:1', '-xmlstart:Fake_page') gen = self.constructor_args[0] pages = list(gen) - self.assertPagelistTitles(pages, [u'Talk:Fake page'], + self.assertPagelistTitles(pages, ['Talk:Fake page'], site=self.get_site()) def test_xml_namespace_name(self): @@ -204,7 +204,7 @@ '-namespace:Talk', '-xmlstart:Fake page') gen = self.constructor_args[0] pages = list(gen) - self.assertPagelistTitles(pages, [u'Talk:Fake page'], + self.assertPagelistTitles(pages, ['Talk:Fake page'], site=self.get_site()) diff --git a/tests/replacebot_tests.py b/tests/replacebot_tests.py index 86502c3..e203dd8 100644 --- a/tests/replacebot_tests.py +++ b/tests/replacebot_tests.py @@ -111,7 +111,8 @@ if not callable(replacement.new): self.assertEqual(replacement.new, str(offset * 2 + 2)) - def _test_fix_replacement(self, replacement, length=1, offset=0, msg=False): + def _test_fix_replacement(self, replacement, + length=1, offset=0, msg=False): """Test a replacement from a fix.""" assert length > offset self._test_replacement(replacement, replace.ReplacementListEntry, -- To view, visit https://gerrit.wikimedia.org/r/463354 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: Ifde117e2d27dc68ed2983c225f98e7de77d32cfd Gerrit-Change-Number: 463354 Gerrit-PatchSet: 1 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: 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)

5 years, 7 months

[Gerrit] pywikibot/core[master]: [bugfix] partly revert [cleanup] tests/[script_tests.py-tests_tests.py]

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463318 ) Change subject: [bugfix] partly revert [cleanup] tests/[script_tests.py-tests_tests.py] ...................................................................... [bugfix] partly revert [cleanup] tests/[script_tests.py-tests_tests.py] partly revert of I97d24fa834e3f875a8547fc0e38f5a240f93907e Bug: T205648 Change-Id: Id6ba0efc9195005d75c122d55923901e6772ffc7 --- M tests/sparql_tests.py 1 file changed, 45 insertions(+), 44 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/sparql_tests.py b/tests/sparql_tests.py index ef9a0cb..7a84956 100644 --- a/tests/sparql_tests.py +++ b/tests/sparql_tests.py @@ -18,11 +18,11 @@ SQL_RESPONSE_CONTAINER = """ { - 'head' : { - 'vars' : [ 'cat', 'd', 'catLabel' ] + "head" : { + "vars" : [ "cat", "d", "catLabel" ] }, - 'results' : { - 'bindings' : [ + "results" : { + "bindings" : [ %s ] } @@ -31,19 +31,19 @@ ITEM_Q498787 = """ { - 'cat' : { - 'type' : 'uri', - 'value' : 'http://www.wikidata.org/entity/Q498787' + "cat" : { + "type" : "uri", + "value" : "http://www.wikidata.org/entity/Q498787" }, - 'd' : { - 'datatype' : 'http://www.w3.org/2001/XMLSchema#dateTime', - 'type' : 'literal', - 'value' : '1955-01-01T00:00:00Z' + "d" : { + "datatype" : "http://www.w3.org/2001/XMLSchema#dateTime", + "type" : "literal", + "value" : "1955-01-01T00:00:00Z" }, - 'catLabel' : { - 'xml:lang' : 'en', - 'type' : 'literal', - 'value' : 'Muezza' + "catLabel" : { + "xml:lang" : "en", + "type" : "literal", + "value" : "Muezza" } } """ @@ -51,33 +51,33 @@ ITEM_Q677525 = """ { "cat" : { - 'type' : 'uri', - 'value' : 'http://www.wikidata.org/entity/Q677525' + "type" : "uri", + "value" : "http://www.wikidata.org/entity/Q677525" }, - 'd' : { - 'datatype' : 'http://www.w3.org/2001/XMLSchema#dateTime', - 'type' : 'literal', - 'value' : '2015-06-22T00:00:00Z' + "d" : { + "datatype" : "http://www.w3.org/2001/XMLSchema#dateTime", + "type" : "literal", + "value" : "2015-06-22T00:00:00Z" }, - 'catLabel' : { - 'xml:lang' : 'en', - 'type' : 'literal', - 'value' : 'Orangey' + "catLabel" : { + "xml:lang" : "en", + "type" : "literal", + "value" : "Orangey" } } """ RESPONSE_TRUE = """ { - 'head' : { }, - 'boolean' : true + "head" : { }, + "boolean" : true } """ RESPONSE_FALSE = """ { - 'head' : { }, - 'boolean' : false + "head" : { }, + "boolean" : false } """ @@ -97,28 +97,30 @@ def testQuerySelect(self, mock_method): """Test SELECT query.""" mock_method.return_value = Container( - SQL_RESPONSE_CONTAINER % ('{}, {}' - .format(ITEM_Q498787, ITEM_Q677525))) + SQL_RESPONSE_CONTAINER % '{}, {}'.format( + ITEM_Q498787, ITEM_Q677525)) q = sparql.SparqlQuery() res = q.select('SELECT * WHERE { ?x ?y ?z }') self.assertIsInstance(res, list, 'Result is not a list') self.assertEqual(len(res), 2) self.assertDictEqual( - res[0], {'cat': 'http://www.wikidata.org/entity/Q498787', - 'catLabel': 'Muezza', 'd': '1955-01-01T00:00:00Z'}, + res[0], + {'cat': 'http://www.wikidata.org/entity/Q498787', + 'catLabel': 'Muezza', 'd': '1955-01-01T00:00:00Z'}, 'Bad result') self.assertDictEqual( - res[1], {'cat': 'http://www.wikidata.org/entity/Q677525', - 'catLabel': 'Orangey', 'd': '2015-06-22T00:00:00Z'}, + res[1], + {'cat': 'http://www.wikidata.org/entity/Q677525', + 'catLabel': 'Orangey', 'd': '2015-06-22T00:00:00Z'}, 'Bad result') @patch.object(sparql.http, 'fetch') def testQuerySelectFull(self, mock_method): """Test SELECT query with full data.""" mock_method.return_value = Container( - SQL_RESPONSE_CONTAINER % ('{}, {}' - .format(ITEM_Q498787, ITEM_Q677525))) + SQL_RESPONSE_CONTAINER % '{}, {}'.format( + ITEM_Q498787, ITEM_Q677525)) q = sparql.SparqlQuery() res = q.select('SELECT * WHERE { ?x ?y ?z }', full_data=True) self.assertIsInstance(res, list, 'Result is not a list') @@ -146,9 +148,8 @@ def testGetItems(self, mock_method): """Test item list retrieval via SPARQL.""" mock_method.return_value = Container( - SQL_RESPONSE_CONTAINER % ('{}, {}, {}'.format(ITEM_Q498787, - ITEM_Q677525, - ITEM_Q677525))) + SQL_RESPONSE_CONTAINER % '{}, {}, {}'.format( + ITEM_Q498787, ITEM_Q677525, ITEM_Q677525)) q = sparql.SparqlQuery() res = q.get_items('SELECT * WHERE { ?x ?y ?z }', 'cat') self.assertSetEqual(res, {'Q498787', 'Q677525'}) @@ -201,8 +202,8 @@ """Tests for sparql.Literal.""" net = False - object_under_test = sparql.Literal({'datatype': '', 'lang': 'en', - 'value': 'value'}) + object_under_test = sparql.Literal( + {'datatype': '', 'lang': 'en', 'value': 'value'}) class BnodeTests(Shared.SparqlNodeTests): @@ -216,8 +217,8 @@ """Tests for sparql.URI.""" net = False - object_under_test = sparql.URI({'value': 'http://foo.com'}, - 'http://bar.com') + object_under_test = sparql.URI( + {'value': 'http://foo.com'}, 'http://bar.com') if __name__ == '__main__': # pragma: no cover -- To view, visit https://gerrit.wikimedia.org/r/463318 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: Id6ba0efc9195005d75c122d55923901e6772ffc7 Gerrit-Change-Number: 463318 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck <alangiderick(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

5 years, 7 months

[Gerrit] pywikibot/core[master]: [tests] Remove unused flake8-diff section

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463313 ) Change subject: [tests] Remove unused flake8-diff section ...................................................................... [tests] Remove unused flake8-diff section according to jayvdb, it can not be voting against patches due to high number of undesirable reported problems.[1] [1]: I993886870e44d06dd8df882bb205cecb4c841f54 Change-Id: I158893b217c13e74ac367a7bf3b3e1fc491f67ef --- M tox.ini 1 file changed, 0 insertions(+), 13 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/tox.ini b/tox.ini index d4c61c5..0b4605b 100644 --- a/tox.ini +++ b/tox.ini @@ -56,19 +56,6 @@ flake8 --doctests {posargs} basepython = python2.7 -# 4a226d07 is https://github.com/erikrose/blessings/pull/104 -[testenv:flake8-diff] -commands = - flake8 --version - flake8-diff --flake8-options --ignore={[flake8]ignore} {posargs} -deps = flake8-diff - https://github.com/erikrose/blessings/archive/4a226d07.zip - flake8-docstrings<0.2.2 - flake8-per-file-ignores - pep8-naming - flake8-quotes - flake8-blind-except - [testenv:nose] commands = python -W error::UserWarning -m generate_user_files -family:test -lang:test -v -- To view, visit https://gerrit.wikimedia.org/r/463313 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: I158893b217c13e74ac367a7bf3b3e1fc491f67ef Gerrit-Change-Number: 463313 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

5 years, 7 months

[Gerrit] pywikibot/core[master]: [style] use flake8-quotes to enforce single quotes

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463289 ) Change subject: [style] use flake8-quotes to enforce single quotes ...................................................................... [style] use flake8-quotes to enforce single quotes also fix some scripts Change-Id: I91e67a46fa859e5f29eab88863e6a53d83ec4cca --- M docs/conf.py M pwb.py M pywikibot/bot.py M pywikibot/page.py M scripts/solve_disambiguation.py M setup.py M tests/diff_tests.py M tox.ini 8 files changed, 22 insertions(+), 19 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/conf.py b/docs/conf.py index d10f7b9..c78193d 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -263,7 +263,7 @@ """Pywikibot specific conversions.""" from scripts.cosmetic_changes import warning - if what != "module": + if what != 'module': return if not name.startswith('scripts.'): diff --git a/pwb.py b/pwb.py index 2ed6a9b..c77ebdb 100755 --- a/pwb.py +++ b/pwb.py @@ -115,7 +115,7 @@ try: with open(filename, 'rb') as f: source = f.read() - exec(compile(source, filename, "exec", dont_inherit=True), + exec(compile(source, filename, 'exec', dont_inherit=True), main_mod.__dict__) finally: # Restore the old __main__ @@ -181,7 +181,7 @@ if filename is not None and not (filename.startswith('generate_') or filename == 'version.py'): print("NOTE: 'user-config.py' was not found!") - print("Please follow the prompts to create it:") + print('Please follow the prompts to create it:') run_python_file(os.path.join(_pwb_dir, 'generate_user_files.py'), ['generate_user_files.py'], ['generate_user_files.py']) diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 1dccc0d..0fd9da6 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -135,7 +135,7 @@ ui = uiModule.UI() pywikibot.argvu = ui.argvu() -_GLOBAL_HELP = ''' +_GLOBAL_HELP = """ GLOBAL OPTIONS ============== (Global arguments available for all bots) @@ -193,7 +193,7 @@ -<config var>:n You may use all given numeric config variables as option and modify it with command line. -''' +""" # It's not possible to use pywikibot.exceptions.PageRelatedError as that is diff --git a/pywikibot/page.py b/pywikibot/page.py index 5677333..24a96ce 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -5450,14 +5450,14 @@ illegal_titles_pattern = re.compile( # Matching titles will be held as illegal. - r'''[\x00-\x1f\x23\x3c\x3e\x5b\x5d\x7b\x7c\x7d\x7f]''' + r'[\x00-\x1f\x23\x3c\x3e\x5b\x5d\x7b\x7c\x7d\x7f]' # URL percent encoding sequences interfere with the ability # to round-trip titles -- you can't link to them consistently. - u'|%[0-9A-Fa-f]{2}' + '|%[0-9A-Fa-f]{2}' # XML/HTML character references produce similar issues. - u'|&[A-Za-z0-9\x80-\xff]+;' - u'|&#[0-9]+;' - u'|&#x[0-9A-Fa-f]+;' + '|&[A-Za-z0-9\x80-\xff]+;' + '|&#[0-9]+;' + '|&#x[0-9A-Fa-f]+;' ) @deprecated_args(defaultNamespace='default_namespace') diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py index 9196e66..3ba4d4f 100755 --- a/scripts/solve_disambiguation.py +++ b/scripts/solve_disambiguation.py @@ -696,12 +696,11 @@ # group linktrail is the link trail, that's letters after ]] which # are part of the word. # note: the definition of 'letter' varies from language to language. - self.linkR = re.compile(r''' + self.linkR = re.compile(r""" \[\[ (?P<title> [^\[\]\|#]*) (?P<section> \#[^\]\|]*)? (\|(?P<label> [^\]]*))? \]\] - (?P<linktrail>%s)''' % linktrail, - flags=re.X) + (?P<linktrail>{})""".format(linktrail), flags=re.X) @staticmethod def firstlinks(page): diff --git a/setup.py b/setup.py index 1148044..8e0515e 100644 --- a/setup.py +++ b/setup.py @@ -72,6 +72,7 @@ 'flake8-mock>=0.3', 'flake8-per-file-ignores', 'flake8-print>=2.0.1', + 'flake8-quotes', 'flake8-string-format', 'flake8-tuple>=0.2.8', 'pep8-naming>=0.7', @@ -246,7 +247,7 @@ extras_require=extra_deps, url='https://www.mediawiki.org/wiki/Manual:Pywikibot', download_url='https://tools.wmflabs.org/pywikibot/', - test_suite="tests.collector", + test_suite='tests.collector', tests_require=test_deps, classifiers=[ 'Development Status :: 5 - Production/Stable', diff --git a/tests/diff_tests.py b/tests/diff_tests.py index 2d49d52..9bba2ce 100644 --- a/tests/diff_tests.py +++ b/tests/diff_tests.py @@ -23,7 +23,7 @@ def test_added_context(self): """Test html_comparator's detection of added-context.""" - output = html_comparator(''' + output = html_comparator(""" <tr> <td class="diff-addedline">line 1a</td> <td class="diff-addedline">line \n2a</td> @@ -31,13 +31,13 @@ <tr> <td class="diff-addedline"><span>line 1b</span></td> <td class="diff-addedline">line 2b<i><span></i></span></td> -</tr>''') +</tr>""") self.assertEqual(output['added-context'], ['line 1a', 'line \n2a', 'line 1b', 'line 2b']) def test_deleted_context(self): """Test html_comparator's detection of deleted-context.""" - output = html_comparator(''' + output = html_comparator(""" <tr> <td class="diff-deletedline">line 1a</td> <td class="diff-deletedline">line \n2a</td> @@ -45,7 +45,7 @@ <tr> <td class="diff-deletedline"><span>line 1b</span></td> <td class="diff-deletedline">line 2b<i><span></i></span></td> -</tr>''') +</tr>""") self.assertEqual(output['deleted-context'], ['line 1a', 'line \n2a', 'line 1b', 'line 2b']) diff --git a/tox.ini b/tox.ini index d4c61c5..6d1c78d 100644 --- a/tox.ini +++ b/tox.ini @@ -156,8 +156,10 @@ require-code = true classmethod-decorators = classmethod,classproperty per-file-ignores = - generate_family_file.py : T001 + generate_family_file.py : T001, Q000 + generate_user_files.py : Q000 pwb.py : T001 + pywikibot/** : Q000 # pydocstyle cannot handle multiple __all__ variables pywikibot/__init__.py : D999, N806, N802 pywikibot/_wbtypes.py: N802 @@ -244,6 +246,7 @@ scripts/welcome.py: N802 setup.py : T001 tests/* : N813 + tests/** : Q000 tests/api_tests.py: N802 tests/archivebot_tests.py: N802 tests/aspects.py: N802 -- To view, visit https://gerrit.wikimedia.org/r/463289 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: I91e67a46fa859e5f29eab88863e6a53d83ec4cca Gerrit-Change-Number: 463289 Gerrit-PatchSet: 6 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: 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)

5 years, 7 months

[Gerrit] pywikibot/core[master]: [cleanup] cleanup tests/[script_tests.py-tests_tests.py]

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463284 ) Change subject: [cleanup] cleanup tests/[script_tests.py-tests_tests.py] ...................................................................... [cleanup] cleanup tests/[script_tests.py-tests_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: I97d24fa834e3f875a8547fc0e38f5a240f93907e --- M tests/script_tests.py M tests/site_detect_tests.py M tests/site_tests.py M tests/sparql_tests.py 4 files changed, 282 insertions(+), 267 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/script_tests.py b/tests/script_tests.py index 5e821a6..af9e37b 100644 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -181,8 +181,8 @@ if not enable_autorun_tests: unittest_print('Skipping execution of auto-run scripts ' - '(set PYWIKIBOT_TEST_AUTORUN=1 to enable):\n %r' - % auto_run_script_list) + '(set PYWIKIBOT_TEST_AUTORUN=1 to enable):\n {!r}' + .format(auto_run_script_list)) tests = (['test__login'] + ['test_' + name @@ -297,14 +297,14 @@ if (not result['stdout'] and not result['stderr']): unittest_print(' auto-run script unresponsive after ' - '%d seconds' % timeout, end=' ') + '{} seconds'.format(timeout), end=' ') elif 'SIMULATION: edit action blocked' in result['stderr']: unittest_print(' auto-run script simulated edit ' 'blocked', end=' ') else: unittest_print( - ' auto-run script stderr within %d seconds: %r' - % (timeout, result['stderr']), end=' ') + ' auto-run script stderr within {} seconds: {!r}' + .format(timeout, result['stderr']), end=' ') self.assertNotIn('Traceback (most recent call last)', result['stderr']) @@ -345,7 +345,8 @@ cls.add_method(dct, test_name, test_execution(script_name, [argument]), - 'Test running %s %s.' % (script_name, argument)) + 'Test running {} {}.' + .format(script_name, argument)) if script_name in dct['_expected_failures']: dct[test_name] = unittest.expectedFailure(dct[test_name]) diff --git a/tests/site_detect_tests.py b/tests/site_detect_tests.py index bdf0d47..076393f 100644 --- a/tests/site_detect_tests.py +++ b/tests/site_detect_tests.py @@ -71,8 +71,8 @@ def test_wikichristian(self): """Test detection of MediaWiki sites for www.wikichristian.org. - Server that hosts www.wikichristian.org is unreliable - it occasionally - responding with 500 error (see: T151368). + Server that hosts www.wikichristian.org is unreliable - it + occasionally responding with 500 error (see: T151368). """ self.assertSite('http://www.wikichristian.org/index.php?title=$1') diff --git a/tests/site_tests.py b/tests/site_tests.py index 837364e..3fe987e 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -119,9 +119,9 @@ self.assertIn('time', old) self.assertEqual(old, self.site.siteinfo['general']) self.assertEqual(self.site.siteinfo('general'), old) - # Siteinfo always returns copies so it's not possible to directly check - # if they are the same dict or if they have been rerequested unless the - # content also changes so force that the content changes + # Siteinfo always returns copies so it's not possible to directly + # check if they are the same dict or if they have been rerequested + # unless the content also changes so force that the content changes self.assertNotIn('DUMMY', old) self.site.siteinfo._cache['general'][0]['DUMMY'] = 42 old = self.site.siteinfo('general') @@ -298,23 +298,23 @@ else: self.assertIsInstance(dabcat, pywikibot.Category) - foo = unicode(pywikibot.Link("foo", source=mysite)) + foo = unicode(pywikibot.Link('foo', source=mysite)) if self.site.namespaces[0].case == 'case-sensitive': self.assertEqual(foo, '[[foo]]') else: self.assertEqual(foo, '[[Foo]]') - self.assertFalse(mysite.isInterwikiLink("foo")) + self.assertFalse(mysite.isInterwikiLink('foo')) self.assertIsInstance(mysite.redirectRegex().pattern, basestring) self.assertIsInstance(mysite.category_on_one_line(), bool) - self.assertTrue(mysite.sametitle("Template:Test", "Template:Test")) - self.assertTrue(mysite.sametitle("Template: Test", "Template: Test")) + self.assertTrue(mysite.sametitle('Template:Test', 'Template:Test')) + self.assertTrue(mysite.sametitle('Template: Test', 'Template: Test')) self.assertTrue(mysite.sametitle('Test name', 'Test name')) self.assertFalse(mysite.sametitle('Test name', 'Test Name')) # User, MediaWiki (both since 1.16) and Special are always # first-letter (== only first non-namespace letter is case insensitive) # See also: https://www.mediawiki.org/wiki/Manual:$wgCapitalLinks - self.assertTrue(mysite.sametitle("Special:Always", "Special:always")) + self.assertTrue(mysite.sametitle('Special:Always', 'Special:always')) if mysite.mw_version >= '1.16': self.assertTrue(mysite.sametitle('User:Always', 'User:always')) self.assertTrue(mysite.sametitle('MediaWiki:Always', @@ -369,7 +369,7 @@ self.assertIsInstance(ns, Mapping) self.assertTrue(all(x in ns for x in range(0, 16))) # built-in namespaces always present - self.assertIsInstance(mysite.ns_normalize("project"), basestring) + self.assertIsInstance(mysite.ns_normalize('project'), basestring) self.assertTrue(all(isinstance(key, int) for key in ns)) self.assertTrue(all(isinstance(val, Iterable) @@ -398,8 +398,8 @@ for msg in ('about', 'aboutpage', 'aboutsite', 'accesskey-n-portal'): self.assertTrue(mysite.has_mediawiki_message(msg)) self.assertIsInstance(mysite.mediawiki_message(msg), basestring) - self.assertFalse(mysite.has_mediawiki_message("nosuchmessage")) - self.assertRaises(KeyError, mysite.mediawiki_message, "nosuchmessage") + self.assertFalse(mysite.has_mediawiki_message('nosuchmessage')) + self.assertRaises(KeyError, mysite.mediawiki_message, 'nosuchmessage') msg = ('about', 'aboutpage') about_msgs = self.site.mediawiki_messages(msg) @@ -411,7 +411,7 @@ # mediawiki_messages must be given a list; using a string will split it self.assertRaises(KeyError, self.site.mediawiki_messages, 'about') - msg = ("nosuchmessage1", "about", "aboutpage", "nosuchmessage") + msg = ('nosuchmessage1', 'about', 'aboutpage', 'nosuchmessage') self.assertFalse(mysite.has_all_mediawiki_messages(msg)) self.assertRaises(KeyError, mysite.mediawiki_messages, msg) @@ -434,9 +434,9 @@ mysite = self.get_site() if mysite.lang != 'en': raise unittest.SkipTest( - 'English-specific tests not valid on %s' % mysite) + 'English-specific tests not valid on {}'.format(mysite)) - self.assertEqual(mysite.months_names[4], (u'May', u'May')) + self.assertEqual(mysite.months_names[4], ('May', 'May')) self.assertEqual(mysite.list_to_text(('Pride', 'Prejudice')), 'Pride and Prejudice') self.assertEqual(mysite.list_to_text(('This', 'that', 'the other')), @@ -635,23 +635,23 @@ self.assertIsInstance(page, pywikibot.Page) self.assertTrue(page.exists()) self.assertEqual(page.namespace(), 0) - rev = list(mysite.allpages(reverse=True, start="Aa", total=12)) + rev = list(mysite.allpages(reverse=True, start='Aa', total=12)) self.assertLessEqual(len(rev), 12) for page in rev: self.assertIsInstance(page, pywikibot.Page) self.assertTrue(page.exists()) self.assertEqual(page.namespace(), 0) - self.assertLessEqual(page.title(), "Aa") - for page in mysite.allpages(start="Py", total=5): + self.assertLessEqual(page.title(), 'Aa') + for page in mysite.allpages(start='Py', total=5): self.assertIsInstance(page, pywikibot.Page) self.assertTrue(page.exists()) self.assertEqual(page.namespace(), 0) - self.assertGreaterEqual(page.title(), "Py") - for page in mysite.allpages(prefix="Pre", total=5): + self.assertGreaterEqual(page.title(), 'Py') + for page in mysite.allpages(prefix='Pre', total=5): self.assertIsInstance(page, pywikibot.Page) self.assertTrue(page.exists()) self.assertEqual(page.namespace(), 0) - self.assertTrue(page.title().startswith("Pre")) + self.assertTrue(page.title().startswith('Pre')) for page in mysite.allpages(namespace=1, total=5): self.assertIsInstance(page, pywikibot.Page) self.assertTrue(page.exists()) @@ -710,16 +710,16 @@ def test_allpages_protection(self): """Test allpages with protect_type parameter.""" mysite = self.get_site() - for page in mysite.allpages(protect_type="edit", total=5): + for page in mysite.allpages(protect_type='edit', total=5): self.assertIsInstance(page, pywikibot.Page) self.assertTrue(page.exists()) - self.assertIn("edit", page._protection) - for page in mysite.allpages(protect_type="edit", - protect_level="sysop", total=5): + self.assertIn('edit', page._protection) + for page in mysite.allpages(protect_type='edit', + protect_level='sysop', total=5): self.assertIsInstance(page, pywikibot.Page) self.assertTrue(page.exists()) - self.assertIn("edit", page._protection) - self.assertIn("sysop", page._protection["edit"]) + self.assertIn('edit', page._protection) + self.assertIn('sysop', page._protection['edit']) def test_all_links(self): """Test the site.alllinks() method.""" @@ -732,22 +732,22 @@ self.assertTrue(all(isinstance(link, pywikibot.Page) for link in fwd)) uniq = list(mysite.alllinks(total=10, unique=True)) self.assertTrue(all(link in uniq for link in fwd)) - for page in mysite.alllinks(start="Link", total=5): + for page in mysite.alllinks(start='Link', total=5): self.assertIsInstance(page, pywikibot.Page) self.assertEqual(page.namespace(), 0) - self.assertGreaterEqual(page.title(), "Link") - for page in mysite.alllinks(prefix="Fix", total=5): + self.assertGreaterEqual(page.title(), 'Link') + for page in mysite.alllinks(prefix='Fix', total=5): self.assertIsInstance(page, pywikibot.Page) self.assertEqual(page.namespace(), 0) - self.assertTrue(page.title().startswith("Fix")) + self.assertTrue(page.title().startswith('Fix')) for page in mysite.alllinks(namespace=1, total=5): self.assertIsInstance(page, pywikibot.Page) self.assertEqual(page.namespace(), 1) - for page in mysite.alllinks(start="From", namespace=4, fromids=True, + for page in mysite.alllinks(start='From', namespace=4, fromids=True, total=5): self.assertIsInstance(page, pywikibot.Page) self.assertGreaterEqual(page.title(with_ns=False), 'From') - self.assertTrue(hasattr(page, "_fromid")) + self.assertTrue(hasattr(page, '_fromid')) errgen = mysite.alllinks(unique=True, fromids=True) self.assertRaises(pywikibot.Error, next, errgen) @@ -758,14 +758,14 @@ self.assertLessEqual(len(ac), 10) self.assertTrue(all(isinstance(cat, pywikibot.Category) for cat in ac)) - for cat in mysite.allcategories(total=5, start="Abc"): + for cat in mysite.allcategories(total=5, start='Abc'): self.assertIsInstance(cat, pywikibot.Category) self.assertGreaterEqual(cat.title(with_ns=False), 'Abc') - for cat in mysite.allcategories(total=5, prefix="Def"): + for cat in mysite.allcategories(total=5, prefix='Def'): self.assertIsInstance(cat, pywikibot.Category) self.assertTrue(cat.title(with_ns=False).startswith('Def')) # Bug T17985 - reverse and start combined; fixed in v 1.14 - for cat in mysite.allcategories(total=5, start="Hij", reverse=True): + for cat in mysite.allcategories(total=5, start='Hij', reverse=True): self.assertIsInstance(cat, pywikibot.Category) self.assertLessEqual(cat.title(with_ns=False), 'Hij') @@ -789,40 +789,40 @@ self.assertLessEqual(len(au), 10) for user in au: self.assertIsInstance(user, dict) - self.assertIn("name", user) - self.assertIn("editcount", user) - self.assertIn("registration", user) + self.assertIn('name', user) + self.assertIn('editcount', user) + self.assertIn('registration', user) self.assertIn('user', user['groups']) def test_allusers_with_start(self): """Test the site.allusers(start=..) method.""" mysite = self.get_site() - for user in mysite.allusers(start="B", total=5): + for user in mysite.allusers(start='B', total=5): self.assertIsInstance(user, dict) - self.assertIn("name", user) - self.assertGreaterEqual(user["name"], "B") - self.assertIn("editcount", user) - self.assertIn("registration", user) + self.assertIn('name', user) + self.assertGreaterEqual(user['name'], 'B') + self.assertIn('editcount', user) + self.assertIn('registration', user) def test_allusers_with_prefix(self): """Test the site.allusers(prefix=..) method.""" mysite = self.get_site() - for user in mysite.allusers(prefix="C", total=5): + for user in mysite.allusers(prefix='C', total=5): self.assertIsInstance(user, dict) - self.assertIn("name", user) - self.assertTrue(user["name"].startswith("C")) - self.assertIn("editcount", user) - self.assertIn("registration", user) + self.assertIn('name', user) + self.assertTrue(user['name'].startswith('C')) + self.assertIn('editcount', user) + self.assertIn('registration', user) def _test_allusers_with_group(self): """Test the site.allusers(group=..) method.""" mysite = self.get_site() - for user in mysite.allusers(prefix="D", group="bot", total=5): + for user in mysite.allusers(prefix='D', group='bot', total=5): self.assertIsInstance(user, dict) - self.assertIn("name", user) - self.assertTrue(user["name"].startswith("D")) - self.assertIn("editcount", user) - self.assertIn("registration", user) + self.assertIn('name', user) + self.assertTrue(user['name'].startswith('D')) + self.assertIn('editcount', user) + self.assertIn('registration', user) self.assertIn('groups' in user) self.assertIn('sysop' in user['groups']) @@ -833,27 +833,27 @@ self.assertLessEqual(len(ai), 10) self.assertTrue(all(isinstance(image, pywikibot.FilePage) for image in ai)) - for impage in mysite.allimages(start="Ba", total=5): + for impage in mysite.allimages(start='Ba', total=5): self.assertIsInstance(impage, pywikibot.FilePage) self.assertTrue(impage.exists()) self.assertGreaterEqual(impage.title(with_ns=False), 'Ba') # Bug T17985 - reverse and start combined; fixed in v 1.14 - for impage in mysite.allimages(start="Da", reverse=True, total=5): + for impage in mysite.allimages(start='Da', reverse=True, total=5): self.assertIsInstance(impage, pywikibot.FilePage) self.assertTrue(impage.exists()) self.assertLessEqual(impage.title(with_ns=False), 'Da') - for impage in mysite.allimages(prefix="Ch", total=5): + for impage in mysite.allimages(prefix='Ch', total=5): self.assertIsInstance(impage, pywikibot.FilePage) self.assertTrue(impage.exists()) self.assertTrue(impage.title(with_ns=False).startswith('Ch')) for impage in mysite.allimages(minsize=100, total=5): self.assertIsInstance(impage, pywikibot.FilePage) self.assertTrue(impage.exists()) - self.assertGreaterEqual(impage.latest_file_info["size"], 100) + self.assertGreaterEqual(impage.latest_file_info['size'], 100) for impage in mysite.allimages(maxsize=2000, total=5): self.assertIsInstance(impage, pywikibot.FilePage) self.assertTrue(impage.exists()) - self.assertLessEqual(impage.latest_file_info["size"], 2000) + self.assertLessEqual(impage.latest_file_info['size'], 2000) def test_newfiles(self): """Test the site.newfiles() method.""" @@ -930,7 +930,7 @@ def test_blocks(self): """Test the site.blocks() method.""" mysite = self.get_site() - props = ("id", "by", "timestamp", "expiry", "reason") + props = ('id', 'by', 'timestamp', 'expiry', 'reason') bl = list(mysite.blocks(total=10)) self.assertLessEqual(len(bl), 10) for block in bl: @@ -1005,7 +1005,7 @@ def test_exturl_usage(self): """Test the site.exturlusage() method.""" mysite = self.get_site() - url = "www.google.com" + url = 'www.google.com' eu = list(mysite.exturlusage(url, total=10)) self.assertLessEqual(len(eu), 10) self.assertTrue(all(isinstance(link, pywikibot.Page) @@ -1017,7 +1017,7 @@ def test_lock_page(self): """Test the site.lock_page() and site.unlock_page() method.""" site = self.get_site() - p1 = pywikibot.Page(site, u'Foo') + p1 = pywikibot.Page(site, 'Foo') site.lock_page(page=p1, block=True) self.assertRaises(pywikibot.site.PageInUse, site.lock_page, page=p1, @@ -1158,8 +1158,8 @@ raise unittest.SkipTest( 'No images on the main page of site {0!r}'.format(mysite)) - pywikibot.output(u'site_tests.TestImageUsage found %s on %s' - % (imagepage, page)) + pywikibot.output('site_tests.TestImageUsage found {} on {}' + .format(imagepage, page)) self.__class__._image_page = imagepage return imagepage @@ -1214,14 +1214,14 @@ mysite = self.get_site() self.assertIsInstance(mysite.is_blocked(), bool) self.assertIsInstance(mysite.messages(), bool) - self.assertIsInstance(mysite.has_right("edit"), bool) - self.assertFalse(mysite.has_right("nonexistent_right")) - self.assertIsInstance(mysite.has_group("bots"), bool) - self.assertFalse(mysite.has_group("nonexistent_group")) - for grp in ("user", "autoconfirmed", "bot", "sysop", "nosuchgroup"): + self.assertIsInstance(mysite.has_right('edit'), bool) + self.assertFalse(mysite.has_right('nonexistent_right')) + self.assertIsInstance(mysite.has_group('bots'), bool) + self.assertFalse(mysite.has_group('nonexistent_group')) + for grp in ('user', 'autoconfirmed', 'bot', 'sysop', 'nosuchgroup'): self.assertIsInstance(mysite.has_group(grp), bool) - for rgt in ("read", "edit", "move", "delete", "rollback", "block", - "nosuchright"): + for rgt in ('read', 'edit', 'move', 'delete', 'rollback', 'block', + 'nosuchright'): self.assertIsInstance(mysite.has_right(rgt), bool) def test_logevents(self): @@ -1242,8 +1242,8 @@ self.assertLessEqual(len(le), 10) self.assertTrue(all(isinstance(entry, pywikibot.logentries.LogEntry) for entry in le)) - for typ in ("block", "protect", "rights", "delete", "upload", - "move", "import", "patrol", "merge"): + for typ in ('block', 'protect', 'rights', 'delete', 'upload', + 'move', 'import', 'patrol', 'merge'): for entry in mysite.logevents(logtype=typ, total=3): self.assertEqual(entry.type(), typ) @@ -1273,7 +1273,7 @@ for entry in mysite.logevents( start=pywikibot.Timestamp.fromISOformat( '2008-02-02T00:00:01Z'), - end=pywikibot.Timestamp.fromISOformat("2008-02-02T23:59:59Z"), + end=pywikibot.Timestamp.fromISOformat('2008-02-02T23:59:59Z'), reverse=True, total=5): self.assertIsInstance(entry, pywikibot.logentries.LogEntry) self.assertTrue( @@ -1282,11 +1282,12 @@ for entry in mysite.logevents( start=pywikibot.Timestamp.fromISOformat( '2008-02-03T23:59:59Z'), - end=pywikibot.Timestamp.fromISOformat("2008-02-03T00:00:01Z"), + end=pywikibot.Timestamp.fromISOformat('2008-02-03T00:00:01Z'), total=5): self.assertIsInstance(entry, pywikibot.logentries.LogEntry) self.assertTrue( - "2008-02-03T00:00:01Z" <= str(entry.timestamp()) <= "2008-02-03T23:59:59Z") + '2008-02-03T00:00:01Z' <= str(entry.timestamp()) + <= '2008-02-03T23:59:59Z') # starttime earlier than endtime self.assertRaises(pywikibot.Error, mysite.logevents, start=pywikibot.Timestamp.fromISOformat( @@ -1373,7 +1374,7 @@ '2008-10-01T01:02:03Z'), total=5): self.assertIsInstance(change, dict) - self.assertLessEqual(change['timestamp'], "2008-10-01T01:02:03Z") + self.assertLessEqual(change['timestamp'], '2008-10-01T01:02:03Z') for change in mysite.recentchanges( end=pywikibot.Timestamp.fromISOformat('2008-04-01T02:03:04Z'), total=5): @@ -1391,11 +1392,11 @@ end=pywikibot.Timestamp.fromISOformat('2008-10-01T04:06:08Z'), total=5, reverse=True): self.assertIsInstance(change, dict) - self.assertLessEqual(change['timestamp'], "2008-10-01T04:06:08Z") + self.assertLessEqual(change['timestamp'], '2008-10-01T04:06:08Z') for change in mysite.recentchanges( start=pywikibot.Timestamp.fromISOformat( '2008-10-03T11:59:59Z'), - end=pywikibot.Timestamp.fromISOformat("2008-10-03T00:00:01Z"), + end=pywikibot.Timestamp.fromISOformat('2008-10-03T00:00:01Z'), total=5): self.assertIsInstance(change, dict) self.assertTrue( @@ -1404,7 +1405,7 @@ for change in mysite.recentchanges( start=pywikibot.Timestamp.fromISOformat( '2008-10-05T06:00:01Z'), - end=pywikibot.Timestamp.fromISOformat("2008-10-05T23:59:59Z"), + end=pywikibot.Timestamp.fromISOformat('2008-10-05T23:59:59Z'), reverse=True, total=5): self.assertIsInstance(change, dict) self.assertTrue( @@ -1412,8 +1413,8 @@ <= '2008-10-05T23:59:59Z') # start earlier than end self.assertRaises(pywikibot.Error, mysite.recentchanges, - start="2008-02-03T00:00:01Z", - end="2008-02-03T23:59:59Z", total=5) + start='2008-02-03T00:00:01Z', + end='2008-02-03T23:59:59Z', total=5) # reverse: end earlier than start self.assertRaises(pywikibot.Error, mysite.recentchanges, start=pywikibot.Timestamp.fromISOformat( @@ -1433,8 +1434,8 @@ self.assertIn('title', change) self.assertIn('ns', change) title = change['title'] - self.assertIn(":", title) - prefix = title[:title.index(":")] + self.assertIn(':', title) + prefix = title[:title.index(':')] self.assertIn(self.site.namespaces.lookup_name(prefix).id, [6, 7]) self.assertIn(change["ns"], [6, 7]) @@ -1451,43 +1452,43 @@ for change in mysite.recentchanges(pagelist=pagelist, total=5): self.assertIsInstance(change, dict) - self.assertIn("title", change) - self.assertIn(change["title"], titlelist) + self.assertIn('title', change) + self.assertIn(change['title'], titlelist) def test_changetype(self): """Test the site.recentchanges() with changetype.""" mysite = self.site - for typ in ("edit", "new", "log"): + for typ in ('edit', 'new', 'log'): for change in mysite.recentchanges(changetype=typ, total=5): self.assertIsInstance(change, dict) - self.assertIn("type", change) - self.assertEqual(change["type"], typ) + self.assertIn('type', change) + self.assertEqual(change['type'], typ) def test_flags(self): """Test the site.recentchanges() with boolean flags.""" mysite = self.site for change in mysite.recentchanges(minor=True, total=5): self.assertIsInstance(change, dict) - self.assertIn("minor", change) + self.assertIn('minor', change) for change in mysite.recentchanges(minor=False, total=5): self.assertIsInstance(change, dict) - self.assertNotIn("minor", change) + self.assertNotIn('minor', change) for change in mysite.recentchanges(bot=True, total=5): self.assertIsInstance(change, dict) - self.assertIn("bot", change) + self.assertIn('bot', change) for change in mysite.recentchanges(bot=False, total=5): self.assertIsInstance(change, dict) - self.assertNotIn("bot", change) + self.assertNotIn('bot', change) for change in mysite.recentchanges(anon=True, total=5): self.assertIsInstance(change, dict) for change in mysite.recentchanges(anon=False, total=5): self.assertIsInstance(change, dict) for change in mysite.recentchanges(redirect=True, total=5): self.assertIsInstance(change, dict) - self.assertIn("redirect", change) + self.assertIn('redirect', change) for change in mysite.recentchanges(redirect=False, total=5): self.assertIsInstance(change, dict) - self.assertNotIn("redirect", change) + self.assertNotIn('redirect', change) def test_tag_filter(self): """Test the site.recentchanges() with tag filter.""" @@ -1512,11 +1513,11 @@ for change in mysite.recentchanges(patrolled=True, total=5): self.assertIsInstance(change, dict) if mysite.has_right('patrol'): - self.assertIn("patrolled", change) + self.assertIn('patrolled', change) for change in mysite.recentchanges(patrolled=False, total=5): self.assertIsInstance(change, dict) if mysite.has_right('patrol'): - self.assertNotIn("patrolled", change) + self.assertNotIn('patrolled', change) class TestUserWatchedPages(DefaultSiteTestCase): @@ -1555,34 +1556,36 @@ super(SearchTestCase, self).setUp() if self.site.has_extension('Wikia Search'): raise unittest.SkipTest( - 'The site %r does not use MediaWiki search' % self.site) + 'The site {!r} does not use MediaWiki search' + .format(self.site)) def test_search(self): """Test the site.search() method.""" mysite = self.site try: - se = list(mysite.search("wiki", total=100, namespaces=0)) + se = list(mysite.search('wiki', total=100, namespaces=0)) self.assertLessEqual(len(se), 100) self.assertTrue(all(isinstance(hit, pywikibot.Page) for hit in se)) self.assertTrue(all(hit.namespace() == 0 for hit in se)) - for hit in mysite.search("common", namespaces=4, total=5): + for hit in mysite.search('common', namespaces=4, total=5): self.assertIsInstance(hit, pywikibot.Page) self.assertEqual(hit.namespace(), 4) - for hit in mysite.search("word", namespaces=[5, 6, 7], total=5): + for hit in mysite.search('word', namespaces=[5, 6, 7], total=5): self.assertIsInstance(hit, pywikibot.Page) self.assertIn(hit.namespace(), [5, 6, 7]) - for hit in mysite.search("another", namespaces="8|9|10", total=5): + for hit in mysite.search('another', namespaces='8|9|10', total=5): self.assertIsInstance(hit, pywikibot.Page) self.assertIn(hit.namespace(), [8, 9, 10]) - for hit in mysite.search("wiki", namespaces=0, total=10, + for hit in mysite.search('wiki', namespaces=0, total=10, get_redirects=True): self.assertIsInstance(hit, pywikibot.Page) self.assertEqual(hit.namespace(), 0) except pywikibot.data.api.APIError as e: - if e.code == "gsrsearch-error" and "timed out" in e.info: + if e.code == 'gsrsearch-error' and 'timed out' in e.info: raise unittest.SkipTest( - 'gsrsearch returned timeout on site: %r' % e) + 'gsrsearch returned timeout on site: {!r}' + .format(e)) raise @suppress_warnings("where='title' is deprecated", DeprecationWarning) @@ -1639,14 +1642,14 @@ for contrib in mysite.usercontribs(user=mysite.user(), namespaces=14, total=5): self.assertIsInstance(contrib, dict) - self.assertIn("title", contrib) - self.assertTrue(contrib["title"].startswith(mysite.namespace(14))) + self.assertIn('title', contrib) + self.assertTrue(contrib['title'].startswith(mysite.namespace(14))) for contrib in mysite.usercontribs(user=mysite.user(), namespaces=[10, 11], total=5): self.assertIsInstance(contrib, dict) - self.assertIn("title", contrib) - self.assertIn(contrib["ns"], (10, 11)) + self.assertIn('title', contrib) + self.assertIn(contrib['ns'], (10, 11)) def test_show_minor(self): """Test the site.usercontribs() method using showMinor.""" @@ -1654,12 +1657,12 @@ for contrib in mysite.usercontribs(user=mysite.user(), minor=True, total=5): self.assertIsInstance(contrib, dict) - self.assertIn("minor", contrib) + self.assertIn('minor', contrib) for contrib in mysite.usercontribs(user=mysite.user(), minor=False, total=5): self.assertIsInstance(contrib, dict) - self.assertNotIn("minor", contrib) + self.assertNotIn('minor', contrib) class TestUserContribsWithoutUser(DefaultSiteTestCase): @@ -1669,11 +1672,11 @@ def test_user_prefix(self): """Test the site.usercontribs() method with userprefix.""" mysite = self.get_site() - for contrib in mysite.usercontribs(userprefix="John", total=5): + for contrib in mysite.usercontribs(userprefix='John', total=5): self.assertIsInstance(contrib, dict) - for key in ("user", "title", "ns", "pageid", "revid"): + for key in ('user', 'title', 'ns', 'pageid', 'revid'): self.assertIn(key, contrib) - self.assertTrue(contrib["user"].startswith("John")) + self.assertTrue(contrib['user'].startswith('John')) def test_user_prefix_range(self): """Test the site.usercontribs() method.""" @@ -1713,9 +1716,9 @@ for contrib in mysite.usercontribs( userprefix='Brion', - end=pywikibot.Timestamp.fromISOformat("2008-10-09T04:06:08Z"), + end=pywikibot.Timestamp.fromISOformat('2008-10-09T04:06:08Z'), total=5, reverse=True): - self.assertLessEqual(contrib['timestamp'], "2008-10-09T04:06:08Z") + self.assertLessEqual(contrib['timestamp'], '2008-10-09T04:06:08Z') start = '2008-10-11T06:00:01Z' end = '2008-10-11T23:59:59Z' @@ -1731,14 +1734,14 @@ mysite = self.get_site() # start earlier than end self.assertRaises(pywikibot.Error, mysite.usercontribs, - userprefix="Jim", - start="2008-10-03T00:00:01Z", - end="2008-10-03T23:59:59Z", total=5) + userprefix='Jim', + start='2008-10-03T00:00:01Z', + end='2008-10-03T23:59:59Z', total=5) # reverse: end earlier than start self.assertRaises(pywikibot.Error, mysite.usercontribs, - userprefix="Jim", - start="2008-10-03T23:59:59Z", - end="2008-10-03T00:00:01Z", reverse=True, total=5) + userprefix='Jim', + start='2008-10-03T23:59:59Z', + end='2008-10-03T00:00:01Z', reverse=True, total=5) class SiteWatchlistRevsTestCase(DefaultSiteTestCase): @@ -1754,31 +1757,31 @@ self.assertLessEqual(len(wl), 10) self.assertTrue(all(isinstance(rev, dict) for rev in wl)) - for rev in mysite.watchlist_revs(start="2008-10-11T01:02:03Z", + for rev in mysite.watchlist_revs(start='2008-10-11T01:02:03Z', total=5): self.assertIsInstance(rev, dict) - self.assertLessEqual(rev['timestamp'], "2008-10-11T01:02:03Z") - for rev in mysite.watchlist_revs(end="2008-04-01T02:03:04Z", + self.assertLessEqual(rev['timestamp'], '2008-10-11T01:02:03Z') + for rev in mysite.watchlist_revs(end='2008-04-01T02:03:04Z', total=5): self.assertIsInstance(rev, dict) - self.assertGreaterEqual(rev['timestamp'], "2008-10-11T02:03:04Z") - for rev in mysite.watchlist_revs(start="2008-10-11T03:05:07Z", + self.assertGreaterEqual(rev['timestamp'], '2008-10-11T02:03:04Z') + for rev in mysite.watchlist_revs(start='2008-10-11T03:05:07Z', total=5, reverse=True): self.assertIsInstance(rev, dict) - self.assertGreaterEqual(rev['timestamp'], "2008-10-11T03:05:07Z") - for rev in mysite.watchlist_revs(end="2008-10-11T04:06:08Z", + self.assertGreaterEqual(rev['timestamp'], '2008-10-11T03:05:07Z') + for rev in mysite.watchlist_revs(end='2008-10-11T04:06:08Z', total=5, reverse=True): self.assertIsInstance(rev, dict) - self.assertLessEqual(rev['timestamp'], "2008-10-11T04:06:08Z") - for rev in mysite.watchlist_revs(start="2008-10-13T11:59:59Z", - end="2008-10-13T00:00:01Z", + self.assertLessEqual(rev['timestamp'], '2008-10-11T04:06:08Z') + for rev in mysite.watchlist_revs(start='2008-10-13T11:59:59Z', + end='2008-10-13T00:00:01Z', total=5): self.assertIsInstance(rev, dict) self.assertTrue( '2008-10-13T00:00:01Z' <= rev['timestamp'] <= '2008-10-13T11:59:59Z') - for rev in mysite.watchlist_revs(start="2008-10-15T06:00:01Z", - end="2008-10-15T23:59:59Z", + for rev in mysite.watchlist_revs(start='2008-10-15T06:00:01Z', + end='2008-10-15T23:59:59Z', reverse=True, total=5): self.assertIsInstance(rev, dict) self.assertTrue( @@ -1786,33 +1789,33 @@ <= '2008-10-15T23:59:59Z') # start earlier than end self.assertRaises(pywikibot.Error, mysite.watchlist_revs, - start="2008-09-03T00:00:01Z", - end="2008-09-03T23:59:59Z", total=5) + start='2008-09-03T00:00:01Z', + end='2008-09-03T23:59:59Z', total=5) # reverse: end earlier than start self.assertRaises(pywikibot.Error, mysite.watchlist_revs, - start="2008-09-03T23:59:59Z", - end="2008-09-03T00:00:01Z", reverse=True, total=5) + start='2008-09-03T23:59:59Z', + end='2008-09-03T00:00:01Z', reverse=True, total=5) for rev in mysite.watchlist_revs(namespaces=[6, 7], total=5): self.assertIsInstance(rev, dict) self.assertIn('title', rev) self.assertIn('ns', rev) title = rev['title'] - self.assertIn(":", title) - prefix = title[:title.index(":")] + self.assertIn(':', title) + prefix = title[:title.index(':')] self.assertIn(self.site.namespaces.lookup_name(prefix).id, [6, 7]) - self.assertIn(rev["ns"], [6, 7]) + self.assertIn(rev['ns'], [6, 7]) for rev in mysite.watchlist_revs(minor=True, total=5): self.assertIsInstance(rev, dict) - self.assertIn("minor", rev) + self.assertIn('minor', rev) for rev in mysite.watchlist_revs(minor=False, total=5): self.assertIsInstance(rev, dict) - self.assertNotIn("minor", rev) + self.assertNotIn('minor', rev) for rev in mysite.watchlist_revs(bot=True, total=5): self.assertIsInstance(rev, dict) - self.assertIn("bot", rev) + self.assertIn('bot', rev) for rev in mysite.watchlist_revs(bot=False, total=5): self.assertIsInstance(rev, dict) - self.assertNotIn("bot", rev) + self.assertNotIn('bot', rev) for rev in mysite.watchlist_revs(anon=True, total=5): self.assertIsInstance(rev, dict) for rev in mysite.watchlist_revs(anon=False, total=5): @@ -1829,10 +1832,10 @@ """Test sysop related methods.""" mysite = self.get_site() self.assertIsInstance(mysite.is_blocked(True), bool) - self.assertIsInstance(mysite.has_right("edit", True), bool) - self.assertFalse(mysite.has_right("nonexistent_right", True)) - self.assertIsInstance(mysite.has_group("bots", True), bool) - self.assertFalse(mysite.has_group("nonexistent_group", True)) + self.assertIsInstance(mysite.has_right('edit', True), bool) + self.assertFalse(mysite.has_right('nonexistent_right', True)) + self.assertIsInstance(mysite.has_group('bots', True), bool) + self.assertFalse(mysite.has_group('nonexistent_group', True)) def test_deletedrevs(self): """Test the site.deletedrevs() method.""" @@ -1847,56 +1850,56 @@ self.assertLessEqual(len(dr['revisions']), 10) self.assertTrue(all(isinstance(rev, dict) for rev in dr['revisions'])) - for item in mysite.deletedrevs(start="2008-10-11T01:02:03Z", + for item in mysite.deletedrevs(start='2008-10-11T01:02:03Z', page=mainpage, total=5): for rev in item['revisions']: self.assertIsInstance(rev, dict) - self.assertLessEqual(rev['timestamp'], "2008-10-11T01:02:03Z") - for item in mysite.deletedrevs(end="2008-04-01T02:03:04Z", + self.assertLessEqual(rev['timestamp'], '2008-10-11T01:02:03Z') + for item in mysite.deletedrevs(end='2008-04-01T02:03:04Z', page=mainpage, total=5): for rev in item['revisions']: self.assertIsInstance(rev, dict) self.assertGreaterEqual(rev['timestamp'], '2008-10-11T02:03:04Z') - for item in mysite.deletedrevs(start="2008-10-11T03:05:07Z", + for item in mysite.deletedrevs(start='2008-10-11T03:05:07Z', page=mainpage, total=5, reverse=True): for rev in item['revisions']: self.assertIsInstance(rev, dict) self.assertGreaterEqual(rev['timestamp'], '2008-10-11T03:05:07Z') - for item in mysite.deletedrevs(end="2008-10-11T04:06:08Z", + for item in mysite.deletedrevs(end='2008-10-11T04:06:08Z', page=mainpage, total=5, reverse=True): for rev in item['revisions']: self.assertIsInstance(rev, dict) - self.assertLessEqual(rev['timestamp'], "2008-10-11T04:06:08Z") - for item in mysite.deletedrevs(start="2008-10-13T11:59:59Z", - end="2008-10-13T00:00:01Z", + self.assertLessEqual(rev['timestamp'], '2008-10-11T04:06:08Z') + for item in mysite.deletedrevs(start='2008-10-13T11:59:59Z', + end='2008-10-13T00:00:01Z', page=mainpage, total=5): for rev in item['revisions']: self.assertIsInstance(rev, dict) - self.assertLessEqual(rev['timestamp'], "2008-10-13T11:59:59Z") + self.assertLessEqual(rev['timestamp'], '2008-10-13T11:59:59Z') self.assertGreaterEqual(rev['timestamp'], '2008-10-13T00:00:01Z') - for item in mysite.deletedrevs(start="2008-10-15T06:00:01Z", - end="2008-10-15T23:59:59Z", + for item in mysite.deletedrevs(start='2008-10-15T06:00:01Z', + end='2008-10-15T23:59:59Z', page=mainpage, reverse=True, total=5): for rev in item['revisions']: self.assertIsInstance(rev, dict) - self.assertLessEqual(rev['timestamp'], "2008-10-15T23:59:59Z") + self.assertLessEqual(rev['timestamp'], '2008-10-15T23:59:59Z') self.assertGreaterEqual(rev['timestamp'], '2008-10-15T06:00:01Z') # start earlier than end self.assertRaises(pywikibot.Error, mysite.deletedrevs, - page=mainpage, start="2008-09-03T00:00:01Z", - end="2008-09-03T23:59:59Z", total=5) + page=mainpage, start='2008-09-03T00:00:01Z', + end='2008-09-03T23:59:59Z', total=5) # reverse: end earlier than start self.assertRaises(pywikibot.Error, mysite.deletedrevs, - page=mainpage, start="2008-09-03T23:59:59Z", - end="2008-09-03T00:00:01Z", reverse=True, + page=mainpage, start='2008-09-03T23:59:59Z', + end='2008-09-03T00:00:01Z', reverse=True, total=5) @@ -1913,7 +1916,7 @@ def test_protect(self): """Test the site.protect() method.""" site = self.get_site() - p1 = pywikibot.Page(site, u'User:Unicodesnowman/ProtectTest') + p1 = pywikibot.Page(site, 'User:Unicodesnowman/ProtectTest') r = site.protect(protections={'edit': 'sysop', 'move': 'autoconfirmed'}, @@ -1921,8 +1924,8 @@ reason='Pywikibot unit test') self.assertEqual(r, None) self.assertEqual(site.page_restrictions(page=p1), - {u'edit': (u'sysop', u'infinity'), - u'move': (u'autoconfirmed', u'infinity')}) + {'edit': ('sysop', 'infinity'), + 'move': ('autoconfirmed', 'infinity')}) expiry = pywikibot.Timestamp.fromISOformat('2050-01-01T00:00:00Z') site.protect(protections={'edit': 'sysop', 'move': 'autoconfirmed'}, @@ -1942,7 +1945,7 @@ def test_protect_alt(self): """Test the site.protect() method, works around T78522.""" site = self.get_site() - p1 = pywikibot.Page(site, u'User:Unicodesnowman/ProtectTest') + p1 = pywikibot.Page(site, 'User:Unicodesnowman/ProtectTest') r = site.protect(protections={'edit': 'sysop', 'move': 'autoconfirmed'}, @@ -1950,10 +1953,10 @@ reason='Pywikibot unit test') self.assertEqual(r, None) self.assertEqual(site.page_restrictions(page=p1), - {u'edit': (u'sysop', u'infinity'), - u'move': (u'autoconfirmed', u'infinity')}) + {'edit': ('sysop', 'infinity'), + 'move': ('autoconfirmed', 'infinity')}) - p1 = pywikibot.Page(site, u'User:Unicodesnowman/ProtectTest') + p1 = pywikibot.Page(site, 'User:Unicodesnowman/ProtectTest') expiry = pywikibot.Timestamp.fromISOformat('2050-01-01T00:00:00Z') site.protect(protections={'edit': 'sysop', 'move': 'autoconfirmed'}, page=p1, @@ -1964,7 +1967,7 @@ {'edit': ('sysop', '2050-01-01T00:00:00Z'), 'move': ('autoconfirmed', '2050-01-01T00:00:00Z')}) - p1 = pywikibot.Page(site, u'User:Unicodesnowman/ProtectTest') + p1 = pywikibot.Page(site, 'User:Unicodesnowman/ProtectTest') site.protect(protections={'edit': '', 'move': ''}, page=p1, reason='Pywikibot unit test') @@ -1973,7 +1976,7 @@ def test_protect_exception(self): """Test that site.protect() throws an exception for invalid args.""" site = self.get_site() - p1 = pywikibot.Page(site, u'User:Unicodesnowman/ProtectTest') + p1 = pywikibot.Page(site, 'User:Unicodesnowman/ProtectTest') self.assertRaises(pywikibot.Error, site.protect, protections={'anInvalidValue': 'sysop'}, page=p1, reason='Pywikibot unit test') @@ -1984,7 +1987,7 @@ def test_delete(self): """Test the site.deletepage() and site.undelete_page() methods.""" site = self.get_site() - p = pywikibot.Page(site, u'User:Unicodesnowman/DeleteTestSite') + p = pywikibot.Page(site, 'User:Unicodesnowman/DeleteTestSite') # Verify state if not p.exists(): site.undelete_page(p, 'pywikibot unit tests') @@ -1993,8 +1996,8 @@ self.assertRaises(pywikibot.NoPage, p.get, force=True) site.undelete_page(p, 'pywikibot unit tests', - revisions=[u'2014-12-21T06:07:47Z', - u'2014-12-21T06:07:31Z']) + revisions=['2014-12-21T06:07:47Z', + '2014-12-21T06:07:31Z']) revs = list(p.revisions()) self.assertEqual(len(revs), 2) @@ -2033,10 +2036,10 @@ mysite = self.site cnt = 0 for user in mysite.users( - ["Jimbo Wales", "Brion VIBBER", "Tim Starling"]): + ['Jimbo Wales', 'Brion VIBBER', 'Tim Starling']): self.assertIsInstance(user, dict) - self.assertTrue(user["name"] - in ["Jimbo Wales", "Brion VIBBER", "Tim Starling"]) + self.assertTrue(user['name'] + in ['Jimbo Wales', 'Brion VIBBER', 'Tim Starling']) cnt += 1 if not cnt: raise unittest.SkipTest('Test usernames not found') @@ -2068,13 +2071,13 @@ try: result = list(mysite.patrol(rcid=rc['rcid'])) except api.APIError as error: - if error.code == u'permissiondenied': + if error.code == 'permissiondenied': raise unittest.SkipTest(error) raise - if hasattr(mysite, u'_patroldisabled') and mysite._patroldisabled: - raise unittest.SkipTest(u'Patrolling is disabled on %s wiki.' - % mysite) + if hasattr(mysite, '_patroldisabled') and mysite._patroldisabled: + raise unittest.SkipTest('Patrolling is disabled on {} wiki.' + .format(mysite)) result = result[0] self.assertIsInstance(result, dict) @@ -2087,7 +2090,7 @@ # no such rcid, revid or too old revid result = list(mysite.patrol(**params)) except api.APIError as error: - if error.code == u'badtoken': + if error.code == 'badtoken': raise unittest.SkipTest(error) except pywikibot.Error: # expected result @@ -2174,17 +2177,17 @@ """Test tokens.""" if version and self._version < MediaWikiVersion(version): raise unittest.SkipTest( - u'Site %s version %s is too low for this tests.' - % (self.mysite, self._version)) + 'Site {} version {} is too low for this tests.' + .format(self.mysite, self._version)) if version and self._version < MediaWikiVersion(test_version): raise unittest.SkipTest( - u'Site %s version %s is too low for this tests.' - % (self.mysite, self._version)) + 'Site {} version {} is too low for this tests.' + .format(self.mysite, self._version)) self.mysite.version = lambda: test_version - for ttype in ("edit", "move", additional_token): + for ttype in ('edit', 'move', additional_token): tokentype = self.mysite.validate_tokens([ttype]) try: token = self.mysite.tokens[ttype] @@ -2251,7 +2254,7 @@ token = self.token mysite = self.get_site() mainpage = self.get_mainpage() - ttype = "edit" + ttype = 'edit' self.assertEqual(token, mysite.token(mainpage, ttype)) self.assertOneDeprecationParts('pywikibot.site.APISite.token', "the 'tokens' property") @@ -2421,7 +2424,8 @@ entered_loop(mysite.siteinfo.get(not_exists).itervalues())) self.assertFalse( entered_loop(mysite.siteinfo.get(not_exists).iterkeys())) - self.assertFalse(entered_loop(mysite.siteinfo.get(not_exists).items())) + self.assertFalse( + entered_loop(mysite.siteinfo.get(not_exists).items())) self.assertFalse( entered_loop(mysite.siteinfo.get(not_exists).values())) self.assertFalse(entered_loop(mysite.siteinfo.get(not_exists).keys())) @@ -2547,7 +2551,7 @@ self.assertEqual(len(self.mainpage._revisions), 15) revs = self.mainpage._revisions timestamps = [str(revs[rev].timestamp) for rev in revs] - self.assertTrue(all(ts < "2002-01-31T00:00:00Z" for ts in timestamps)) + self.assertTrue(all(ts < '2002-01-31T00:00:00Z' for ts in timestamps)) # Retrieve oldest revisions; listing based on timestamp. # Raises "loadrevisions: starttime > endtime with rvdir=True" @@ -2574,29 +2578,29 @@ # Raises "loadrevisions: startid > endid with rvdir=True" self.assertRaises(ValueError, self.mysite.loadrevisions, self.mainpage, rvdir=True, - startid="200000", endid="100000") + startid='200000', endid='100000') # Retrieve newest revisions; listing based on revid. # Raises "loadrevisions: endid > startid with rvdir=False self.assertRaises(ValueError, self.mysite.loadrevisions, self.mainpage, rvdir=False, - startid="100000", endid="200000") + startid='100000', endid='200000') def test_loadrevisions_user(self): """Test the site.loadrevisions() method, filtering by user.""" # Only list revisions made by this user. self.mainpage._revisions = {} self.mysite.loadrevisions(self.mainpage, rvdir=True, - user="Magnus Manske") + user='Magnus Manske') revs = self.mainpage._revisions - self.assertTrue(all(revs[rev].user == "Magnus Manske" for rev in revs)) + self.assertTrue(all(revs[rev].user == 'Magnus Manske' for rev in revs)) def test_loadrevisions_excludeuser(self): """Test the site.loadrevisions() method, excluding user.""" # Do not list revisions made by this user. self.mainpage._revisions = {} self.mysite.loadrevisions(self.mainpage, rvdir=True, - excludeuser="Magnus Manske") + excludeuser='Magnus Manske') revs = self.mainpage._revisions self.assertFalse(any(revs[rev].user == 'Magnus Manske' for rev in revs)) @@ -2674,15 +2678,15 @@ """Test cases for Site methods on Commons.""" - family = "commons" - code = "commons" + family = 'commons' + code = 'commons' cached = True def test_interwiki_forward(self): """Test interwiki forward.""" self.site = self.get_site() - self.mainpage = pywikibot.Page(pywikibot.Link("Main Page", self.site)) + self.mainpage = pywikibot.Page(pywikibot.Link('Main Page', self.site)) # test pagelanglinks on commons, # which forwards interwikis to wikipedia ll = next(self.site.pagelanglinks(self.mainpage)) @@ -3532,11 +3536,11 @@ def test_non_mw_sites(self): """Test NonMWAPISite for sites not using MediaWiki.""" - self._run_test("http://moinmo.in/$1") - self._run_test("http://twiki.org/cgi-bin/view/$1") - self._run_test("http://www.usemod.com/cgi-bin/wiki.pl?$1") - self._run_test("https://developer.mozilla.org/en/docs/$1") - self._run_test("http://www.tvtropes.org/pmwiki/pmwiki.php/Main/$1") + self._run_test('http://moinmo.in/$1') + self._run_test('http://twiki.org/cgi-bin/view/$1') + self._run_test('http://www.usemod.com/cgi-bin/wiki.pl?$1') + self._run_test('https://developer.mozilla.org/en/docs/$1') + self._run_test('http://www.tvtropes.org/pmwiki/pmwiki.php/Main/$1') def _run_test(self, url): """Run test method.""" @@ -3565,8 +3569,8 @@ def test_cache_proofreadinfo_on_site_with_proofreadpage(self): """Test Site._cache_proofreadinfo().""" site = self.get_site('en-ws') - ql_res = {0: u'Without text', 1: u'Not proofread', 2: u'Problematic', - 3: u'Proofread', 4: u'Validated'} + ql_res = {0: 'Without text', 1: 'Not proofread', 2: 'Problematic', + 3: 'Proofread', 4: 'Validated'} site._cache_proofreadinfo() self.assertEqual(site.namespaces[106], site.proofread_index_ns) diff --git a/tests/sparql_tests.py b/tests/sparql_tests.py index c3440dd..ef9a0cb 100644 --- a/tests/sparql_tests.py +++ b/tests/sparql_tests.py @@ -18,11 +18,11 @@ SQL_RESPONSE_CONTAINER = """ { - "head" : { - "vars" : [ "cat", "d", "catLabel" ] + 'head' : { + 'vars' : [ 'cat', 'd', 'catLabel' ] }, - "results" : { - "bindings" : [ + 'results' : { + 'bindings' : [ %s ] } @@ -31,19 +31,19 @@ ITEM_Q498787 = """ { - "cat" : { - "type" : "uri", - "value" : "http://www.wikidata.org/entity/Q498787" + 'cat' : { + 'type' : 'uri', + 'value' : 'http://www.wikidata.org/entity/Q498787' }, - "d" : { - "datatype" : "http://www.w3.org/2001/XMLSchema#dateTime", - "type" : "literal", - "value" : "1955-01-01T00:00:00Z" + 'd' : { + 'datatype' : 'http://www.w3.org/2001/XMLSchema#dateTime', + 'type' : 'literal', + 'value' : '1955-01-01T00:00:00Z' }, - "catLabel" : { - "xml:lang" : "en", - "type" : "literal", - "value" : "Muezza" + 'catLabel' : { + 'xml:lang' : 'en', + 'type' : 'literal', + 'value' : 'Muezza' } } """ @@ -51,33 +51,33 @@ ITEM_Q677525 = """ { "cat" : { - "type" : "uri", - "value" : "http://www.wikidata.org/entity/Q677525" + 'type' : 'uri', + 'value' : 'http://www.wikidata.org/entity/Q677525' }, - "d" : { - "datatype" : "http://www.w3.org/2001/XMLSchema#dateTime", - "type" : "literal", - "value" : "2015-06-22T00:00:00Z" + 'd' : { + 'datatype' : 'http://www.w3.org/2001/XMLSchema#dateTime', + 'type' : 'literal', + 'value' : '2015-06-22T00:00:00Z' }, - "catLabel" : { - "xml:lang" : "en", - "type" : "literal", - "value" : "Orangey" + 'catLabel' : { + 'xml:lang' : 'en', + 'type' : 'literal', + 'value' : 'Orangey' } } """ RESPONSE_TRUE = """ { - "head" : { }, - "boolean" : true + 'head' : { }, + 'boolean' : true } """ RESPONSE_FALSE = """ { - "head" : { }, - "boolean" : false + 'head' : { }, + 'boolean' : false } """ @@ -97,51 +97,58 @@ def testQuerySelect(self, mock_method): """Test SELECT query.""" mock_method.return_value = Container( - SQL_RESPONSE_CONTAINER % ("%s, %s" % (ITEM_Q498787, ITEM_Q677525))) + SQL_RESPONSE_CONTAINER % ('{}, {}' + .format(ITEM_Q498787, ITEM_Q677525))) q = sparql.SparqlQuery() res = q.select('SELECT * WHERE { ?x ?y ?z }') self.assertIsInstance(res, list, 'Result is not a list') self.assertEqual(len(res), 2) - self.assertDictEqual(res[0], - {'cat': 'http://www.wikidata.org/entity/Q498787', - 'catLabel': 'Muezza', 'd': '1955-01-01T00:00:00Z'}, - 'Bad result') - self.assertDictEqual(res[1], - {'cat': 'http://www.wikidata.org/entity/Q677525', - 'catLabel': 'Orangey', 'd': '2015-06-22T00:00:00Z'}, - 'Bad result') + self.assertDictEqual( + res[0], {'cat': 'http://www.wikidata.org/entity/Q498787', + 'catLabel': 'Muezza', 'd': '1955-01-01T00:00:00Z'}, + 'Bad result') + self.assertDictEqual( + res[1], {'cat': 'http://www.wikidata.org/entity/Q677525', + 'catLabel': 'Orangey', 'd': '2015-06-22T00:00:00Z'}, + 'Bad result') @patch.object(sparql.http, 'fetch') def testQuerySelectFull(self, mock_method): """Test SELECT query with full data.""" mock_method.return_value = Container( - SQL_RESPONSE_CONTAINER % ("%s, %s" % (ITEM_Q498787, ITEM_Q677525))) + SQL_RESPONSE_CONTAINER % ('{}, {}' + .format(ITEM_Q498787, ITEM_Q677525))) q = sparql.SparqlQuery() res = q.select('SELECT * WHERE { ?x ?y ?z }', full_data=True) self.assertIsInstance(res, list, 'Result is not a list') self.assertEqual(len(res), 2) self.assertIsInstance(res[0]['cat'], sparql.URI, 'Wrong type for URI') - self.assertEqual(repr(res[0]['cat']), '<http://www.wikidata.org/entity/Q498787>', + self.assertEqual(repr(res[0]['cat']), + '<http://www.wikidata.org/entity/Q498787>', 'Wrong URI representation') self.assertEqual(res[0]['cat'].getID(), 'Q498787', 'Wrong URI ID') - self.assertIsInstance(res[0]['catLabel'], sparql.Literal, 'Wrong type for Literal') - self.assertEqual(repr(res[0]['catLabel']), 'Muezza@en', 'Wrong literal representation') + self.assertIsInstance(res[0]['catLabel'], sparql.Literal, + 'Wrong type for Literal') + self.assertEqual(repr(res[0]['catLabel']), 'Muezza@en', + 'Wrong literal representation') - self.assertIsInstance(res[0]['d'], sparql.Literal, 'Wrong type for Literal') - self.assertEqual(repr(res[0]['d']), - '1955-01-01T00:00:00Z^^http://www.w3.org/2001/XMLSchema#dateTime', - 'Wrong URI representation') + self.assertIsInstance(res[0]['d'], sparql.Literal, + 'Wrong type for Literal') + self.assertEqual( + repr(res[0]['d']), + '1955-01-01T00:00:00Z^^http://www.w3.org/2001/XMLSchema#dateTime', + 'Wrong URI representation') @patch.object(sparql.http, 'fetch') def testGetItems(self, mock_method): """Test item list retrieval via SPARQL.""" mock_method.return_value = Container( - SQL_RESPONSE_CONTAINER % ("%s, %s, %s" % (ITEM_Q498787, - ITEM_Q677525, - ITEM_Q677525))) + SQL_RESPONSE_CONTAINER % ('{}, {}, {}'.format(ITEM_Q498787, + ITEM_Q677525, + ITEM_Q677525))) q = sparql.SparqlQuery() res = q.get_items('SELECT * WHERE { ?x ?y ?z }', 'cat') self.assertSetEqual(res, {'Q498787', 'Q677525'}) @@ -186,14 +193,16 @@ def test__unicode__returnsUnicodeType(self): """__unicode__ should return type unicode.""" - self.assertIsInstance(self.object_under_test.__unicode__(), UnicodeType) + self.assertIsInstance(self.object_under_test.__unicode__(), + UnicodeType) class LiteralTests(Shared.SparqlNodeTests): """Tests for sparql.Literal.""" net = False - object_under_test = sparql.Literal({'datatype': '', 'lang': 'en', 'value': 'value'}) + object_under_test = sparql.Literal({'datatype': '', 'lang': 'en', + 'value': 'value'}) class BnodeTests(Shared.SparqlNodeTests): @@ -207,7 +216,8 @@ """Tests for sparql.URI.""" net = False - object_under_test = sparql.URI({'value': 'http://foo.com'}, 'http://bar.com') + object_under_test = sparql.URI({'value': 'http://foo.com'}, + 'http://bar.com') if __name__ == '__main__': # pragma: no cover -- To view, visit https://gerrit.wikimedia.org/r/463284 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: I97d24fa834e3f875a8547fc0e38f5a240f93907e Gerrit-Change-Number: 463284 Gerrit-PatchSet: 2 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

5 years, 7 months

[Gerrit] pywikibot/core[master]: Fix all diff_checker related errors in scripts/*

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463257 ) Change subject: Fix all diff_checker related errors in scripts/* ...................................................................... Fix all diff_checker related errors in scripts/* Change-Id: Ibedb230e13bc2be15bfc0cba229c257fff8fa595 --- M scripts/archive/featured.py M scripts/archivebot.py M scripts/casechecker.py M scripts/category.py M scripts/category_redirect.py M scripts/cfd.py M scripts/checkimages.py M scripts/claimit.py M scripts/commonscat.py M scripts/data_ingestion.py M scripts/delete.py M scripts/fixing_redirects.py M scripts/harvest_template.py M scripts/illustrate_wikidata.py M scripts/imagecopy_self.py M scripts/imageuncat.py M scripts/login.py M scripts/lonelypages.py M scripts/maintenance/cache.py M scripts/maintenance/compat2core.py M scripts/maintenance/make_i18n_dict.py M scripts/maintenance/wikimedia_sites.py M scripts/match_images.py M scripts/noreferences.py M scripts/nowcommons.py M scripts/pagefromfile.py M scripts/reflinks.py M scripts/replace.py M scripts/script_wui.py M scripts/solve_disambiguation.py M scripts/table2wiki.py M scripts/transferbot.py M scripts/weblinkchecker.py M scripts/welcome.py 34 files changed, 206 insertions(+), 176 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/archive/featured.py b/scripts/archive/featured.py index d21128b..5f5c406 100755 --- a/scripts/archive/featured.py +++ b/scripts/archive/featured.py @@ -122,11 +122,11 @@ '_default': ['Link FA'], 'als': ['LinkFA'], 'an': ['Destacato', 'Destacau'], - 'ar': [u'وصلة مقالة مختارة'], + 'ar': ['وصلة مقالة مختارة'], 'ast': ['Enllaz AD'], 'az': ['Link FM'], 'br': ['Liamm PuB', 'Lien AdQ'], - 'ca': [u'Enllaç AD', 'Destacat'], + 'ca': ['Enllaç AD', 'Destacat'], 'cy': ['Cyswllt erthygl ddethol', 'Dolen ED'], 'eo': ['LigoElstara'], 'en': ['Link FA', 'FA link'], @@ -135,36 +135,36 @@ 'fr': ['Lien AdQ'], 'fur': ['Leam VdC'], 'ga': ['Nasc AR'], - 'gl': [u'Ligazón AD', 'Destacado'], + 'gl': ['Ligazón AD', 'Destacado'], 'hi': ['Link FA', 'Lien AdQ'], - 'is': [u'Tengill ÚG'], + 'is': ['Tengill ÚG'], 'it': ['Link V', 'Link AdQ'], 'no': ['Link UA'], 'oc': ['Ligam AdQ', 'Lien AdQ'], - 'ro': [u'Legătură AC', u'Legătură AF'], + 'ro': ['Legătură AC', 'Legătură AF'], 'sv': ['UA', 'Link UA'], 'tr': ['Link SM'], - 'vi': [u'Liên kết chọn lọc'], - 'vo': [u'Yüm YG'], - 'yi': [u'רא'], + 'vi': ['Liên kết chọn lọc'], + 'vo': ['Yüm YG'], + 'yi': ['רא'], } template_good = { '_default': ['Link GA'], - 'ar': [u'وصلة مقالة جيدة'], - 'ca': [u'Enllaç AB', 'Lien BA', 'Abo'], + 'ar': ['وصلة مقالة جيدة'], + 'ca': ['Enllaç AB', 'Lien BA', 'Abo'], 'da': ['Link GA', 'Link AA'], 'eo': ['LigoLeginda'], 'es': ['Bueno'], 'fr': ['Lien BA'], - 'gl': [u'Ligazón AB'], + 'gl': ['Ligazón AB'], 'is': ['Tengill GG'], 'it': ['Link VdQ'], 'nn': ['Link AA'], 'no': ['Link AA'], 'pt': ['Bom interwiki'], # 'tr': ['Link GA', 'Link KM'], - 'vi': [u'Liên kết bài chất lượng tốt'], + 'vi': ['Liên kết bài chất lượng tốt'], 'wo': ['Lien BA'], } @@ -174,7 +174,7 @@ } featured_name = { - 'wikidata': (DATA, u'Q4387444'), + 'wikidata': (DATA, 'Q4387444'), } good_name = { @@ -183,23 +183,23 @@ lists_name = { 'wikidata': (TMPL, 'Q5857568'), - 'ar': (BACK, u'قائمة مختارة'), - 'da': (BACK, u'FremragendeListe'), - 'de': (BACK, u'Informativ'), - 'en': (BACK, u'Featured list'), - 'fa': (BACK, u"فهرست برگزیده"), - 'id': (BACK, u'Featured list'), - 'ja': (BACK, u'Featured List'), + 'ar': (BACK, 'قائمة مختارة'), + 'da': (BACK, 'FremragendeListe'), + 'de': (BACK, 'Informativ'), + 'en': (BACK, 'Featured list'), + 'fa': (BACK, 'فهرست برگزیده'), + 'id': (BACK, 'Featured list'), + 'ja': (BACK, 'Featured List'), 'ksh': (CAT, 'Joode Leß'), - 'no': (BACK, u'God liste'), - 'pl': (BACK, u'Medalista'), - 'pt': (BACK, u'Anexo destacado'), - 'ro': (BACK, u'Listă de calitate'), - 'ru': (BACK, u'Избранный список или портал'), - 'tr': (BACK, u'Seçkin liste'), - 'uk': (BACK, u'Вибраний список'), - 'vi': (BACK, u'Sao danh sách chọn lọc'), - 'zh': (BACK, u'特色列表'), + 'no': (BACK, 'God liste'), + 'pl': (BACK, 'Medalista'), + 'pt': (BACK, 'Anexo destacado'), + 'ro': (BACK, 'Listă de calitate'), + 'ru': (BACK, 'Избранный список или портал'), + 'tr': (BACK, 'Seçkin liste'), + 'uk': (BACK, 'Вибраний список'), + 'vi': (BACK, 'Sao danh sách chọn lọc'), + 'zh': (BACK, '特色列表'), } # Third parameter is the sort key indicating articles to hide from the given @@ -221,7 +221,7 @@ """Only accepts options defined in availableOptions.""" self.availableOptions.update({ 'async': False, # True for asynchronously putting a page - 'afterpage': u"!", + 'afterpage': '!', 'count': False, # featuredcount 'featured': False, 'former': False, @@ -280,19 +280,19 @@ return generator elif self.getOption('fromlang'): fromlang = self.getOption('fromlang') - if len(fromlang) == 1 and fromlang[0].find("--") >= 0: - start, end = fromlang[0].split("--", 1) + if len(fromlang) == 1 and fromlang[0].find('--') >= 0: + start, end = fromlang[0].split('--', 1) if not start: - start = "" + start = '' if not end: - end = "zzzzzzz" + end = 'zzzzzzz' return (site for site in generator if site.code >= start and site.code <= end) else: return (site for site in generator if site.code in fromlang) else: - pywikibot.warning(u'No sites given to verify %s articles.\n' - u'Please use -fromlang: or fromall option\n' + pywikibot.warning('No sites given to verify %s articles.\n' + 'Please use -fromlang: or fromall option\n' % task) return () @@ -314,34 +314,34 @@ def readcache(self, task): if self.getOption('count') or self.getOption('nocache') is True: return - self.filename = pywikibot.config.datafilepath("cache", task) + self.filename = pywikibot.config.datafilepath('cache', task) try: - f = open(self.filename, "rb") + f = open(self.filename, 'rb') self.cache = pickle.load(f) f.close() - pywikibot.output(u'Cache file %s found with %d items.' + pywikibot.output('Cache file %s found with %d items.' % (self.filename, len(self.cache))) except IOError: - pywikibot.output(u'Cache file %s not found.' % self.filename) + pywikibot.output('Cache file %s not found.' % self.filename) def writecache(self): if self.getOption('count'): return if not self.getOption('nocache') is True: - pywikibot.output(u'Writing %d items to cache file %s.' + pywikibot.output('Writing %d items to cache file %s.' % (len(self.cache), self.filename)) - with open(self.filename, "wb") as f: + with open(self.filename, 'wb') as f: pickle.dump(self.cache, f, protocol=config.pickle_protocol) self.cache = {} def run(self): for task in self.tasks: self.run_task(task) - pywikibot.output(u'%d pages written.' % self._save_counter) + pywikibot.output('%d pages written.' % self._save_counter) def run_task(self, task): if not self.hastemplate(task): - pywikibot.output(u'\nNOTE: %s articles are not implemented at %s.' + pywikibot.output('\nNOTE: %s articles are not implemented at %s.' % (task, self.site)) return @@ -369,7 +369,7 @@ method = info[code][0] except KeyError: pywikibot.error( - u'language %s doesn\'t has %s category source.' + "language %s doesn't has %s category source." % (code, task)) return name = info[code][1] @@ -393,13 +393,13 @@ if p.title() < self.getOption('afterpage'): continue - if u"/" in p.title() and p.namespace() != 0: - pywikibot.output(u"%s is a subpage" % p.title()) + if '/' in p.title() and p.namespace() != 0: + pywikibot.output('%s is a subpage' % p.title()) continue if p.title() in cache: - pywikibot.output(u"(cached) %s -> %s" % (p.title(), - cache[p.title()])) + pywikibot.output('(cached) %s -> %s' % ( + p.title(), cache[p.title()])) continue yield p @@ -418,27 +418,28 @@ if not ourpage: if not quiet: - pywikibot.output(u"%s -> no corresponding page in %s" + pywikibot.output('%s -> no corresponding page in %s' % (page.title(), oursite)) elif ourpage.section(): - pywikibot.output(u"%s -> our page is a section link: %s" + pywikibot.output('%s -> our page is a section link: %s' % (page.title(), ourpage.title())) elif not ourpage.exists(): - pywikibot.output(u"%s -> our page doesn't exist: %s" + pywikibot.output("%s -> our page doesn't exist: %s" % (page.title(), ourpage.title())) else: if ourpage.isRedirectPage(): ourpage = ourpage.getRedirectTarget() - pywikibot.output(u"%s -> corresponding page is %s" + pywikibot.output('%s -> corresponding page is %s' % (page.title(), ourpage.title())) if ourpage.namespace() != 0: - pywikibot.output(u"%s -> not in the main namespace, skipping" + pywikibot.output('%s -> not in the main namespace, skipping' % page.title()) elif ourpage.isRedirectPage(): - pywikibot.output(u"%s -> double redirect, skipping" % page.title()) + pywikibot.output( + '%s -> double redirect, skipping' % page.title()) elif not ourpage.exists(): - pywikibot.output(u"%s -> page doesn't exist, skipping" + pywikibot.output("%s -> page doesn't exist, skipping" % ourpage.title()) else: backpage = None @@ -447,7 +448,8 @@ backpage = pywikibot.Page(link) break if not backpage: - pywikibot.output(u"%s -> no back interwiki ref" % page.title()) + pywikibot.output( + '%s -> no back interwiki ref' % page.title()) elif backpage == page: # everything is ok yield ourpage @@ -458,10 +460,10 @@ yield ourpage else: pywikibot.output( - u"%s -> back interwiki ref target is redirect to %s" + '%s -> back interwiki ref target is redirect to %s' % (page.title(), backpage.title())) else: - pywikibot.output(u"%s -> back interwiki ref target is %s" + pywikibot.output('%s -> back interwiki ref target is %s' % (page.title(), backpage.title())) def getTemplateList(self, code, task): @@ -531,7 +533,7 @@ source = source.getRedirectTarget() if not source.exists(): - pywikibot.output(u"source page doesn't exist: %s" + pywikibot.output("source page doesn't exist: %s" % source) continue @@ -544,8 +546,8 @@ def compile_link(site, templates): """Compile one link template list.""" findtemplate = '(%s)' % '|'.join(templates) - return re.compile(r"\{\{%s\|%s\}\}" - % (findtemplate.replace(u' ', u'[ _]'), + return re.compile(r'\{\{%s\|%s\}\}' + % (findtemplate.replace(' ', '[ _]'), site.code), re.IGNORECASE) tosite = dest.site @@ -560,26 +562,26 @@ interactive = self.getOption('interactive') if add_tl: if m1: - pywikibot.output(u"(already added)") + pywikibot.output('(already added)') else: # insert just before interwiki if (not interactive or pywikibot.input_yn( - u'Connecting %s -> %s. Proceed?' + 'Connecting %s -> %s. Proceed?' % (source.title(), dest.title()), default=False, automatic_quit=False)): if self.getOption('side'): # Placing {{Link FA|xx}} right next to # corresponding interwiki text = (text[:m1.end()] + - u" {{%s|%s}}" % (add_tl[0], fromsite.code) + + ' {{%s|%s}}' % (add_tl[0], fromsite.code) + text[m1.end():]) else: # Moving {{Link FA|xx}} to top of interwikis iw = textlib.getLanguageLinks(text, tosite) text = textlib.removeLanguageLinks(text, tosite) - text += u"%s{{%s|%s}}%s" % (config.LS, add_tl[0], - fromsite.code, config.LS) + text += '%s{{%s|%s}}%s' % ( + config.LS, add_tl[0], fromsite.code, config.LS) text = textlib.replaceLanguageLinks(text, iw, tosite) changed = True @@ -588,13 +590,13 @@ if (changed or # Don't force the user to say "Y" twice not interactive or pywikibot.input_yn( - u'Connecting %s -> %s. Proceed?' + 'Connecting %s -> %s. Proceed?' % (source.title(), dest.title()), default=False, automatic_quit=False)): text = re.sub(re_link_remove, '', text) changed = True elif task == 'former': - pywikibot.output(u"(already removed)") + pywikibot.output('(already removed)') if changed: comment = i18n.twtranslate(tosite, 'featured-' + task, {'page': source}) @@ -602,10 +604,10 @@ dest.put(text, comment) self._save_counter += 1 except pywikibot.LockedPage: - pywikibot.output(u'Page %s is locked!' + pywikibot.output('Page %s is locked!' % dest.title()) except pywikibot.PageNotSaved: - pywikibot.output(u"Page not saved") + pywikibot.output('Page not saved') def main(*args): @@ -626,11 +628,11 @@ for arg in local_args: if arg.startswith('-fromlang:'): - options[arg[1:9]] = arg[10:].split(",") + options[arg[1:9]] = arg[10:].split(',') elif arg.startswith('-after:'): options['afterpage'] = arg[7:] elif arg.startswith('-nocache:'): - options[arg[1:8]] = arg[9:].split(",") + options[arg[1:8]] = arg[9:].split(',') else: options[arg[1:].lower()] = True @@ -638,5 +640,5 @@ bot.run() -if __name__ == "__main__": +if __name__ == '__main__': main() diff --git a/scripts/archivebot.py b/scripts/archivebot.py index 22e6418..e501dd8 100755 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -485,7 +485,7 @@ def update(self, summary, sort_threads=False): """Recombine threads and save page.""" if sort_threads: - pywikibot.output(u'Sorting threads...') + pywikibot.output('Sorting threads...') self.threads.sort(key=lambda t: t.timestamp) newtext = re.sub('\n*$', '\n\n', self.header) # Fix trailing newlines for t in self.threads: diff --git a/scripts/casechecker.py b/scripts/casechecker.py index ecac4c7..51c4904 100755 --- a/scripts/casechecker.py +++ b/scripts/casechecker.py @@ -325,7 +325,7 @@ if len(err[1]) == 1: newTitle = err[1][0] editSummary = i18n.twtranslate( - self.site, "casechecker-rename") + self.site, 'casechecker-rename') dst = self.Page(newTitle) if 'redirect' in page: @@ -744,7 +744,7 @@ prf = '' if self.Page(title).namespace() == 0 else ':' cc = '|««« {} »»»'.format( self.ColorCodeWord(title) if colorcode else '') - return u"[[%s%s%s]]" % (prf, title, cc) + return '[[%s%s%s]]' % (prf, title, cc) def OpenLogFile(self, filename): """Open logfile.""" @@ -780,6 +780,6 @@ return text -if __name__ == "__main__": +if __name__ == '__main__': bot = CaseChecker() bot.Run() diff --git a/scripts/category.py b/scripts/category.py index 6e379bb..049aaec 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -931,7 +931,7 @@ {'fromcat': self.cat.title(), 'num': len(setOfArticles)}) - listString = "" + listString = '' for article in setOfArticles: if (not article.is_filepage() or self.showImages) and not article.is_categorypage(): @@ -1478,7 +1478,8 @@ new_cat_title = pywikibot.input( 'Please enter the new name of the category:') if use_deletion_summary: - deletion_comment = CategoryMoveRobot.DELETION_COMMENT_SAME_AS_EDIT_COMMENT + deletion_comment = \ + CategoryMoveRobot.DELETION_COMMENT_SAME_AS_EDIT_COMMENT else: deletion_comment = CategoryMoveRobot.DELETION_COMMENT_AUTOMATIC bot = CategoryMoveRobot(oldcat=old_cat_title, diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py index bc9fdee..ccc68cc 100755 --- a/scripts/category_redirect.py +++ b/scripts/category_redirect.py @@ -73,7 +73,8 @@ # Category that contains all redirected category pages self.cat_redirect_cat = { 'commons': 'Category:Category redirects', - 'meta': 'Category:Maintenance of categories/Soft redirected categories', + 'meta': 'Category:Maintenance of categories/Soft redirected ' + 'categories', 'ar': 'تصنيف:تحويلات تصنيفات ويكيبيديا', 'cs': 'Kategorie:Údržba:Zastaralé kategorie', 'da': 'Kategori:Omdirigeringskategorier', diff --git a/scripts/cfd.py b/scripts/cfd.py index d514a5b..86f7073 100755 --- a/scripts/cfd.py +++ b/scripts/cfd.py @@ -30,11 +30,13 @@ DEFAULT_CFD_PAGE = 'Wikipedia:Categories for discussion/Working' # A list of templates that are used on category pages as part of the CFD -# process that contain information such as the link to the per-day discussion page. +# process that contain information such as the link to the per-day discussion +# page. cfdTemplates = ['Cfd full', 'Cfr full'] # Regular expression declarations -# See the en-wiki CFD working page at [[Wikipedia:Categories for discussion/Working]] +# 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) @@ -88,7 +90,8 @@ for arg in local_args: if arg.startswith('-page'): if len(arg) == len('-page'): - cfd_page = pywikibot.input('Enter the CFD working page to use:') + cfd_page = pywikibot.input( + 'Enter the CFD working page to use:') else: cfd_page = arg[len('-page:'):] @@ -128,7 +131,8 @@ mode = 'Delete' day = 'None' elif maintenance.search(line): - # It's probably best not to try to handle these in an automated fashion. + # It's probably best not to try to handle these in an automated + # fashion. mode = 'None' day = 'None' elif m.check(dateheader, line): @@ -142,8 +146,9 @@ summary = ( 'Robot - Moving category ' + src + ' to [[:Category:' + dest + ']] per [[WP:CFD|CFD]] at ' + thisDay + '.') - action_summary = 'Robot - Result of [[WP:CFD|CFD]] at ' + thisDay + '.' - elif mode == "Speedy": + action_summary = \ + 'Robot - Result of [[WP:CFD|CFD]] at ' + thisDay + '.' + elif mode == 'Speedy': summary = ( 'Robot - Speedily moving category ' + src + ' to [[:Category:' + dest + ']] per [[WP:CFDS|CFDS]].') @@ -177,7 +182,8 @@ summary = ( 'Robot - Removing category {0} per [[WP:CFD|CFD]] ' 'at {1}.'.format(src, thisDay)) - action_summary = 'Robot - Result of [[WP:CFD|CFD]] at ' + thisDay + '.' + action_summary = \ + 'Robot - Result of [[WP:CFD|CFD]] at ' + thisDay + '.' else: continue robot = CategoryMoveBot(oldcat=src, batch=True, comment=summary, diff --git a/scripts/checkimages.py b/scripts/checkimages.py index 43333ee..f27350b 100755 --- a/scripts/checkimages.py +++ b/scripts/checkimages.py @@ -1019,8 +1019,9 @@ "('''forced mode'''):") % self.image.title(as_url=True)) else: - repme = ((self.list_entry + 'has the following duplicates:') - % self.image.title(as_url=True)) + repme = ( + (self.list_entry + 'has the following duplicates:') + % self.image.title(as_url=True)) for dup_page in duplicates: if ( diff --git a/scripts/claimit.py b/scripts/claimit.py index 86eda37..348c5e5 100755 --- a/scripts/claimit.py +++ b/scripts/claimit.py @@ -139,12 +139,14 @@ elif claim.type == 'string': target = commandline_claims[i + 1] elif claim.type == 'globe-coordinate': - coord_args = [float(c) for c in commandline_claims[i + 1].split(',')] + coord_args = [ + float(c) for c in commandline_claims[i + 1].split(',')] if len(coord_args) >= 3: precision = coord_args[2] else: precision = 0.0001 # Default value (~10 m at equator) - target = pywikibot.Coordinate(coord_args[0], coord_args[1], precision=precision) + target = pywikibot.Coordinate( + coord_args[0], coord_args[1], precision=precision) else: raise NotImplementedError( '{} datatype is not yet supported by claimit.py' diff --git a/scripts/commonscat.py b/scripts/commonscat.py index 71a95cf..8b4062a 100755 --- a/scripts/commonscat.py +++ b/scripts/commonscat.py @@ -345,9 +345,10 @@ return True return True - def changeCommonscat(self, page=None, oldtemplate='', oldcat='', - newtemplate='', newcat='', linktitle='', - description=NotImplemented): # pylint: disable=unused-argument + def changeCommonscat( + self, page=None, oldtemplate='', oldcat='', + newtemplate='', newcat='', linktitle='', + description=NotImplemented): # pylint: disable=unused-argument """Change the current commonscat template and target.""" if oldcat == '3=S' or linktitle == '3=S': return # TODO: handle additional param on de-wiki diff --git a/scripts/data_ingestion.py b/scripts/data_ingestion.py index e4ad76e..348cfbc 100755 --- a/scripts/data_ingestion.py +++ b/scripts/data_ingestion.py @@ -98,7 +98,8 @@ hashObject = hashlib.sha1() hashObject.update(self.downloadPhoto().getvalue()) return [page.title(with_ns=False) for page in - self.site.allimages(sha1=base64.b16encode(hashObject.digest()))] + self.site.allimages( + sha1=base64.b16encode(hashObject.digest()))] def getTitle(self, fmt): """ @@ -164,7 +165,7 @@ @type site: APISite, 'deprecated_default_commons' or None """ if site == 'deprecated_default_commons': - warn('site=\'deprecated_default_commons\' is deprecated; ' + warn("site='deprecated_default_commons' is deprecated; " 'please specify a site or use site=None', DeprecationWarning, 2) site = pywikibot.Site('commons', 'commons') diff --git a/scripts/delete.py b/scripts/delete.py index ec62481..158acf9 100755 --- a/scripts/delete.py +++ b/scripts/delete.py @@ -200,8 +200,9 @@ if self.getOption('orphansonly'): namespaces = self.getOption('orphansonly') - ns_with_ref = self.current_page.namespaces_with_ref_to_page( - namespaces) + ns_with_ref = \ + self.current_page.namespaces_with_ref_to_page( + namespaces) ns_with_ref = sorted(list(ns_with_ref)) if ns_with_ref: ns_names = ', '.join(str(ns.id) for ns in ns_with_ref) @@ -258,7 +259,7 @@ options['isorphan'] = False elif arg.startswith('-orphansonly'): if arg[13:]: - namespaces = mysite.namespaces.resolve(arg[13:].split(",")) + namespaces = mysite.namespaces.resolve(arg[13:].split(',')) else: namespaces = mysite.namespaces options['orphansonly'] = namespaces @@ -279,8 +280,8 @@ un + 'delete-linked-pages', {'page': page_name}) elif arg.startswith('-ref'): - summary = i18n.twtranslate(mysite, 'delete-referring-pages', - {'page': page_name}) + summary = i18n.twtranslate( + mysite, 'delete-referring-pages', {'page': page_name}) elif arg.startswith('-imageused'): summary = i18n.twtranslate(mysite, un + 'delete-images', {'page': page_name}) diff --git a/scripts/fixing_redirects.py b/scripts/fixing_redirects.py index f9933104..8c1f212 100755 --- a/scripts/fixing_redirects.py +++ b/scripts/fixing_redirects.py @@ -54,8 +54,9 @@ linktrail = mysite.linktrail() # make a backup of the original text so we can show the changes later - linkR = re.compile(r'\[\[(?P<title>[^\]\|#]*)(?P<section>#[^\]\|]*)?' - r'(\|(?P<label>[^\]]*))?\]\](?P<linktrail>' + linktrail + ')') + linkR = re.compile( + r'\[\[(?P<title>[^\]\|#]*)(?P<section>#[^\]\|]*)?' + r'(\|(?P<label>[^\]]*))?\]\](?P<linktrail>' + linktrail + ')') curpos = 0 # This loop will run until we have finished the current page while True: @@ -71,7 +72,8 @@ or isDisabled(text, m.start())): continue else: - actualLinkPage = pywikibot.Page(targetPage.site, m.group('title')) + actualLinkPage = pywikibot.Page( + targetPage.site, m.group('title')) # Check whether the link found is to page. if actualLinkPage != linkedPage: continue @@ -111,8 +113,8 @@ if (new_page_title == link_text and not section): newlink = '[[{}]]'.format(new_page_title) - # check if we can create a link with trailing characters instead of a - # pipelink + # check if we can create a link with trailing characters instead of + # a pipelink elif (len(new_page_title) <= len(link_text) and firstcap(link_text[:len(new_page_title)]) == firstcap(new_page_title) and diff --git a/scripts/harvest_template.py b/scripts/harvest_template.py index 73aff99..6ee8563 100755 --- a/scripts/harvest_template.py +++ b/scripts/harvest_template.py @@ -149,7 +149,7 @@ }) super(HarvestRobot, self).__init__(**kwargs) self.generator = generator - # TODO: Make it a list which also includes the redirects to the template + # TODO: Make it a list including the redirects to the template self.fields = {} for key, value in fields.items(): if isinstance(value, tuple): diff --git a/scripts/illustrate_wikidata.py b/scripts/illustrate_wikidata.py index 350ec36..58378e0 100755 --- a/scripts/illustrate_wikidata.py +++ b/scripts/illustrate_wikidata.py @@ -32,7 +32,7 @@ """A bot to add Wikidata image claims.""" - def __init__(self, generator, wdproperty=u'P18'): + def __init__(self, generator, wdproperty='P18'): """ Initializer. diff --git a/scripts/imagecopy_self.py b/scripts/imagecopy_self.py index 3c51a4b..4730d16 100644 --- a/scripts/imagecopy_self.py +++ b/scripts/imagecopy_self.py @@ -512,7 +512,7 @@ text = imagepage.get() # text = re.sub(u'== Summary ==', u'', text, re.IGNORECASE) # text = re.sub(u'== Licensing ==', u'', text, re.IGNORECASE) - # text = re.sub('\{\{(self|self2)\|[^\}]+\}\}', '', text, re.IGNORECASE) + # text = re.sub('\{\{(self|self2)\|[^\}]+\}\}', '', text, re.I) for toRemove in sourceGarbage[imagepage.site.lang]: text = re.sub(toRemove, '', text, flags=re.IGNORECASE) @@ -718,7 +718,7 @@ self.skip = False # Start building the page - self.root.geometry("1500x400+100-100") + self.root.geometry('1500x400+100-100') self.root.title(self.filename) self.url = self.imagepage.permalink() @@ -738,10 +738,10 @@ self.root, text='The old description was : ') self.new_description_label = Tkinter.Label( self.root, text='The new fields are : ') - self.filename_label = Tkinter.Label(self.root, text=u'Filename : ') + self.filename_label = Tkinter.Label(self.root, text='Filename : ') self.information_description_label = Tkinter.Label( self.root, text='Description : ') - self.information_date_label = Tkinter.Label(self.root, text=u'Date : ') + self.information_date_label = Tkinter.Label(self.root, text='Date : ') self.information_source_label = Tkinter.Label(self.root, text='Source : ') self.information_author_label = Tkinter.Label(self.root, diff --git a/scripts/imageuncat.py b/scripts/imageuncat.py index d63f3a0..49a8cdc 100755 --- a/scripts/imageuncat.py +++ b/scripts/imageuncat.py @@ -1254,7 +1254,9 @@ today = pywikibot.Timestamp.utcnow() yesterday = today + timedelta(days=-1) - for logentry in site.logevents(logtype='upload', start=yesterday, end=today, reverse=True): + for logentry in site.logevents( + logtype='upload', start=yesterday, end=today, reverse=True + ): yield logentry.page() diff --git a/scripts/login.py b/scripts/login.py index 969ddff..161f17f 100755 --- a/scripts/login.py +++ b/scripts/login.py @@ -104,7 +104,7 @@ 'consumer': consumer_key}) pywikibot.output('NOTE: To use OAuth, you need to copy the ' 'following line to your user-config.py:') - pywikibot.output('authenticate[\'%(hostname)s\'] = %(oauth_token)s' % + pywikibot.output("authenticate['%(hostname)s'] = %(oauth_token)s" % {'hostname': site.hostname(), 'oauth_token': oauth_token}) @@ -142,7 +142,7 @@ "revelant lines from '{0}' (or the entire file) " 'and try again.' .format(join(config.base_dir, 'pywikibot.lwp'))) - elif arg == "-logout": + elif arg == '-logout': logout = True elif arg == '-oauth': oauth = True diff --git a/scripts/lonelypages.py b/scripts/lonelypages.py index 39b7cdd..d2adce2 100755 --- a/scripts/lonelypages.py +++ b/scripts/lonelypages.py @@ -89,11 +89,14 @@ # The orphan template names in the different languages. _templates = { - 'af': ('Weesbladsy', 'datum={{subst:CURRENTMONTHNAME}} {{subst:CURRENTYEAR}}', ['wi']), + 'af': ('Weesbladsy', 'datum={{subst:CURRENTMONTHNAME}} ' + '{{subst:CURRENTYEAR}}', ['wi']), 'ar': ('يتيمة', 'تاريخ={{نسخ:اسم_شهر}} {{نسخ:عام}}'), 'ca': ('Orfe', 'date={{subst:CURRENTMONTHNAME}} {{subst:CURRENTYEAR}}'), - 'en': ('Orphan', 'date={{subst:CURRENTMONTHNAME}} {{subst:CURRENTYEAR}}', ['wi']), - 'it': ('O', '||mese={{subst:CURRENTMONTHNAME}} {{subst:CURRENTYEAR}}', ['a']), + 'en': ('Orphan', 'date={{subst:CURRENTMONTHNAME}} {{subst:CURRENTYEAR}}', + ['wi']), + 'it': ('O', '||mese={{subst:CURRENTMONTHNAME}} {{subst:CURRENTYEAR}}', + ['a']), 'ja': ('孤立', '{{subst:DATE}}'), 'ko': ('외톨이', '{{{{{|안전풀기:}}}#timel:Y-m-d|now}}'), 'zh': ('Orphan/auto', '', ['orphan'], True), @@ -129,13 +132,15 @@ orphan_template = e if orphan_template is None or isinstance(orphan_template, ValueError): err_message = 'Missing configuration for site {}'.format(self.site) - suggest_help(exception=orphan_template, additional_text=err_message) + suggest_help( + exception=orphan_template, additional_text=err_message) sys.exit(err_message) else: self._settings = orphan_template # DisambigPage part if self.getOption('disambigPage') is not None: - self.disambigpage = pywikibot.Page(self.site, self.getOption('disambigPage')) + self.disambigpage = pywikibot.Page( + self.site, self.getOption('disambigPage')) try: self.disambigtext = self.disambigpage.get() except pywikibot.NoPage: @@ -209,7 +214,8 @@ 'Your regex has found something in {0}, skipping...' .format(page.title())) return - if page.isDisambig() and self.getOption('disambigPage') is not None: + if (page.isDisambig() + and self.getOption('disambigPage') is not None): pywikibot.output('{0} is a disambig page, report..' .format(page.title())) if not page.title().lower() in self.disambigtext.lower(): diff --git a/scripts/maintenance/cache.py b/scripts/maintenance/cache.py index e3be450..445a277 100755 --- a/scripts/maintenance/cache.py +++ b/scripts/maintenance/cache.py @@ -271,7 +271,7 @@ try: entry.parse_key() except ParseError: - pywikibot.error(u'Problems parsing %s with key %s' + pywikibot.error('Problems parsing %s with key %s' % (entry.filename, entry.key)) pywikibot.exception() continue @@ -279,7 +279,7 @@ try: entry._rebuild() except Exception as e: - pywikibot.error(u'Problems loading %s with key %s, %r' + pywikibot.error('Problems loading %s with key %s, %r' % (entry.filename, entry.key, entry._parsed_key)) pywikibot.exception(e, tb=True) continue @@ -452,7 +452,7 @@ for cache_path in cache_paths: if len(cache_paths) > 1: - pywikibot.output(u'Processing %s' % cache_path) + pywikibot.output('Processing %s' % cache_path) process_entries(cache_path, filter_func, output_func=output_func, action_func=action_func) diff --git a/scripts/maintenance/compat2core.py b/scripts/maintenance/compat2core.py index 00afe9d..4caf605 100755 --- a/scripts/maintenance/compat2core.py +++ b/scripts/maintenance/compat2core.py @@ -99,8 +99,8 @@ ('.replaceImage(', 'Page.replaceImage() is deprecated and does not work at core'), ('.getVersionHistory(', - 'Page.getVersionHistory() returns a pywikibot.Timestamp object instead of\n' - 'a MediaWiki one'), + 'Page.getVersionHistory() returns a pywikibot.Timestamp object instead of' + '\na MediaWiki one'), ('.contributions(', 'User.contributions() returns a pywikibot.Timestamp object instead of a\n' 'MediaWiki one'), diff --git a/scripts/maintenance/make_i18n_dict.py b/scripts/maintenance/make_i18n_dict.py index 479295e..49194ed 100755 --- a/scripts/maintenance/make_i18n_dict.py +++ b/scripts/maintenance/make_i18n_dict.py @@ -4,28 +4,24 @@ Generate a i18n file from a given script. run IDLE at topmost level: - >>> import pwb >>> from scripts.maintenance.make_i18n_dict import i18nBot >>> bot = i18nBot('<scriptname>', '<msg dict>') >>> bot.run() If you have more than one message dictionary, give all these names to the bot: - >>> bot = i18nBot('<scriptname>', '<msg dict1>', '<msg dict2>', '<msg dict3>') If you want to rename the message index use keyword arguments. This may be mixed with preleading positonal argumens: - >>> bot = i18nBot('<scriptname>', '<msg dict1>', the_other_msg='<msg dict2>') If you have the messages as instance constants you may call the bot as follows: - ->>> bot = i18nBot('<scriptname>.<class instance>', '<msg dict1>', '<msg dict2>') +>>> bot = i18nBot( +... '<scriptname>.<class instance>', '<msg dict1>', '<msg dict2>') It's also possible to make json files too by using to_json method after instantiating the bot. It also calls C{bot.run()} to create the dictionaries: - >>> bot.to_json() """ # diff --git a/scripts/maintenance/wikimedia_sites.py b/scripts/maintenance/wikimedia_sites.py index 493a1c6..6a1ff94 100755 --- a/scripts/maintenance/wikimedia_sites.py +++ b/scripts/maintenance/wikimedia_sites.py @@ -70,18 +70,18 @@ i -= 1 if original == new: - pywikibot.output(u'The lists match!') + pywikibot.output('The lists match!') else: - pywikibot.output(u"The lists don't match, the new list is:") + pywikibot.output("The lists don't match, the new list is:") text = ' languages_by_size = [\n' line = ' ' * 7 for code in new: if len(line) + len(code) < 76: - line += u" '%s'," % code + line += " '%s'," % code else: text += '%s\n' % line line = ' ' * 7 - line += u" '%s'," % code + line += " '%s'," % code text += '%s\n' % line text += ' ]' pywikibot.output(text) diff --git a/scripts/match_images.py b/scripts/match_images.py index e9f6899..b923d16 100755 --- a/scripts/match_images.py +++ b/scripts/match_images.py @@ -139,7 +139,7 @@ def main(*args): - """Extracting file page information of images to work on and initiate matching.""" + """Extracting file page information and initiate matching.""" images = [] other_family = '' other_lang = '' diff --git a/scripts/noreferences.py b/scripts/noreferences.py index 72cbc7f..1287795 100755 --- a/scripts/noreferences.py +++ b/scripts/noreferences.py @@ -524,7 +524,9 @@ return False elif self.referencesTemplates: templateR = '{{(' + '|'.join(self.referencesTemplates) + ')' - if re.search(templateR, oldTextCleaned, re.IGNORECASE | re.UNICODE): + if re.search( + templateR, oldTextCleaned, re.IGNORECASE | re.UNICODE + ): if self.getOption('verbose'): pywikibot.output( 'No changes necessary: references template found.') @@ -711,7 +713,8 @@ if self.lacksReferences(text): newText = self.addReferences(text) try: - self.userPut(page, page.text, newText, summary=self.comment) + self.userPut( + page, page.text, newText, summary=self.comment) except pywikibot.EditConflict: pywikibot.warning('Skipping {0} because of edit conflict' .format(page.title(as_link=True))) @@ -745,7 +748,8 @@ xmlFilename = i18n.input('pywikibot-enter-xml-filename') else: xmlFilename = arg[5:] - genFactory.gens.append(XmlDumpNoReferencesPageGenerator(xmlFilename)) + genFactory.gens.append( + XmlDumpNoReferencesPageGenerator(xmlFilename)) elif arg == '-always': options['always'] = True elif arg == '-quiet': diff --git a/scripts/nowcommons.py b/scripts/nowcommons.py index 7500f07..3add65c 100755 --- a/scripts/nowcommons.py +++ b/scripts/nowcommons.py @@ -242,7 +242,8 @@ filenameOnCommons = par[par.index(':') + 1:] break if val[0].strip() == '1': - filenameOnCommons = val[1].strip()[val[1].strip().index(':') + 1:] + filenameOnCommons = \ + val[1].strip()[val[1].strip().index(':') + 1:] break skip = True if not filenameOnCommons: @@ -279,7 +280,8 @@ usingPages = list(localImagePage.usingPages()) if usingPages and usingPages != [localImagePage]: pywikibot.output(color_format( - '"{lightred}{0}{default}" is still used in {1} pages.', + '"{lightred}{0}{default}" ' + 'is still used in {1} pages.', localImagePage.title(with_ns=False), len(usingPages))) if self.getOption('replace') is True: @@ -298,7 +300,8 @@ # If the image is used with the urlname the # previous function won't work is_used = bool(list(pywikibot.FilePage( - self.site, page.title()).usingPages(total=1))) + self.site, + page.title()).usingPages(total=1))) if is_used and self.getOption('replaceloose'): bot = ImageBot( pg.FileLinksGenerator( @@ -329,8 +332,8 @@ if len(localImagePage.getFileVersionHistory()) > 1: pywikibot.output( 'This image has a version history. Please ' - 'delete it manually after making sure that the ' - 'old versions are not worth keeping.') + 'delete it manually after making sure that ' + 'the old versions are not worth keeping.') continue if self.getOption('always') is False: format_str = color_format( diff --git a/scripts/pagefromfile.py b/scripts/pagefromfile.py index 52f1d44..a62c801 100755 --- a/scripts/pagefromfile.py +++ b/scripts/pagefromfile.py @@ -296,7 +296,7 @@ @param args: command line arguments @type args: unicode """ - filename = "dict.txt" + filename = 'dict.txt' options = {} r_options = {} diff --git a/scripts/reflinks.py b/scripts/reflinks.py index 41e3b2a..52d33a5 100755 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -143,7 +143,8 @@ # anywhere |.*( 403[ ]forbidden - |(404|page|file|information|resource).*not([ ]*be)?[ ]*(available|found) + |(404|page|file|information|resource).*not([ ]*be)?[ ]* + (available|found) |site.*disabled |error[ ]404 |error.+not[ ]found @@ -247,7 +248,7 @@ # avoid multiple } being interpreted as a template inclusion self.title = self.title.replace('}}', '}}') # prevent multiple quotes being interpreted as '' or ''' - self.title = self.title.replace('\'\'', '\''') + self.title = self.title.replace("''", "''") self.title = pywikibot.unicode2html(self.title, self.site.encoding()) # TODO : remove HTML when both opening and closing tags are included @@ -640,13 +641,13 @@ tmp = s.group('enc').strip("\"' ").lower() naked = re.sub(r'[ _\-]', '', tmp) # Convert to python correct encoding names - if naked == "gb2312": - enc.append("gbk") - elif naked == "shiftjis": - enc.append("shift jis 2004") - enc.append("cp932") - elif naked == "xeucjp": - enc.append("euc-jp") + if naked == 'gb2312': + enc.append('gbk') + elif naked == 'shiftjis': + enc.append('shift jis 2004') + enc.append('cp932') + elif naked == 'xeucjp': + enc.append('euc-jp') else: enc.append(tmp) else: diff --git a/scripts/replace.py b/scripts/replace.py index dd6924d..3fb4157 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -859,7 +859,7 @@ pattern = pattern.replace(r'\d', '[:digit:]') pattern = pattern.replace(r'\w', '[:alnum:]') - pattern = pattern.replace("'", "\\" + "'") + pattern = pattern.replace("'", '\\' + "'") # pattern = pattern.replace('\\', '\\\\') # for char in ['[', ']', "'"]: # pattern = pattern.replace(char, '\%s' % char) diff --git a/scripts/script_wui.py b/scripts/script_wui.py index b327274..efeac37 100755 --- a/scripts/script_wui.py +++ b/scripts/script_wui.py @@ -279,21 +279,21 @@ logHandler.flush() buffer.flush() - pywikibot.output(u'--- ' * 20) + pywikibot.output('--- ' * 20) # safety; restore settings pywikibot.config.simulate = __simulate sys.argv = __sys_argv if resource: pywikibot.output( - u'environment: garbage; %s / memory; %s / members; %s' % ( + 'environment: garbage; %s / memory; %s / members; %s' % ( gc.collect(), resource.getrusage(resource.RUSAGE_SELF).ru_maxrss * resource.getpagesize(), len(dir()))) else: pywikibot.output( - u'environment: garbage; %s / members; %s' % ( + 'environment: garbage; %s / members; %s' % ( gc.collect(), len(dir()))) # 'len(dir())' is equivalent to 'len(inspect.getmembers(__main__))' @@ -352,7 +352,7 @@ if hasattr(value, 'format'): bot_config[key] = value.format(username=bot_user_name) - bot = ScriptWUIBot(site, chan, site.user() + "_WUI", "irc.wikimedia.org") + bot = ScriptWUIBot(site, chan, site.user() + '_WUI', 'irc.wikimedia.org') try: bot.start() except BaseException: @@ -360,5 +360,5 @@ raise -if __name__ == "__main__": +if __name__ == '__main__': main() diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py index 9196e66..5385413 100755 --- a/scripts/solve_disambiguation.py +++ b/scripts/solve_disambiguation.py @@ -522,7 +522,7 @@ def result(self, value): """Add the alternative and then list them.""" - newAlternative = pywikibot.input(u'New alternative:') + newAlternative = pywikibot.input('New alternative:') self._outputter.sequence.append(newAlternative) super(AddAlternativeOption, self).result(value) diff --git a/scripts/table2wiki.py b/scripts/table2wiki.py index cd2d7b6..91bd44e 100644 --- a/scripts/table2wiki.py +++ b/scripts/table2wiki.py @@ -164,7 +164,7 @@ # <th> often people don't write them within <tr>, be warned! # <th> with attributes new_table = re.sub( - r"(?i)[\r\n]+<th(?P<attr> [^>]*?)>(?P<header>[\w\W]*?)<\/th>", + r'(?i)[\r\n]+<th(?P<attr> [^>]*?)>(?P<header>[\w\W]*?)<\/th>', r'\r\n!\g<attr> | \g<header>\r\n', new_table) # <th> without attributes diff --git a/scripts/transferbot.py b/scripts/transferbot.py index b26a67f..a858e72 100755 --- a/scripts/transferbot.py +++ b/scripts/transferbot.py @@ -139,7 +139,7 @@ + page.title(with_ns=False)) targetpage = pywikibot.Page(tosite, target_title) edithistpage = pywikibot.Page(tosite, target_title + '/edithistory') - summary = 'Moved page from {old} ([[{new}/edithistory|history]])'\ + summary = 'Moved page from {old} ([[{new}/edithistory|history]])' \ .format(old=page.title(as_link=True, insite=tosite), new=targetpage.title() if not targetpage.namespace().subpages else '') diff --git a/scripts/weblinkchecker.py b/scripts/weblinkchecker.py index 60add89..1089399 100755 --- a/scripts/weblinkchecker.py +++ b/scripts/weblinkchecker.py @@ -910,9 +910,9 @@ except threading.ThreadError: pywikibot.warning( "Can't start a new thread.\nPlease decrease " - "max_external_links in your user-config.py or use\n" + 'max_external_links in your user-config.py or use\n' "'-max_external_links:' option with a smaller value. " - "Default is 50.") + 'Default is 50.') raise diff --git a/scripts/welcome.py b/scripts/welcome.py index 79da206..39e6179 100755 --- a/scripts/welcome.py +++ b/scripts/welcome.py @@ -288,7 +288,7 @@ # The page where the bot will report users with a possibly bad username. report_page = { 'commons': ("Project:Administrators'noticeboard/User problems/Usernames" - "to be checked"), + 'to be checked'), 'wikipedia': { 'am': 'User:Beria/Report', 'ar': 'Project:إخطار الإداريين/أسماء مستخدمين للفحص', @@ -517,8 +517,8 @@ 'zoccola', ] elenco_others = [ - '@', ".com", ".sex", ".org", ".uk", ".en", ".it", "admin", - "administrator", "amministratore", '@yahoo.com', '@alice.com', + '@', '.com', '.sex', '.org', '.uk', '.en', '.it', 'admin', + 'administrator', 'amministratore', '@yahoo.com', '@alice.com', 'amministratrice', 'burocrate', 'checkuser', 'developer', 'http://', 'jimbo', 'mediawiki', 'on wheals', 'on wheal', 'on wheel', 'planante', 'razinger', 'sysop', 'troll', 'vandal', @@ -653,7 +653,7 @@ if not globalvar.makeWelcomeLog or len(queue) == 0: return - text = u'' + text = '' logg = i18n.translate(self.site, logbook) if not logg: return @@ -713,7 +713,7 @@ return self._randomSignature sign_text = '' - creg = re.compile(r"^\* ?(.*?)$", re.M) + creg = re.compile(r'^\* ?(.*?)$', re.M) if not globalvar.signFileName: sign_page_name = i18n.translate(self.site, random_sign) if not sign_page_name: @@ -931,10 +931,10 @@ except ValueError: # upon request, we could check for software version here raise ValueError( - "Mediawiki has changed, -offset:# is not supported " - "anymore, but -offset:TIMESTAMP is, assuming TIMESTAMP " - "is yyyymmddhhmmss. -timeoffset is now also supported. " - "Please read this script source header for documentation.") + 'Mediawiki has changed, -offset:# is not supported ' + 'anymore, but -offset:TIMESTAMP is, assuming TIMESTAMP ' + 'is yyyymmddhhmmss. -timeoffset is now also supported. ' + 'Please read this script source header for documentation.') elif arg == '-file': globalvar.randomSign = True globalvar.signFileName = val or pywikibot.input( -- To view, visit https://gerrit.wikimedia.org/r/463257 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: Ibedb230e13bc2be15bfc0cba229c257fff8fa595 Gerrit-Change-Number: 463257 Gerrit-PatchSet: 11 Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75) Gerrit-CC: D3r1ck01 <alangiderick(a)gmail.com>

5 years, 7 months

[Gerrit] pywikibot/core[master]: [bugfix] Fix doc errors introduced in b686ea35fea2 and e6ed12025dc1

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463234 ) Change subject: [bugfix] Fix doc errors introduced in b686ea35fea2 and e6ed12025dc1 ...................................................................... [bugfix] Fix doc errors introduced in b686ea35fea2 and e6ed12025dc1 + resolve some other older doc errors Bug: T187009 Change-Id: Icb69204554af276f28c574f5a4f86b4b55cd4223 --- M pywikibot/data/api.py M pywikibot/site.py M scripts/archive/featured.py M scripts/patrol.py M scripts/solve_disambiguation.py M scripts/weblinkchecker.py M scripts/welcome.py M tests/archivebot_tests.py M tests/plural_tests.py 9 files changed, 43 insertions(+), 43 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 2c801f9..b56ebd5 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -1579,7 +1579,7 @@ @param value: param value(s) @type value: unicode or str in site encoding - (string types may be a |-separated list) + (string types may be a `|`-separated list) iterable, where items are converted to unicode with special handling for datetime.datetime to convert it to a string using the ISO 8601 format accepted by the MediaWiki API. diff --git a/pywikibot/site.py b/pywikibot/site.py index c2f43fa..2eb28ad 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -2323,10 +2323,10 @@ def notifications(self, **kwargs): """Yield Notification objects from the Echo extension. - keyword format: If specified, notifications will be returned formatted + @keyword format: If specified, notifications will be returned formatted this way. Its value is either 'model', 'special' or None. Default is 'special'. - type format: str or None + @type format: str or None Refer API reference for other keywords. """ diff --git a/scripts/archive/featured.py b/scripts/archive/featured.py index 13f2866..d21128b 100755 --- a/scripts/archive/featured.py +++ b/scripts/archive/featured.py @@ -3,54 +3,54 @@ """ Manage featured/good article/list status template. -This script understands various command-line arguments: +*** This script understands various command-line arguments: *** - Task commands: +Task commands: --featured use this script for featured articles. Default task if no task - command is specified + -featured use this script for featured articles. Default task + if no task command is specified --good use this script for good articles. + -good use this script for good articles. --lists use this script for featured lists. + -lists use this script for featured lists. --former use this script for removing {{Link FA|xx}} from former - fearured articles + -former use this script for removing {{Link FA|xx}} from former + fearured articles - NOTE: you may have all of these commands in one run + NOTE: you may have all of these commands in one run - Option commands: +Option commands: --interactive: ask before changing each page + -interactive: ask before changing each page --nocache doesn't include cache files file to remember if the article - already was verified. + -nocache doesn't include cache files file to remember if the article + already was verified. --nocache:xx,yy you may ignore language codes xx,yy,... from cache file + -nocache:xx,yy you may ignore language codes xx,yy,... from cache file --fromlang:xx,yy xx,yy,zz,.. are the languages to be verified. --fromlang:ar--fi Another possible with range the languages + -fromlang:xx,yy xx,yy,zz,.. are the languages to be verified. + -fromlang:ar--fi Another possible with range the languages --fromall to verify all languages. + -fromall to verify all languages. --tolang:xx,yy xx,yy,zz,.. are the languages to be updated + -tolang:xx,yy xx,yy,zz,.. are the languages to be updated --after:zzzz process pages after and including page zzzz - (sorry, not implemented yet) + -after:zzzz process pages after and including page zzzz + (sorry, not implemented yet) --side use -side if you want to move all {{Link FA|lang}} next to the - corresponding interwiki links. Default is placing - {{Link FA|lang}} on top of the interwiki links. - (This option is deprecated with wikidata) + -side use -side if you want to move all {{Link FA|lang}} next + to the corresponding interwiki links. Default is placing + {{Link FA|lang}} on top of the interwiki links. + (This option is deprecated with wikidata) --count Only counts how many featured/good articles exist - on all wikis (given with the "-fromlang" argument) or - on several language(s) (when using the "-fromall" argument). - Example: python pwb.py featured -fromlang:en,he -count - counts how many featured articles exist in the en and he - wikipedias. + -count Only counts how many featured/good articles exist + on all wikis (given with the "-fromlang" argument) or + on several language(s) (when using the "-fromall" argument). + Example: python pwb.py featured -fromlang:en,he -count + counts how many featured articles exist in the en and he + wikipedias. --quiet no corresponding pages are displayed. + -quiet no corresponding pages are displayed. """ # diff --git a/scripts/patrol.py b/scripts/patrol.py index c48d50f..8be7cdb 100755 --- a/scripts/patrol.py +++ b/scripts/patrol.py @@ -23,8 +23,7 @@ On Wikisource, it'll also check if the page is on the author namespace in which case it'll also patrol pages which are linked from that page. -An example can be found at: - +An example can be found at https://en.wikisource.org/wiki/User:Wikisource-bot/patrol_whitelist Commandline parameters diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py index 5e6abb1..9196e66 100755 --- a/scripts/solve_disambiguation.py +++ b/scripts/solve_disambiguation.py @@ -705,11 +705,11 @@ @staticmethod def firstlinks(page): - """Return a list of first links of every line beginning with *. + """Return a list of first links of every line beginning with `*`. When a disambpage is full of unnecessary links, this may be useful to sort out the relevant links. E.g. from line - *[[Jim Smith (smith)|Jim Smith]] ([[1832]]-[[1932]]) [[English]] + `* [[Jim Smith (smith)|Jim Smith]] ([[1832]]-[[1932]]) [[English]]` it returns only 'Jim Smith (smith)' Lines without an asterisk at the beginning will be disregarded. No check for page existence, it has already been done. diff --git a/scripts/weblinkchecker.py b/scripts/weblinkchecker.py index 6923a6f..60add89 100755 --- a/scripts/weblinkchecker.py +++ b/scripts/weblinkchecker.py @@ -642,7 +642,7 @@ We assume that the first element in the list represents the first time we found this dead link, and the last element represents the last time. - Example: + Example:: dict = { 'https://www.example.org/page': [ diff --git a/scripts/welcome.py b/scripts/welcome.py index 71cf48f..79da206 100755 --- a/scripts/welcome.py +++ b/scripts/welcome.py @@ -84,7 +84,7 @@ ********************************* GUIDE *********************************** -Report, Bad and white list guide: +*** Report, Bad and white list guide: *** 1) Set in the code which page it will use to load the badword, the whitelist and the report @@ -118,7 +118,7 @@ * Search if he's in the report page, if yes he will be skipped * If no, he will be reported. -Random signature guide: +*** Random signature guide: *** Some welcomed users will answer to the one who has signed the welcome message. When you welcome many new users, you might be overwhelmed with such answers. diff --git a/tests/archivebot_tests.py b/tests/archivebot_tests.py index 7d292d9..a8d9d3d 100644 --- a/tests/archivebot_tests.py +++ b/tests/archivebot_tests.py @@ -241,7 +241,7 @@ def testTwoThreadsWithCommentedOutThread(self): """Test recognizing two threads and ignoring a commented out thread. - Talk:For-pywikibot-archivebot must have: + Talk:For-pywikibot-archivebot must have:: {{User:MiszaBot/config |archive = Talk:Main_Page/archive diff --git a/tests/plural_tests.py b/tests/plural_tests.py index dff2a7f..8ec053d 100644 --- a/tests/plural_tests.py +++ b/tests/plural_tests.py @@ -48,7 +48,8 @@ return test_static_rule for lang, rule in plural.plural_rules.items(): - cls.add_method(dct, 'test_{0}'.format(lang), create_test(rule), + cls.add_method(dct, 'test_{0}'.format(lang.replace('-', '_')), + create_test(rule), doc_suffix='for "{0}"'.format(lang)) return super(MetaPluralRulesTest, cls).__new__(cls, name, bases, dct) -- To view, visit https://gerrit.wikimedia.org/r/463234 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: Icb69204554af276f28c574f5a4f86b4b55cd4223 Gerrit-Change-Number: 463234 Gerrit-PatchSet: 15 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

5 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits September 2018