Pywikibot-commits September 2018

pywikibot-commits@lists.wikimedia.org

1 participants
191 discussions

[Gerrit] pywikibot/core[master]: [cleanup] cleanup tests/[user_tests.py to wikibase_edit_tests.py]

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463089 ) Change subject: [cleanup] cleanup tests/[user_tests.py to wikibase_edit_tests.py] ...................................................................... [cleanup] cleanup tests/[user_tests.py to wikibase_edit_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: Ibfe2f35a877e4074ce67619a0c4ce7a868e53985 --- M tests/utils.py M tests/weblib_tests.py M tests/weblinkchecker_tests.py M tests/wikibase_edit_tests.py 4 files changed, 36 insertions(+), 28 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/utils.py b/tests/utils.py index 84ce7bf..e9b7cf9 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -255,10 +255,10 @@ """ Context manager to assert certain APIError exceptions. - This is build similar to the L{unittest.TestCase.assertError} implementation - which creates an context manager. It then calls L{handle} which either - returns this manager if no executing object given or calls the callable - object. + This is build similar to the L{unittest.TestCase.assertError} + implementation which creates an context manager. It then calls L{handle} + which either returns this manager if no executing object given or calls + the callable object. """ def __init__(self, code, info, msg, test_case): @@ -392,8 +392,8 @@ def submit(self): """Prevented method.""" - raise Exception(u'DryRequest rejecting request: %r' - % self._params) + raise Exception('DryRequest rejecting request: {!r}' + .format(self._params)) class DrySite(pywikibot.site.APISite): @@ -558,9 +558,9 @@ This patches the C{http} import in the given module to a class simulating C{request} and C{fetch}. It has a C{data} attribute which is either a - static value which the requests will return or it's a callable returning the - data. If it's a callable it'll be called with the same parameters as the - original function in the L{http} module. For fine grained control it's + static value which the requests will return or it's a callable returning + the data. If it's a callable it'll be called with the same parameters as + the original function in the L{http} module. For fine grained control it's possible to override/monkey patch the C{before_request} and C{before_fetch} methods. By default they just return C{data} directory or call it if it's callable. @@ -680,14 +680,15 @@ not isinstance(v, str)] if unicode_env: raise TypeError( - '%s: unicode in os.environ: %r' % (e, unicode_env)) + '{}: unicode in os.environ: {!r}'.format(e, unicode_env)) child_unicode_env = [(k, v) for k, v in env.items() if not isinstance(k, str) or not isinstance(v, str)] if child_unicode_env: raise TypeError( - '%s: unicode in child env: %r' % (e, child_unicode_env)) + '{}: unicode in child env: {!r}' + .format(e, child_unicode_env)) raise if data_in is not None: @@ -718,7 +719,8 @@ data_out = p.communicate() return {'exit_code': p.returncode, 'stdout': data_out[0].decode(config.console_encoding), - 'stderr': (stderr_lines + data_out[1]).decode(config.console_encoding)} + 'stderr': (stderr_lines + data_out[1]) + .decode(config.console_encoding)} def execute_pwb(args, data_in=None, timeout=0, error=None, overrides=None): @@ -735,10 +737,10 @@ if overrides: command.append('-c') overrides = '; '.join( - '%s = %s' % (key, value) for key, value in overrides.items()) + '{} = {}'.format(key, value) for key, value in overrides.items()) command.append( - 'import pwb; import pywikibot; %s; pwb.main()' - % overrides) + 'import pwb; import pywikibot; {}; pwb.main()' + .format(overrides)) else: command.append(_pwb_py) diff --git a/tests/weblib_tests.py b/tests/weblib_tests.py index a16e441..98d657b 100644 --- a/tests/weblib_tests.py +++ b/tests/weblib_tests.py @@ -50,17 +50,20 @@ """Test Internet Archive for newest https://google.com.""" archivedversion = self._get_archive_url('https://google.com') parsed = urlparse(archivedversion) - self.assertIn(parsed.scheme, [u'http', u'https']) - self.assertEqual(parsed.netloc, u'web.archive.org') - self.assertTrue(parsed.path.strip('/').endswith('google.com'), parsed.path) + self.assertIn(parsed.scheme, ['http', 'https']) + self.assertEqual(parsed.netloc, 'web.archive.org') + self.assertTrue(parsed.path.strip('/').endswith('google.com'), + parsed.path) def testInternetArchiveOlder(self): """Test Internet Archive for https://google.com as of June 2006.""" - archivedversion = self._get_archive_url('https://google.com', '20060601') + archivedversion = self._get_archive_url('https://google.com', + '20060601') parsed = urlparse(archivedversion) - self.assertIn(parsed.scheme, [u'http', u'https']) - self.assertEqual(parsed.netloc, u'web.archive.org') - self.assertTrue(parsed.path.strip('/').endswith('google.com'), parsed.path) + self.assertIn(parsed.scheme, ['http', 'https']) + self.assertEqual(parsed.netloc, 'web.archive.org') + self.assertTrue(parsed.path.strip('/').endswith('google.com'), + parsed.path) self.assertIn('200606', parsed.path) @@ -82,8 +85,10 @@ @unittest.expectedFailure # See T110640 def testWebCiteOlder(self): """Test WebCite for https://google.com as of January 2013.""" - archivedversion = self._get_archive_url('https://google.com', '20130101') - self.assertEqual(archivedversion, 'http://www.webcitation.org/6DHSeh2L0') + archivedversion = self._get_archive_url('https://google.com', + '20130101') + self.assertEqual(archivedversion, + 'http://www.webcitation.org/6DHSeh2L0') if __name__ == '__main__': # pragma: no cover diff --git a/tests/weblinkchecker_tests.py b/tests/weblinkchecker_tests.py index 8052d63..4608723 100644 --- a/tests/weblinkchecker_tests.py +++ b/tests/weblinkchecker_tests.py @@ -42,7 +42,8 @@ self.skipTest(e) -class WeblibTestMementoInternetArchive(MementoTestCase, weblib_tests.TestInternetArchive): +class WeblibTestMementoInternetArchive(MementoTestCase, + weblib_tests.TestInternetArchive): """Test InternetArchive Memento using old weblib tests.""" diff --git a/tests/wikibase_edit_tests.py b/tests/wikibase_edit_tests.py index 3f1cf59..497cfa1 100644 --- a/tests/wikibase_edit_tests.py +++ b/tests/wikibase_edit_tests.py @@ -402,7 +402,7 @@ # Remove qualifier claim = item.claims['P115'][0] - qual_3 = claim.qualifiers[u'P580'][0] + qual_3 = claim.qualifiers['P580'][0] claim.removeQualifier(qual_3) # Check P580 qualifier removed but P88 qualifier remains @@ -422,8 +422,8 @@ # Remove qualifiers item.get(force=True) claim = item.claims['P115'][0] - qual_3 = claim.qualifiers[u'P580'][0] - qual_4 = claim.qualifiers[u'P88'][0] + qual_3 = claim.qualifiers['P580'][0] + qual_4 = claim.qualifiers['P88'][0] claim.removeQualifiers([qual_3, qual_4]) # Check P580 and P88 qualifiers are removed -- To view, visit https://gerrit.wikimedia.org/r/463089 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: Ibfe2f35a877e4074ce67619a0c4ce7a868e53985 Gerrit-Change-Number: 463089 Gerrit-PatchSet: 3 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

5 years, 7 months

[Gerrit] pywikibot/core[master]: [cleanup] cleanup tests/wikibase_tests.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463081 ) Change subject: [cleanup] cleanup tests/wikibase_tests.py ...................................................................... [cleanup] cleanup tests/wikibase_tests.py - remote preleading "u" from strings - use single quotes for string literals Change-Id: I5a34726b78f21e5e11c2cae66b4017a337a9b98c --- M tests/wikibase_tests.py 1 file changed, 22 insertions(+), 21 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index 688ed20..5a4759a 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -116,7 +116,7 @@ """Setup test class.""" super(TestGeneral, cls).setUpClass() enwiki = pywikibot.Site('en', 'wikipedia') - cls.mainpage = pywikibot.Page(pywikibot.page.Link("Main Page", enwiki)) + cls.mainpage = pywikibot.Page(pywikibot.page.Link('Main Page', enwiki)) def testWikibase(self): """Wikibase tests.""" @@ -459,10 +459,10 @@ def test_WbQuantity_fromWikibase(self): """Test WbQuantity.fromWikibase() instantiating.""" repo = self.get_repo() - q = pywikibot.WbQuantity.fromWikibase({u'amount': u'+0.0229', - u'lowerBound': u'0', - u'upperBound': u'1', - u'unit': u'1'}, + q = pywikibot.WbQuantity.fromWikibase({'amount': '+0.0229', + 'lowerBound': '0', + 'upperBound': '1', + 'unit': '1'}, site=repo) # note that the bounds are inputted as INT but are returned as FLOAT self.assertEqual(q.toWikibase(), @@ -546,8 +546,8 @@ if self.version < MediaWikiVersion('1.29.0-wmf.2'): raise unittest.SkipTest('Wiki version must be 1.29.0-wmf.2 or ' 'newer to support unbound uncertainties.') - q = pywikibot.WbQuantity.fromWikibase({u'amount': u'+0.0229', - u'unit': u'1'}, + q = pywikibot.WbQuantity.fromWikibase({'amount': '+0.0229', + 'unit': '1'}, site=self.repo) self.assertEqual(q.toWikibase(), {'amount': '+0.0229', 'lowerBound': None, @@ -647,7 +647,7 @@ def test_WbMonolingualText_fromWikibase(self): """Test WbMonolingualText.fromWikibase() instantiating.""" q = pywikibot.WbMonolingualText.fromWikibase({'text': 'Test this!', - 'language': u'en'}) + 'language': 'en'}) self.assertEqual(q.toWikibase(), {'text': 'Test this!', 'language': 'en'}) @@ -684,13 +684,13 @@ def test_WbGeoShape_page(self): """Test WbGeoShape page.""" q = pywikibot.WbGeoShape(self.page) - q_val = u'Data:Lyngby Hovedgade.map' + q_val = 'Data:Lyngby Hovedgade.map' self.assertEqual(q.toWikibase(), q_val) def test_WbGeoShape_page_and_site(self): """Test WbGeoShape from page and site.""" q = pywikibot.WbGeoShape(self.page, self.get_repo()) - q_val = u'Data:Lyngby Hovedgade.map' + q_val = 'Data:Lyngby Hovedgade.map' self.assertEqual(q.toWikibase(), q_val) def test_WbGeoShape_equality(self): @@ -760,13 +760,13 @@ def test_WbTabularData_page(self): """Test WbTabularData page.""" q = pywikibot.WbTabularData(self.page) - q_val = u'Data:Bea.gov/GDP by state.tab' + q_val = 'Data:Bea.gov/GDP by state.tab' self.assertEqual(q.toWikibase(), q_val) def test_WbTabularData_page_and_site(self): """Test WbTabularData from page and site.""" q = pywikibot.WbTabularData(self.page, self.get_repo()) - q_val = u'Data:Bea.gov/GDP by state.tab' + q_val = 'Data:Bea.gov/GDP by state.tab' self.assertEqual(q.toWikibase(), q_val) def test_WbTabularData_equality(self): @@ -807,7 +807,7 @@ non_data_page = Page(self.commons, 'File:Foo.jpg') non_map_page = Page(self.commons, 'Data:Lyngby Hovedgade.map') regex = r"^Page must be in 'Data:' namespace and end in '\.tab' " + \ - r"for tabular-data\.$" + r'for tabular-data\.$' with self.assertRaisesRegex(ValueError, regex): pywikibot.WbTabularData(non_data_page, self.get_repo()) with self.assertRaisesRegex(ValueError, regex): @@ -938,7 +938,7 @@ wikidata = self.get_repo() item = ItemPage(wikidata, 'Q60') self.assertEqual(item._link._title, 'Q60') - self.assertEqual(item._defined_by(), {u'ids': u'Q60'}) + self.assertEqual(item._defined_by(), {'ids': 'Q60'}) self.assertEqual(item.id, 'Q60') self.assertFalse(hasattr(item, '_title')) self.assertFalse(hasattr(item, '_site')) @@ -1119,10 +1119,10 @@ def test_fromPage_lazy(self): """Test item from page with lazy_load.""" - page = pywikibot.Page(pywikibot.page.Link("New York City", self.site)) + page = pywikibot.Page(pywikibot.page.Link('New York City', self.site)) item = ItemPage.fromPage(page, lazy_load=True) self.assertEqual(item._defined_by(), - {'sites': u'enwiki', 'titles': u'New York City'}) + {'sites': 'enwiki', 'titles': 'New York City'}) self.assertEqual(item._link._title, '-1') self.assertFalse(hasattr(item, 'id')) self.assertFalse(hasattr(item, '_content')) @@ -1136,7 +1136,7 @@ def test_fromPage_invalid_title(self): """Test item from page with invalid title.""" - page = pywikibot.Page(pywikibot.page.Link("[]", self.site)) + page = pywikibot.Page(pywikibot.page.Link('[]', self.site)) regex = r' contains illegal char$s$ ' with self.assertRaisesRegex(pywikibot.InvalidTitle, regex): ItemPage.fromPage(page) @@ -1202,7 +1202,7 @@ A redirect should not have a wikidata item. """ - link = pywikibot.page.Link("Main page", self.site) + link = pywikibot.page.Link('Main page', self.site) self._test_fromPage_noitem(link) def test_fromPage_missing(self): @@ -1211,7 +1211,7 @@ A deleted page should not have a wikidata item. """ - link = pywikibot.page.Link("Test page", self.site) + link = pywikibot.page.Link('Test page', self.site) self._test_fromPage_noitem(link) def test_fromPage_noitem(self): @@ -1227,7 +1227,7 @@ def test_fromPage_missing_lazy(self): """Test lazy loading of item from nonexistent source page.""" # this is a deleted page, and should not have a wikidata item - link = pywikibot.page.Link("Test page", self.site) + link = pywikibot.page.Link('Test page', self.site) page = pywikibot.Page(link) # ItemPage.fromPage should raise an exception when not lazy loading # and that exception should refer to the source title 'Test page' @@ -1568,7 +1568,8 @@ def test_iterlinks_page_object(self): """Test iterlinks for page objects.""" page = [pg for pg in self.wdp.iterlinks() if pg.site.code == 'af'][0] - self.assertEqual(page, pywikibot.Page(self.get_site('afwiki'), u'New York Stad')) + self.assertEqual(page, pywikibot.Page(self.get_site('afwiki'), + 'New York Stad')) def test_iterlinks_filtering(self): """Test iterlinks for a given family.""" -- To view, visit https://gerrit.wikimedia.org/r/463081 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: I5a34726b78f21e5e11c2cae66b4017a337a9b98c Gerrit-Change-Number: 463081 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)

5 years, 7 months

[Gerrit] pywikibot/core[master]: [cleanup] cleanup tests/xmlreader_tests.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463070 ) Change subject: [cleanup] cleanup tests/xmlreader_tests.py ...................................................................... [cleanup] cleanup tests/xmlreader_tests.py - remove preleading "u" from strings - use single quotes for string literals Change-Id: I0b451a613a94146d96d23b6a6031bede87fffb6f --- M tests/xmlreader_tests.py 1 file changed, 9 insertions(+), 9 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/xmlreader_tests.py b/tests/xmlreader_tests.py index ade20c9..c2e5403 100644 --- a/tests/xmlreader_tests.py +++ b/tests/xmlreader_tests.py @@ -35,20 +35,20 @@ """Test loading all revisions.""" pages = self._get_entries('article-pear.xml', allrevisions=True) self.assertEqual(4, len(pages)) - self.assertEqual(u"Automated conversion", pages[0].comment) - self.assertEqual(u"Pear", pages[0].title) - self.assertEqual(u"24278", pages[0].id) + self.assertEqual('Automated conversion', pages[0].comment) + self.assertEqual('Pear', pages[0].title) + self.assertEqual('24278', pages[0].id) self.assertTrue(pages[0].text.startswith('Pears are [[tree]]s of')) - self.assertEqual(u"Quercusrobur", pages[1].username) - self.assertEqual(u"Pear", pages[0].title) + self.assertEqual('Quercusrobur', pages[1].username) + self.assertEqual('Pear', pages[0].title) def test_XmlDumpFirstRev(self): """Test loading the first revision.""" - pages = self._get_entries("article-pear.xml", allrevisions=False) + pages = self._get_entries('article-pear.xml', allrevisions=False) self.assertEqual(1, len(pages)) - self.assertEqual(u"Automated conversion", pages[0].comment) - self.assertEqual(u"Pear", pages[0].title) - self.assertEqual(u"24278", pages[0].id) + self.assertEqual('Automated conversion', pages[0].comment) + self.assertEqual('Pear', pages[0].title) + self.assertEqual('24278', pages[0].id) self.assertTrue(pages[0].text.startswith('Pears are [[tree]]s of')) self.assertTrue(not pages[0].isredirect) -- To view, visit https://gerrit.wikimedia.org/r/463070 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: I0b451a613a94146d96d23b6a6031bede87fffb6f Gerrit-Change-Number: 463070 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)

5 years, 7 months

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/maintenance/compat2core.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462913 ) Change subject: [cleanup] cleanup scripts/maintenance/compat2core.py ...................................................................... [cleanup] cleanup scripts/maintenance/compat2core.py - remove preleading "u" from strings - use single quotes for string literals - use str.format(...) instead of modulo for substituting type specifier arguments with placeholders Change-Id: Ie30db8720ed37861e42b76a4e6b2ddfda8ee5ca4 --- M scripts/maintenance/compat2core.py 1 file changed, 7 insertions(+), 6 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/maintenance/compat2core.py b/scripts/maintenance/compat2core.py index cfc807d..00afe9d 100755 --- a/scripts/maintenance/compat2core.py +++ b/scripts/maintenance/compat2core.py @@ -56,7 +56,7 @@ ('import catlib\r?\n', ''), ('import userlib\r?\n', ''), # change wikipedia to pywikibot, exclude URLs - (r'(?<!\.)wikipedia\.', u'pywikibot.'), + (r'(?<!\.)wikipedia\.', 'pywikibot.'), # site instance call (r'pywikibot\.getSite\s*\(\s*', 'pywikibot.Site('), # lang is different from code. We should use code in core @@ -152,21 +152,22 @@ '(no input to leave):') if not self.source: exit() - if not self.source.endswith(u'.py'): + if not self.source.endswith('.py'): self.source += '.py' if os.path.exists(self.source): break self.source = os.path.join('scripts', self.source) if os.path.exists(self.source): break - pywikibot.output(u'%s does not exist. Please retry.' % self.source) + pywikibot.output('{} does not exist. Please retry.' + .format(self.source)) self.source = None def get_dest(self): """Ask for destination script name.""" - self.dest = u'%s-core.%s' % tuple(self.source.rsplit(u'.', 1)) + self.dest = '%s-core.%s' % tuple(self.source.rsplit('.', 1)) if not self.warnonly and not pywikibot.input_yn( - u'Destination file is %s.' % self.dest, + 'Destination file is {}.'.format(self.dest), default=True, automatic_quit=False): pywikibot.output('Quitting...') exit() @@ -209,6 +210,6 @@ bot.run() -if __name__ == "__main__": +if __name__ == '__main__': pywikibot.stopme() # we do not work on any site main() -- To view, visit https://gerrit.wikimedia.org/r/462913 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: Ie30db8720ed37861e42b76a4e6b2ddfda8ee5ca4 Gerrit-Change-Number: 462913 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)

5 years, 7 months

[Gerrit] pywikibot/core[master]: [test] Skip hidden log entry instead of failing tests

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/463049 ) Change subject: [test] Skip hidden log entry instead of failing tests ...................................................................... [test] Skip hidden log entry instead of failing tests Bug: T205532 Change-Id: Ibd14cc5383567e8fbea62239093c0f73d9a6bfb6 --- M tests/site_tests.py 1 file changed, 8 insertions(+), 5 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/site_tests.py b/tests/site_tests.py index c875938..837364e 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -20,12 +20,10 @@ import pywikibot -from pywikibot import config - +from pywikibot import async_request, config, page_put_queue from pywikibot.comms import http from pywikibot.data import api - -from pywikibot import async_request, page_put_queue +from pywikibot.exceptions import HiddenKeyError from pywikibot.tools import ( MediaWikiVersion, PY2, @@ -1325,7 +1323,12 @@ """Test the deprecated site.logpages() when namespace is a list.""" le = list(self.site.logpages(namespace=[2, 3], number=10)) for entry in le: - self.assertIn(entry[0].namespace(), [2, 3]) + try: + self.assertIn(entry[0].namespace(), [2, 3]) + except HiddenKeyError as e: + raise unittest.SkipTest( + 'Log entry {entry} is hidden:\n{entry.data}\n{error!r}' + .format(entry=entry, error=e)) def test_logpages_dump(self): """Test the deprecated site.logpages() method using dump mode.""" -- To view, visit https://gerrit.wikimedia.org/r/463049 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: Ibd14cc5383567e8fbea62239093c0f73d9a6bfb6 Gerrit-Change-Number: 463049 Gerrit-PatchSet: 3 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]: [cleanup] cleanup scripts/commonscat.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462764 ) Change subject: [cleanup] cleanup scripts/commonscat.py ...................................................................... [cleanup] cleanup scripts/commonscat.py - use str.format(...) instead of modulo for type specifier arguments. - use single quotes for string literals - use "+" for concatenating strings in some cases Change-Id: I303434ee78d2b0c4b04d95eabf43338d78973364 --- M scripts/commonscat.py 1 file changed, 23 insertions(+), 22 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/commonscat.py b/scripts/commonscat.py index 1ad4a1f..71a95cf 100755 --- a/scripts/commonscat.py +++ b/scripts/commonscat.py @@ -241,17 +241,17 @@ def treat(self, page): """Load the given page, do some changes, and save it.""" if not page.exists(): - pywikibot.output('Page %s does not exist. Skipping.' - % page.title(as_link=True)) + pywikibot.output('Page {} does not exist. Skipping.' + .format(page.title(as_link=True))) elif page.isRedirectPage(): - pywikibot.output('Page %s is a redirect. Skipping.' - % page.title(as_link=True)) + pywikibot.output('Page {} is a redirect. Skipping.' + .format(page.title(as_link=True))) elif page.isCategoryRedirect(): - pywikibot.output('Page %s is a category redirect. Skipping.' - % page.title(as_link=True)) + pywikibot.output('Page {} is a category redirect. Skipping.' + .format(page.title(as_link=True))) elif page.isDisambig(): - pywikibot.output('Page %s is a disambiguation. Skipping.' - % page.title(as_link=True)) + pywikibot.output('Page {} is a disambiguation. Skipping.' + .format(page.title(as_link=True))) else: self.addCommonscat(page) @@ -265,7 +265,7 @@ if code in commonscatTemplates: return commonscatTemplates[code] else: - return commonscatTemplates[u'_default'] + return commonscatTemplates['_default'] def skipPage(self, page): """Determine if the page should be skipped.""" @@ -299,16 +299,17 @@ page.site.code) commonscatLink = self.getCommonscatLink(page) if commonscatLink: - pywikibot.output('Commonscat template is already on %s' - % page.title()) + pywikibot.output('Commonscat template is already on ' + + page.title()) (currentCommonscatTemplate, currentCommonscatTarget, LinkText, Note) = commonscatLink checkedCommonscatTarget = self.checkCommonscatLink( currentCommonscatTarget) if (currentCommonscatTarget == checkedCommonscatTarget): # The current commonscat link is good - pywikibot.output('Commonscat link at %s to Category:%s is ok' - % (page.title(), currentCommonscatTarget)) + pywikibot.output('Commonscat link at {} to Category:{} is ok' + .format(page.title(), + currentCommonscatTarget)) return True elif checkedCommonscatTarget != '': # We have a new Commonscat link, replace the old one @@ -327,8 +328,8 @@ # TODO: if the commonsLink == '', should it be removed? elif self.skipPage(page): - pywikibot.output('Found a template in the skip list. Skipping %s' - % page.title()) + pywikibot.output('Found a template in the skip list. Skipping ' + + page.title()) else: commonscatLink = self.findCommonscatLink(page) if (commonscatLink != ''): @@ -404,9 +405,9 @@ possibleCommonscat) if (checkedCommonscat != ''): pywikibot.output( - 'Found link for %s at [[%s:%s]] to %s.' - % (page.title(), ipage.site.code, - ipage.title(), checkedCommonscat)) + 'Found link for {} at [[{}:{}]] to {}.' + .format(page.title(), ipage.site.code, ipage.title(), + checkedCommonscat)) return checkedCommonscat except pywikibot.BadTitle: # The interwiki was incorrect @@ -442,7 +443,7 @@ commonscatLinktext, commonscatNote) return None - def checkCommonscatLink(self, name=""): + def checkCommonscatLink(self, name=''): """Return the name of a valid commons category. If the page is a redirect this function tries to follow it. @@ -477,9 +478,9 @@ return self.checkCommonscatLink(m.group('newcat2')) else: pywikibot.output( - "getCommonscat: %s deleted by %s. Couldn't find " - 'move target in "%s"' - % (commonsPage, loguser, logcomment)) + "getCommonscat: {} deleted by {}. Couldn't find " + 'move target in "{}"' + .format(commonsPage, loguser, logcomment)) return '' return '' elif commonsPage.isRedirectPage(): -- To view, visit https://gerrit.wikimedia.org/r/462764 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: I303434ee78d2b0c4b04d95eabf43338d78973364 Gerrit-Change-Number: 462764 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)

5 years, 7 months

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/coordinate_import.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462756 ) Change subject: [cleanup] cleanup scripts/coordinate_import.py ...................................................................... [cleanup] cleanup scripts/coordinate_import.py - use str.format(...) instead of modulo for type specifier arguments. - use single quotes for string literals - remove preleading "u" from strings Change-Id: I81745c3d1315c42795cd447a0c5d9f616a869872 --- M scripts/coordinate_import.py 1 file changed, 10 insertions(+), 10 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/coordinate_import.py b/scripts/coordinate_import.py index 577568a..a82a59b 100755 --- a/scripts/coordinate_import.py +++ b/scripts/coordinate_import.py @@ -84,22 +84,22 @@ claims = item.get().get('claims') if self.prop in claims: - pywikibot.output(u'Item %s already contains coordinates (%s)' - % (item.title(), self.prop)) + pywikibot.output('Item {} already contains coordinates ({})' + .format(item.title(), self.prop)) return prop = self.has_coord_qualifier(claims) if prop: - pywikibot.output(u'Item %s already contains coordinates' - u' (%s) as qualifier for %s' - % (item.title(), self.prop, prop)) + pywikibot.output('Item {} already contains coordinates' + ' ({}) as qualifier for {}' + .format(item.title(), self.prop, prop)) return newclaim = pywikibot.Claim(self.repo, self.prop) newclaim.setTarget(coordinate) - pywikibot.output(u'Adding %s, %s to %s' % (coordinate.lat, - coordinate.lon, - item.title())) + pywikibot.output('Adding {}, {} to {}'.format(coordinate.lat, + coordinate.lon, + item.title())) try: item.addClaim(newclaim) @@ -107,7 +107,7 @@ if source: newclaim.addSource(source, bot=True) except CoordinateGlobeUnknownException as e: - pywikibot.output(u'Skipping unsupported globe: %s' % e.args) + pywikibot.output('Skipping unsupported globe: {}'.format(e.args)) def main(*args): @@ -141,5 +141,5 @@ return False -if __name__ == "__main__": +if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/462756 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: I81745c3d1315c42795cd447a0c5d9f616a869872 Gerrit-Change-Number: 462756 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)

5 years, 7 months

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/data_ingestion.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462734 ) Change subject: [cleanup] cleanup scripts/data_ingestion.py ...................................................................... [cleanup] cleanup scripts/data_ingestion.py - use str.format(...) instead of modulo for type specifier arguments. - use single quotes for string literals - remove preleading "u" from strings Change-Id: Id429548672099389a2e2f3636c7f8c1ca567053b --- M scripts/data_ingestion.py 1 file changed, 18 insertions(+), 17 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/data_ingestion.py b/scripts/data_ingestion.py index 83cc324..e4ad76e 100755 --- a/scripts/data_ingestion.py +++ b/scripts/data_ingestion.py @@ -59,12 +59,12 @@ """ self.URL = URL self.metadata = metadata - self.metadata["_url"] = URL - self.metadata["_filename"] = filename = posixpath.split( + self.metadata['_url'] = URL + self.metadata['_filename'] = filename = posixpath.split( urlparse(URL)[2])[1] - self.metadata["_ext"] = ext = filename.split(".")[-1] + self.metadata['_ext'] = ext = filename.split('.')[-1] if ext == filename: - self.metadata["_ext"] = ext = None + self.metadata['_ext'] = ext = None self.contents = None if not site: @@ -120,19 +120,19 @@ params = {} params.update(self.metadata) params.update(extraparams) - description = u'{{%s\n' % template + description = '{{%s\n' % template for key in sorted(params.keys()): value = params[key] - if not key.startswith("_"): - description = description + ( - u'|%s=%s' % (key, self._safeTemplateValue(value))) + "\n" - description = description + u'}}' + if not key.startswith('_'): + description += ('|{}={}\n'.format( + key, self._safeTemplateValue(value))) + description += '}}' return description def _safeTemplateValue(self, value): """Replace pipe (|) with {{!}}.""" - return value.replace("|", "{{!}}") + return value.replace('|', '{{!}}') def CSVReader(fileobj, urlcolumn, site=None, *args, **kwargs): @@ -188,7 +188,8 @@ """Process each page.""" duplicates = photo.findDuplicateImages() if duplicates: - pywikibot.output(u"Skipping duplicate of %r" % duplicates) + pywikibot.output('Skipping duplicate of {!r}' + .format(duplicates)) return duplicates[0] title = photo.getTitle(self.titlefmt) @@ -221,15 +222,15 @@ """ configuration = {} # Set a bunch of defaults - configuration['csvDialect'] = u'excel' + configuration['csvDialect'] = 'excel' configuration['csvDelimiter'] = ';' - configuration['csvEncoding'] = u'Windows-1252' # FIXME: Encoding hell + configuration['csvEncoding'] = 'Windows-1252' # FIXME: Encoding hell templates = configurationPage.templatesWithParams() for (template, params) in templates: if template.title(with_ns=False) == 'Data ingestion': for param in params: - (field, sep, value) = param.partition(u'=') + (field, sep, value) = param.partition('=') # Remove leading or trailing spaces field = field.strip() @@ -273,7 +274,7 @@ try: config_page.get() except pywikibot.NoPage: - pywikibot.error('%s does not exist' % config_page) + pywikibot.error('{} does not exist'.format(config_page)) continue configuration = DataIngestionBot.parseConfigurationPage(config_page) @@ -282,7 +283,7 @@ try: f = codecs.open(filename, 'r', configuration['csvEncoding']) except (IOError, OSError) as e: - pywikibot.error('%s could not be opened: %s' % (filename, e)) + pywikibot.error('{} could not be opened: {}'.format(filename, e)) else: with f: files = CSVReader(f, urlcolumn='url', @@ -297,5 +298,5 @@ bot.run() -if __name__ == "__main__": +if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/462734 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: Id429548672099389a2e2f3636c7f8c1ca567053b Gerrit-Change-Number: 462734 Gerrit-PatchSet: 4 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

5 years, 7 months

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/cosmetic_changes.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462745 ) Change subject: [cleanup] cleanup scripts/cosmetic_changes.py ...................................................................... [cleanup] cleanup scripts/cosmetic_changes.py - remove preleading "u" from strings - use single quotes for string literals Change-Id: Ie822d39a39b0dc142df20c5ba119b0c5bdfff2d1 --- M scripts/cosmetic_changes.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/cosmetic_changes.py b/scripts/cosmetic_changes.py index 80fe07c..e938806 100644 --- a/scripts/cosmetic_changes.py +++ b/scripts/cosmetic_changes.py @@ -59,7 +59,7 @@ """Initializer.""" self.availableOptions.update({ 'async': False, - 'summary': u'Robot: Cosmetic changes', + 'summary': 'Robot: Cosmetic changes', 'ignore': cosmetic_changes.CANCEL_ALL, }) super(CosmeticChangesBot, self).__init__(**kwargs) @@ -134,5 +134,5 @@ return False -if __name__ == "__main__": +if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/462745 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: Ie822d39a39b0dc142df20c5ba119b0c5bdfff2d1 Gerrit-Change-Number: 462745 Gerrit-PatchSet: 1 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

5 years, 7 months

[Gerrit] pywikibot/core[master]: [cleanup] cleanup scripts/create_categories.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462736 ) Change subject: [cleanup] cleanup scripts/create_categories.py ...................................................................... [cleanup] cleanup scripts/create_categories.py - use str.format(...) instead of modulo for type specifier arguments. - use single quotes for string literals - remove preleading "u" from strings Change-Id: Icaaef4eef6d09556eba7514591a344e0258825fa --- M scripts/create_categories.py 1 file changed, 7 insertions(+), 6 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/create_categories.py b/scripts/create_categories.py index 3f0e651..1755a72 100755 --- a/scripts/create_categories.py +++ b/scripts/create_categories.py @@ -53,16 +53,16 @@ self.generator = generator self.parent = parent self.basename = basename - self.comment = u'Creating new category' + self.comment = 'Creating new category' def treat(self, page): """Create category in commons for that page.""" title = page.title(with_ns=False) newpage = pywikibot.Category(pywikibot.Site('commons', 'commons'), - '%s %s' % (self.basename, title)) - newtext = (u'[[Category:%(parent)s|%(title)s]]\n' - u'[[Category:%(title)s]]\n' + '{} {}'.format(self.basename, title)) + newtext = ('[[Category:%(parent)s|%(title)s]]\n' + '[[Category:%(title)s]]\n' % {'parent': self.parent, 'title': title}) if not newpage.exists(): @@ -72,7 +72,8 @@ ignore_server_errors=True) else: # FIXME: Add overwrite option - pywikibot.output(u'%s already exists, skipping' % newpage.title()) + pywikibot.output('{} already exists, skipping' + .format(newpage.title())) def main(*args): @@ -120,5 +121,5 @@ return False -if __name__ == "__main__": +if __name__ == '__main__': main() -- To view, visit https://gerrit.wikimedia.org/r/462736 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: Icaaef4eef6d09556eba7514591a344e0258825fa Gerrit-Change-Number: 462736 Gerrit-PatchSet: 1 Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

5 years, 7 months

← Newer
1
2
3
4
5
6
7
8
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits September 2018