Pywikibot-commits October 2018

pywikibot-commits@lists.wikimedia.org

1 participants
57 discussions

[Gerrit] pywikibot/core[master]: Use flake8-no-u-prefixed-strings to prevent usage of u-prefixed strings
by jenkins-bot (Code Review) 03 Oct '18

03 Oct '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/464097 ) Change subject: Use flake8-no-u-prefixed-strings to prevent usage of u-prefixed strings ...................................................................... Use flake8-no-u-prefixed-strings to prevent usage of u-prefixed strings Fix the remaining issues. Change-Id: I9df7b557914e23a38d9199db03440419c22dfd50 --- M setup.py M tests/category_tests.py M tests/i18n_tests.py M tests/link_tests.py M tests/namespace_tests.py M tests/page_tests.py M tests/reflinks_tests.py 7 files changed, 11 insertions(+), 10 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/setup.py b/setup.py index 6711e95..6de8817 100644 --- a/setup.py +++ b/setup.py @@ -75,6 +75,7 @@ 'flake8-quotes', 'flake8-string-format', 'flake8-tuple>=0.2.8', + 'flake8-no-u-prefixed-strings>=0.2', 'pep8-naming>=0.7', 'pyflakes>=1.1', ] diff --git a/tests/category_tests.py b/tests/category_tests.py index 0d6bc5c..413f8b7 100644 --- a/tests/category_tests.py +++ b/tests/category_tests.py @@ -18,7 +18,7 @@ """Test Category object.""" - NOCATEGORYNAMESPACE_RE = '\'(.*?)\' is not in the category namespace!' + NOCATEGORYNAMESPACE_RE = "'(.*?)' is not in the category namespace!" NOREDIRECTPAGE_RE = r'Page \[\[(.*?)\]\] is not a redirect page.' family = 'wikipedia' @@ -163,7 +163,7 @@ """Test the category object with dry tests.""" - NOCATEGORYNAMESPACE_RE = '\'(.*?)\' is not in the category namespace!' + NOCATEGORYNAMESPACE_RE = "'(.*?)' is not in the category namespace!" family = 'wikipedia' code = 'en' diff --git a/tests/i18n_tests.py b/tests/i18n_tests.py index 0bad4ee..f20c805 100644 --- a/tests/i18n_tests.py +++ b/tests/i18n_tests.py @@ -254,7 +254,7 @@ self.assertEqual( i18n.twntranslate('de', 'test-multiple-plurals', 2) % {'action': 'Ändere', 'line': 'zwei'}, - u'Bot: Ändere zwei Zeilen von mehreren Seiten.') + 'Bot: Ändere zwei Zeilen von mehreren Seiten.') self.assertEqual( i18n.twntranslate('de', 'test-multiple-plurals', 3) % {'action': 'Ändere', 'line': 'drei'}, diff --git a/tests/link_tests.py b/tests/link_tests.py index 2e22a5b..b93bb15 100644 --- a/tests/link_tests.py +++ b/tests/link_tests.py @@ -71,11 +71,11 @@ """Test that valid titles are correctly normalized.""" self.assertEqual(Link('Sandbox', self.get_site()).title, 'Sandbox') self.assertEqual(Link('A "B"', self.get_site()).title, 'A "B"') - self.assertEqual(Link('A \'B\'', self.get_site()).title, 'A \'B\'') + self.assertEqual(Link("A 'B'", self.get_site()).title, "A 'B'") self.assertEqual(Link('.com', self.get_site()).title, '.com') self.assertEqual(Link('~', self.get_site()).title, '~') self.assertEqual(Link('"', self.get_site()).title, '"') - self.assertEqual(Link('\'', self.get_site()).title, '\'') + self.assertEqual(Link("'", self.get_site()).title, "'") self.assertEqual(Link('Talk:Sandbox', self.get_site()).title, 'Sandbox') self.assertEqual(Link('Talk:Foo:Sandbox', self.get_site()).title, diff --git a/tests/namespace_tests.py b/tests/namespace_tests.py index ae870f0..21c1ab8 100644 --- a/tests/namespace_tests.py +++ b/tests/namespace_tests.py @@ -137,7 +137,7 @@ def testNamespaceCompare(self): """Test Namespace comparisons.""" - a = Namespace(id=0, canonical_name=u'') + a = Namespace(id=0, canonical_name='') self.assertEqual(a, 0) self.assertEqual(a, '') diff --git a/tests/page_tests.py b/tests/page_tests.py index 908706f..acb37d7 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -346,7 +346,7 @@ # Test not valid source. self.assertRaisesRegex(pywikibot.Error, - 'Invalid argument type \'<\\w* \'\\w*\'>\' in ' + r"Invalid argument type '<\w* '\w*'>' in " 'Page initializer: dummy', pywikibot.Page, 'dummy') @@ -1064,13 +1064,13 @@ p1 = pywikibot.Page(site, 'User:Unicodesnowman/ProtectTest') p1.protect(protections={'edit': 'sysop', 'move': 'autoconfirmed'}, - reason=u'Pywikibot unit test') + reason='Pywikibot unit test') self.assertEqual(p1.protection(), {'edit': ('sysop', 'infinity'), 'move': ('autoconfirmed', 'infinity')}) p1.protect(protections={'edit': '', 'move': ''}, - reason=u'Pywikibot unit test') + reason='Pywikibot unit test') self.assertEqual(p1.protection(), {}) def test_protect_alt(self): diff --git a/tests/reflinks_tests.py b/tests/reflinks_tests.py index 1d30fb3..57c1b62 100644 --- a/tests/reflinks_tests.py +++ b/tests/reflinks_tests.py @@ -47,7 +47,7 @@ """Test namespaces=[] processes all namespaces.""" gen = XmlDumpPageGenerator( filename=join_xml_data_path('dummy-reflinks.xml'), - start=u'Fake page', + start='Fake page', namespaces=[], site=self.get_site()) pages = list(gen) -- To view, visit https://gerrit.wikimedia.org/r/464097 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: I9df7b557914e23a38d9199db03440419c22dfd50 Gerrit-Change-Number: 464097 Gerrit-PatchSet: 3 Gerrit-Owner: Dalba <dalba.wiki(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: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [fix] Fix typo
by jenkins-bot (Code Review) 02 Oct '18

02 Oct '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463961 ) Change subject: [fix] Fix typo ...................................................................... [fix] Fix typo Change-Id: Ia1ca136a1919e061737f9898359da6393ae249e9 --- M tests/site_tests.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/site_tests.py b/tests/site_tests.py index dc62322..fbfbd36 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -1036,7 +1036,7 @@ for page in pages: self.assertFalse( page.exists(), - '\n{page} does unexpectedly exit on site {page.site}' + '\n{page} does unexpectedly exist on site {page.site}' .format(page=page)) self.assertLessEqual(len(pages), 10) -- To view, visit https://gerrit.wikimedia.org/r/463961 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: Ia1ca136a1919e061737f9898359da6393ae249e9 Gerrit-Change-Number: 463961 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [fix] Fix typo in login.py script
by jenkins-bot (Code Review) 02 Oct '18

02 Oct '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463984 ) Change subject: [fix] Fix typo in login.py script ...................................................................... [fix] Fix typo in login.py script Word should be "current" and not "curren". Change-Id: I170d0693d733abcd8dbb635fc8f2bc54e0648132 --- M scripts/login.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/login.py b/scripts/login.py index 161f17f..eb277cf 100755 --- a/scripts/login.py +++ b/scripts/login.py @@ -16,7 +16,7 @@ -all Try to log in on all sites where a username is defined in user-config.py. - -logout Log out of the curren site. Combine with -all to log out of + -logout Log out of the current site. Combine with -all to log out of all sites, or with -family and -lang to log out of a specific site. -- To view, visit https://gerrit.wikimedia.org/r/463984 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: I170d0693d733abcd8dbb635fc8f2bc54e0648132 Gerrit-Change-Number: 463984 Gerrit-PatchSet: 2 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(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)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] cleanup docs/conf.py
by jenkins-bot (Code Review) 02 Oct '18

02 Oct '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463954 ) Change subject: [cleanup] cleanup docs/conf.py ...................................................................... [cleanup] cleanup docs/conf.py - remove preleading "u" from strings - make sure lines do not exceed 79 chars Bug: T89589 Change-Id: I6f80256592df6281b5e267d4980bd864049bb771 --- M docs/conf.py 1 file changed, 17 insertions(+), 15 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/conf.py b/docs/conf.py index c78193d..079af53 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -30,13 +30,13 @@ sys.path.insert(0, repo_dir) os.chdir(repo_dir) -# -- General configuration ----------------------------------------------------- +# -- General configuration ---------------------------------------------------- # If your documentation needs a minimal Sphinx version, state it here. # needs_sphinx = '1.0' -# Add any Sphinx extension module names here, as strings. They can be extensions -# coming with Sphinx (named 'sphinx.ext.*') or your custom ones. +# Add any Sphinx extension module names here, as strings. They can be +# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. extensions = ['sphinx.ext.autodoc', 'sphinx_epytext', 'sphinx.ext.todo', @@ -87,7 +87,8 @@ # directories to ignore when looking for source files. exclude_patterns = ['_build'] -# The reST default role (used for this markup: `text`) to use for all documents. +# The reST default role (used for this markup: `text`) to use for all +# documents. default_role = 'code' # If true, '()' will be appended to :func: etc. cross-reference text. @@ -108,7 +109,7 @@ # modindex_common_prefix = [] -# -- Options for HTML output --------------------------------------------------- +# -- Options for HTML output -------------------------------------------------- # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. @@ -188,15 +189,16 @@ htmlhelp_basename = 'Pywikibotdoc' -# -- Options for LaTeX output -------------------------------------------------- +# -- Options for LaTeX output ------------------------------------------------- latex_elements = {} # Grouping the document tree into LaTeX files. List of tuples -# (source start file, target name, title, author, documentclass [howto/manual]). +# (source start file, target name, title, author, documentclass +# [howto/manual]). latex_documents = [ - ('index', 'Pywikibot.tex', u'Pywikibot Documentation', - u'Pywikibot team', 'manual'), + ('index', 'Pywikibot.tex', 'Pywikibot Documentation', + 'Pywikibot team', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of @@ -220,27 +222,27 @@ # latex_domain_indices = True -# -- Options for manual page output -------------------------------------------- +# -- Options for manual page output ------------------------------------------- # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index', 'pywikibot', u'Pywikibot Documentation', - [u'Pywikibot team'], 1) + ('index', 'pywikibot', 'Pywikibot Documentation', + ['Pywikibot team'], 1) ] # If true, show URL addresses after external links. # man_show_urls = False -# -- Options for Texinfo output ------------------------------------------------ +# -- Options for Texinfo output ----------------------------------------------- # Grouping the document tree into Texinfo files. List of tuples # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'Pywikibot', u'Pywikibot Documentation', - u'Pywikibot team', 'Pywikibot', 'One line description of project.', + ('index', 'Pywikibot', 'Pywikibot Documentation', + 'Pywikibot team', 'Pywikibot', 'One line description of project.', 'Miscellaneous'), ] -- To view, visit https://gerrit.wikimedia.org/r/463954 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: I6f80256592df6281b5e267d4980bd864049bb771 Gerrit-Change-Number: 463954 Gerrit-PatchSet: 1 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] cleanup some tests/ files
by jenkins-bot (Code Review) 02 Oct '18

02 Oct '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463939 ) Change subject: [cleanup] cleanup some tests/ files ...................................................................... [cleanup] cleanup some tests/ files - remove bad quotes Bug: T89589 Change-Id: I2103f6b21bca8710c1b0447033741ae5c0129704 --- M tests/__init__.py M tests/dry_api_tests.py M tests/pagegenerators_tests.py M tests/site_tests.py M tests/textlib_tests.py M tests/wikibase_tests.py M tests/xmlreader_tests.py M tox.ini 8 files changed, 34 insertions(+), 31 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/__init__.py b/tests/__init__.py index caacc39..d120baf 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -275,7 +275,7 @@ cache_misses = 0 cache_hits = 0 -warnings.filterwarnings("always") +warnings.filterwarnings('always') class TestRequest(CachedRequest): diff --git a/tests/dry_api_tests.py b/tests/dry_api_tests.py index a377d53..01e5dcb 100644 --- a/tests/dry_api_tests.py +++ b/tests/dry_api_tests.py @@ -372,7 +372,7 @@ 'type': 'string' } ], - "querytype": "prop" + 'querytype': 'prop' } edit_action_param_data = { diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index f66629e..03875f5 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -90,7 +90,7 @@ def test_NamespaceFilterPageGenerator(self): """Test NamespaceFilterPageGenerator.""" - self.assertFunction("NamespaceFilterPageGenerator") + self.assertFunction('NamespaceFilterPageGenerator') site = self.site gen = pagegenerators.PagesFromTitlesGenerator(self.titles, site) gen = pagegenerators.NamespaceFilterPageGenerator(gen, 0, site) diff --git a/tests/site_tests.py b/tests/site_tests.py index dc62322..9437312 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -555,7 +555,7 @@ """Test Site.categorymembers.""" cats = list(self.site.pagecategories(self.mainpage)) if len(cats) == 0: - self.skipTest("Main page is not in any categories.") + self.skipTest('Main page is not in any categories.') else: for cm in self.site.categorymembers(cats[0]): self.assertIsInstance(cm, pywikibot.Page) @@ -1440,7 +1440,7 @@ self.assertIn(':', title) prefix = title[:title.index(':')] self.assertIn(self.site.namespaces.lookup_name(prefix).id, [6, 7]) - self.assertIn(change["ns"], [6, 7]) + self.assertIn(change['ns'], [6, 7]) def test_pagelist(self): """Test the site.recentchanges() with pagelist deprecated MW 1.14.""" diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index 4deba27..ad659df 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -63,7 +63,7 @@ def testCurrentBehaviour(self): """Test that 'Editing' is found.""" - self.assertContains("enwiki_help_editing", u"Editing") + self.assertContains('enwiki_help_editing', 'Editing') def testSpacesInSection(self): """Test with spaces in section.""" diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index 5a4759a..6ec66a4 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -142,9 +142,10 @@ claim = pywikibot.Claim(repo, 'p21') regex = r' is not type .+\.$' with self.assertRaisesRegex(ValueError, regex): - claim.setTarget(value="test") + claim.setTarget(value='test') claim.setTarget(ItemPage(repo, 'q1')) - self.assertEqual(claim._formatValue(), {'entity-type': 'item', 'numeric-id': 1}) + self.assertEqual(claim._formatValue(), {'entity-type': 'item', + 'numeric-id': 1}) def test_cmp(self): """Test WikibasePage.__cmp__.""" @@ -438,17 +439,17 @@ """Test WbQuantity formatting with bounds.""" repo = self.get_repo() q = pywikibot.WbQuantity(amount='0.044405586', error='0', site=repo) - self.assertEqual("%s" % q, + self.assertEqual('%s' % q, '{\n' ' "amount": "+%(val)s",\n' ' "lowerBound": "+%(val)s",\n' ' "unit": "1",\n' ' "upperBound": "+%(val)s"\n' '}' % {'val': '0.044405586'}) - self.assertEqual("%r" % q, - "WbQuantity(amount=%(val)s, " - "upperBound=%(val)s, lowerBound=%(val)s, " - "unit=1)" % {'val': '0.044405586'}) + self.assertEqual('%r' % q, + 'WbQuantity(amount=%(val)s, ' + 'upperBound=%(val)s, lowerBound=%(val)s, ' + 'unit=1)' % {'val': '0.044405586'}) def test_WbQuantity_self_equality(self): """Test WbQuantity equality.""" @@ -529,17 +530,17 @@ raise unittest.SkipTest('Wiki version must be 1.29.0-wmf.2 or ' 'newer to support unbound uncertainties.') q = pywikibot.WbQuantity(amount='0.044405586', site=self.repo) - self.assertEqual("%s" % q, + self.assertEqual('%s' % q, '{\n' ' "amount": "+%(val)s",\n' ' "lowerBound": null,\n' ' "unit": "1",\n' ' "upperBound": null\n' '}' % {'val': '0.044405586'}) - self.assertEqual("%r" % q, - "WbQuantity(amount=%(val)s, " - "upperBound=None, lowerBound=None, " - "unit=1)" % {'val': '0.044405586'}) + self.assertEqual('%r' % q, + 'WbQuantity(amount=%(val)s, ' + 'upperBound=None, lowerBound=None, ' + 'unit=1)' % {'val': '0.044405586'}) def test_WbQuantity_fromWikibase_unbound(self): """Test WbQuantity.fromWikibase() instantiating without bounds.""" @@ -629,7 +630,8 @@ def test_WbMonolingualText_string(self): """Test WbMonolingualText string.""" - q = pywikibot.WbMonolingualText(text='Test that basics work', language='en') + q = pywikibot.WbMonolingualText(text='Test that basics work', + language='en') q_dict = {'text': 'Test that basics work', 'language': 'en'} self.assertEqual(q.toWikibase(), q_dict) @@ -641,7 +643,8 @@ def test_WbMonolingualText_equality(self): """Test WbMonolingualText equality.""" - q = pywikibot.WbMonolingualText(text='Thou shall test this!', language='en-gb') + q = pywikibot.WbMonolingualText(text='Thou shall test this!', + language='en-gb') self.assertEqual(q, q) def test_WbMonolingualText_fromWikibase(self): @@ -731,7 +734,7 @@ non_data_page = Page(self.commons, 'File:Foo.jpg') non_map_page = Page(self.commons, 'Data:TemplateData/TemplateData.tab') regex = r"^Page must be in 'Data:' namespace and end in '\.map' " + \ - r"for geo-shape\.$" + r'for geo-shape\.$' with self.assertRaisesRegex(ValueError, regex): pywikibot.WbGeoShape(non_data_page, self.get_repo()) with self.assertRaisesRegex(ValueError, regex): diff --git a/tests/xmlreader_tests.py b/tests/xmlreader_tests.py index c2e5403..75bc121 100644 --- a/tests/xmlreader_tests.py +++ b/tests/xmlreader_tests.py @@ -101,16 +101,16 @@ talks = entries[2:4] self.assertEqual(2, len(articles)) - self.assertTrue(all(entry.id == "19252820" for entry in articles)) - self.assertTrue(all(entry.title == u"Çullu, Agdam" + self.assertTrue(all(entry.id == '19252820' for entry in articles)) + self.assertTrue(all(entry.title == 'Çullu, Agdam' for entry in articles)) - self.assertTrue(all(u'Çullu, Quzanlı' in entry.text + self.assertTrue(all('Çullu, Quzanlı' in entry.text for entry in articles)) - self.assertEqual(articles[0].text, u'#REDIRECT [[Çullu, Quzanlı]]') + self.assertEqual(articles[0].text, '#REDIRECT [[Çullu, Quzanlı]]') self.assertEqual(2, len(talks)) - self.assertTrue(all(entry.id == "19252824" for entry in talks)) - self.assertTrue(all(entry.title == u"Talk:Çullu, Agdam" + self.assertTrue(all(entry.id == '19252824' for entry in talks)) + self.assertTrue(all(entry.title == 'Talk:Çullu, Agdam' for entry in talks)) self.assertEqual(talks[1].text, '{{DisambigProject}}') self.assertEqual(talks[1].comment, 'proj') @@ -118,11 +118,12 @@ def test_edit_summary_decoding(self): """Test edit summaries are decoded.""" entries = self._get_entries('pair-0.10.xml', allrevisions=True) - articles = [entry for entry in entries if entry.ns == "0"] + articles = [entry for entry in entries if entry.ns == '0'] # It does not decode the edit summary - self.assertEqual(articles[0].comment, - u'moved [[Çullu, Agdam]] to [[Çullu, Quzanlı]]: dab') + self.assertEqual( + articles[0].comment, + 'moved [[Çullu, Agdam]] to [[Çullu, Quzanlı]]: dab') if __name__ == '__main__': # pragma: no cover diff --git a/tox.ini b/tox.ini index 6375f51..eef3f32 100644 --- a/tox.ini +++ b/tox.ini @@ -231,7 +231,6 @@ 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/463939 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: I2103f6b21bca8710c1b0447033741ae5c0129704 Gerrit-Change-Number: 463939 Gerrit-PatchSet: 2 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: scripts/imagecopy.py: Do not create Uploadbot.localskips.txt on loading
by jenkins-bot (Code Review) 01 Oct '18

01 Oct '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463599 ) Change subject: scripts/imagecopy.py: Do not create Uploadbot.localskips.txt on loading ...................................................................... scripts/imagecopy.py: Do not create Uploadbot.localskips.txt on loading Only create the file if the module is being run as the main module. Bug: T205772 Change-Id: Ifd8be27b5f2a213c94b1db96ede7fa48ade8fbd6 --- M scripts/imagecopy.py 1 file changed, 9 insertions(+), 7 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/imagecopy.py b/scripts/imagecopy.py index 21f78ec..4e8f70f 100644 --- a/scripts/imagecopy.py +++ b/scripts/imagecopy.py @@ -372,12 +372,13 @@ return pageText -# -label ok skip view -# textarea -archivo = config.datafilepath('Uploadbot.localskips.txt') -if not path.exists(archivo): - with open(archivo, 'w') as tocreate: - tocreate.write('{{NowCommons') +def load_global_archivo(): + """Load/create Uploadbot.localskips.txt and save the path in `archivo`.""" + global archivo + archivo = config.datafilepath('Uploadbot.localskips.txt') + if not path.exists(archivo): + with open(archivo, 'w') as tocreate: + tocreate.write('{{NowCommons') def getautoskip(): @@ -495,7 +496,6 @@ def main(*args): """Process command line arguments and invoke bot.""" - imagepage = None always = False category = '' delete_after_done = False @@ -518,6 +518,8 @@ pywikibot.bot.suggest_help(missing_generator=True) return False + load_global_archivo() + for page in pregenerator: skip = False if page.exists() and page.namespace() == 6 \ -- To view, visit https://gerrit.wikimedia.org/r/463599 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: Ifd8be27b5f2a213c94b1db96ede7fa48ade8fbd6 Gerrit-Change-Number: 463599 Gerrit-PatchSet: 4 Gerrit-Owner: Dalba <dalba.wiki(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)

1 0

[Gerrit] pywikibot/core[master]: [bugfix] Require pydot>=1.2 for interwiki_graph
by jenkins-bot (Code Review) 01 Oct '18

01 Oct '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463731 ) Change subject: [bugfix] Require pydot>=1.2 for interwiki_graph ...................................................................... [bugfix] Require pydot>=1.2 for interwiki_graph Bug: T75704 Change-Id: I76068da3a70c29321f50caee66fa8bdfb53d13d1 --- M HISTORY.rst M requirements.txt M setup.py 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/HISTORY.rst b/HISTORY.rst index 730b1cc..b1d1d36 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -4,6 +4,7 @@ Current release --------------- +* pydot >= 1.2 is required for interwiki_graph * Enable start timestamp for EventStreams (T205121) * Re-enable notifications (T205184) * Use FutureWarning for warnings intended for end users (T191192) diff --git a/requirements.txt b/requirements.txt index 66019c6..095a838 100644 --- a/requirements.txt +++ b/requirements.txt @@ -34,7 +34,7 @@ mwoauth>=0.2.4,!=0.3.1 # core interwiki_graph.py: -git+https://github.com/nlhepler/pydot#egg=pydot-1.0.29 +pydot >= 1.2 # wikistats.py and scripts unicodecsv ; python_version < '3' diff --git a/setup.py b/setup.py index 8e0515e..6711e95 100644 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ # Core library dependencies 'eventstreams': ['sseclient>=0.0.18'], 'isbn': ['python-stdnum'], - 'Graphviz': ['pydot>=1.0.28'], + 'Graphviz': ['pydot>=1.2'], 'Google': ['google>=1.7'], 'IRC': ['irc'], 'mwparserfromhell': ['mwparserfromhell>=0.3.3'], @@ -107,7 +107,6 @@ 'git+https://github.com/AlereDevices/lunatic-python.git#egg=lunatic-python', 'hg+https://bitbucket.org/TJG/pywin32#egg=pywin32', 'git+https://github.com/vasily-v-ryabov/pywinauto-64#egg=pywinauto', - 'git+https://github.com/nlhepler/pydot#egg=pydot-1.0.29', ] if PYTHON_VERSION == (2, 7, 2): -- To view, visit https://gerrit.wikimedia.org/r/463731 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: I76068da3a70c29321f50caee66fa8bdfb53d13d1 Gerrit-Change-Number: 463731 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [tests] Give a hint which page is failing in tests_protectedpages_create
by jenkins-bot (Code Review) 01 Oct '18

01 Oct '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463792 ) Change subject: [tests] Give a hint which page is failing in tests_protectedpages_create ...................................................................... [tests] Give a hint which page is failing in tests_protectedpages_create Bug: T205883 Change-Id: I45d2a2154be7d96235e9addf16d28dae76cc15d8 --- M tests/site_tests.py 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/site_tests.py b/tests/site_tests.py index 3fe987e..dc62322 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -1034,7 +1034,10 @@ pages = list(self.get_site().protectedpages(type='create', total=10)) for page in pages: - self.assertFalse(page.exists()) + self.assertFalse( + page.exists(), + '\n{page} does unexpectedly exit on site {page.site}' + .format(page=page)) self.assertLessEqual(len(pages), 10) def test_protectedpages_edit(self): -- To view, visit https://gerrit.wikimedia.org/r/463792 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: I45d2a2154be7d96235e9addf16d28dae76cc15d8 Gerrit-Change-Number: 463792 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] cleanup exceptions.py & login.py in pywikibot/
by jenkins-bot (Code Review) 01 Oct '18

01 Oct '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463720 ) Change subject: [cleanup] cleanup exceptions.py & login.py in pywikibot/ ...................................................................... [cleanup] cleanup exceptions.py & login.py in pywikibot/ - remove preleading harmless "u" from comments - remove some very old commented out code Change-Id: I3d6dff28e7105eefe5f326165a18cab09998b4d6 --- M pywikibot/exceptions.py M pywikibot/login.py 2 files changed, 1 insertion(+), 13 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py index 98e4fd5..92a0a2e 100644 --- a/pywikibot/exceptions.py +++ b/pywikibot/exceptions.py @@ -143,7 +143,7 @@ # Preformatted UNICODE message where the page title will be inserted # Override this in subclasses. - # u"Oh noes! Page %s is too funky, we should not delete it ;(" + # 'Oh noes! Page %s is too funky, we should not delete it ;(' message = None def __init__(self, page, message=None): diff --git a/pywikibot/login.py b/pywikibot/login.py index a17c230..0f54a60 100644 --- a/pywikibot/login.py +++ b/pywikibot/login.py @@ -335,18 +335,6 @@ return False self.storecookiedata(cookiedata) pywikibot.log('Should be logged in now') -# # Show a warning according to the local bot policy -# FIXME: disabled due to recursion; need to move this to the Site object -# after login -# if not self.botAllowed(): -# logger.error( -# u"Username '%(name)s' is not listed on [[%(page)s]]." -# % {'name': self.username, -# 'page': botList[self.site.family.name][self.site.code]}) -# logger.error( -# "Please make sure you are allowed to use the robot before actually using it!" -# ) -# return False return True def showCaptchaWindow(self, url): -- To view, visit https://gerrit.wikimedia.org/r/463720 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: I3d6dff28e7105eefe5f326165a18cab09998b4d6 Gerrit-Change-Number: 463720 Gerrit-PatchSet: 3 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [compat2core] Fix regressions of multiple Page methods
by jenkins-bot (Code Review) 01 Oct '18

01 Oct '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463660 ) Change subject: [compat2core] Fix regressions of multiple Page methods ...................................................................... [compat2core] Fix regressions of multiple Page methods The following methods' behavior differs between compat and core: - templates() - templatesWithParams() - linkedPages() Warnings were added to README-conversion.txt and compat2core.py. Every incorrect (not-working compat-like) usage across scripts was fixed. Solve_disambiguation.py slicing problem was splitted into a separate patch. Bug: T58188 Bug: T186394 Change-Id: If0abe8ad1653e2bc0786cf48dea214d5b94d1cbc --- M README-conversion.txt M scripts/commonscat.py M scripts/imagecopy_self.py M scripts/imagerecat.py M scripts/maintenance/compat2core.py M scripts/solve_disambiguation.py 6 files changed, 29 insertions(+), 14 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/README-conversion.txt b/README-conversion.txt index 4363efa..9618a07 100644 --- a/README-conversion.txt +++ b/README-conversion.txt @@ -91,9 +91,13 @@ The following methods have had their outputs changed: - getVersionHistory(): Returns a pywikibot.Timestamp object instead of a MediaWiki one +- templates(): Returns a list of Page objects of templates. In compat we have + a list of template title strings. - templatesWithParams(): Returns a list of tuples with two items. The first item is a Page object of the template, the second is a list of parameters. In compat we have a list of tuples with two items. The first item is the template title. +- linkedPages(): Returns a PageGenerator of Page objects of link targets. + In compat we have a list of link target strings. === FilePage objects === diff --git a/scripts/commonscat.py b/scripts/commonscat.py index 8b4062a..38c3a76 100755 --- a/scripts/commonscat.py +++ b/scripts/commonscat.py @@ -488,7 +488,8 @@ pywikibot.log('getCommonscat: The category is a redirect') return self.checkCommonscatLink( commonsPage.getRedirectTarget().title(with_ns=False)) - elif 'Category redirect' in commonsPage.templates(): + elif (pywikibot.Page(commonsPage.site, + 'Template:Category redirect') in commonsPage.templates()): pywikibot.log( 'getCommonscat: The category is a category redirect') for template in commonsPage.templatesWithParams(): diff --git a/scripts/imagecopy_self.py b/scripts/imagecopy_self.py index 4730d16..3718367 100644 --- a/scripts/imagecopy_self.py +++ b/scripts/imagecopy_self.py @@ -384,10 +384,11 @@ """ for template in imagepage.templates(): - if template in skipTemplates[imagepage.site.lang]: + template_title = template.title(with_ns=False) + if template_title in skipTemplates[imagepage.site.lang]: pywikibot.output( 'Found {} which is on the template skip list' - .format(template)) + .format(template_title)) return True return False diff --git a/scripts/imagerecat.py b/scripts/imagerecat.py index 8af4a9a..cdc9c57 100755 --- a/scripts/imagerecat.py +++ b/scripts/imagerecat.py @@ -86,7 +86,9 @@ imagepage = pywikibot.FilePage(page.site, page.title()) pywikibot.output('Working on ' + imagepage.title()) - if onlyUncat and not('Uncategorized' in imagepage.templates()): + if (onlyUncat and not pywikibot.Page( + imagepage.site, 'Template:Uncategorized') + in imagepage.templates()): pywikibot.output('No Uncategorized template found') else: currentCats = getCurrentCats(imagepage) diff --git a/scripts/maintenance/compat2core.py b/scripts/maintenance/compat2core.py index 4caf605..c4b64ce 100755 --- a/scripts/maintenance/compat2core.py +++ b/scripts/maintenance/compat2core.py @@ -117,12 +117,17 @@ 'by a direct site request'), ('.verbose', 'verbose_output need "from pywikibot import config" first'), + ('templates(', + 'returns a list of templage page objects, not a list of template titles.' + '\nPlease refer README-conversion.txt and the documentation.'), ('templatesWithParams(', 'the first item of each template info is a Page object of the template,\n' 'not the title. ' 'Please refer README-conversion.txt and the documentation.'), - ('templates(', - 'returns a list of template title not a list of templage page objects.'), + ('linkedPages(', + 'returns a PageGenerator of page objects of link targets, not a list\n' + 'of link target strings. Please refer README-conversion.txt\n' + 'and the documentation.'), ) diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py index a262d54..378e921 100755 --- a/scripts/solve_disambiguation.py +++ b/scripts/solve_disambiguation.py @@ -1039,15 +1039,17 @@ """ if disambPage.isRedirectPage() and not self.primary: - if (disambPage.site.lang in self.primary_redir_template - and self.primary_redir_template[disambPage.site.lang] - in disambPage.templates()): + primary = i18n.translate(disambPage.site, + self.primary_redir_template) + if primary: + primary_page = pywikibot.Page(disambPage.site, + 'Template:' + primary) + if primary and primary_page in disambPage.templates(): baseTerm = disambPage.title() - for template in disambPage.templatesWithParams(): - if template[0] == self.primary_redir_template[ - disambPage.site.lang] \ - and len(template[1]) > 0: - baseTerm = template[1][1] + for template, params in disambPage.templatesWithParams(): + if params and template == primary_page: + baseTerm = params[1] + break disambTitle = primary_topic_format[self.mylang] % baseTerm try: disambPage2 = pywikibot.Page( -- To view, visit https://gerrit.wikimedia.org/r/463660 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: If0abe8ad1653e2bc0786cf48dea214d5b94d1cbc Gerrit-Change-Number: 463660 Gerrit-PatchSet: 5 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Liuxinyu970226 <541329866(a)qq.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits October 2018