Pywikibot-commits March 2018

pywikibot-commits@lists.wikimedia.org

1 participants
60 discussions

[Gerrit] pywikibot/core[master]: Fix tests.edit_failure_tests.TestWikibaseSaveTest
by jenkins-bot (Code Review) 30 Mar '18

30 Mar '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/422208 ) Change subject: Fix tests.edit_failure_tests.TestWikibaseSaveTest ...................................................................... Fix tests.edit_failure_tests.TestWikibaseSaveTest Bug: T190864 Change-Id: Iab28a36e1edf6a5a6ed8902bba36df29267b3b0e --- M tests/edit_failure_tests.py 1 file changed, 26 insertions(+), 14 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/edit_failure_tests.py b/tests/edit_failure_tests.py index 68bda27..b5df2ab 100644 --- a/tests/edit_failure_tests.py +++ b/tests/edit_failure_tests.py @@ -8,7 +8,7 @@ These tests use special code 'write = -1' for edit failures. """ # -# (C) Pywikibot team, 2014 +# (C) Pywikibot team, 2014-2018 # # Distributed under the terms of the MIT license. # @@ -147,18 +147,22 @@ item = pywikibot.ItemPage(repo, 'Q68') claim = self._make_WbMonolingualText_claim(repo, text='Test this!', language='foo') - self.assertAPIError('modification-failed', 'Illegal value: foo', - item.addClaim, claim) + self.assertRaisesRegex( + OtherPageSaveError, + r'Edit to page \[\[wikidata:test:Q68]] failed:\n' + r'modification-failed: "foo" is not a known language code.', + item.addClaim, claim) def test_WbMonolingualText_invalid_text(self): """Attempt adding a monolingual text with an invalid non-string text.""" repo = self.get_repo() item = pywikibot.ItemPage(repo, 'Q68') claim = self._make_WbMonolingualText_claim(repo, text=123456, language='en') - self.assertAPIError('invalid-snak', - 'Invalid snak. (Can only construct a ' - 'MonolingualTextValue with a string value.)', - item.addClaim, claim) + self.assertRaisesRegex( + OtherPageSaveError, + r'Edit to page \[\[wikidata:test:Q68]] failed:\n' + r'invalid-snak: Invalid snak data.', + item.addClaim, claim) def test_math_invalid_function(self): """Attempt adding invalid latex to a math claim.""" @@ -166,7 +170,11 @@ item = pywikibot.ItemPage(repo, 'Q68') claim = pywikibot.page.Claim(repo, 'P717', datatype='math') claim.setTarget('\foo') - self.assertAPIError('modification-failed', None, item.addClaim, claim) + self.assertRaisesRegex( + OtherPageSaveError, + r'Edit to page \[\[wikidata:test:Q68]] failed:\n' + r'modification-failed: Malformed input: �oo', + item.addClaim, claim) def test_url_malformed_url(self): """Attempt adding a malformed URL to a url claim.""" @@ -174,9 +182,11 @@ item = pywikibot.ItemPage(repo, 'Q68') claim = pywikibot.page.Claim(repo, 'P506', datatype='url') claim.setTarget('Not a URL at all') - self.assertAPIError('modification-failed', - 'Malformed URL: Not a URL at all', - item.addClaim, claim) + self.assertRaisesRegex( + OtherPageSaveError, + r'Edit to page \[\[wikidata:test:Q68]] failed:\n' + r'modification-failed: This URL misses a scheme like "https://": ' + r'Not a URL at all', item.addClaim, claim) def test_url_invalid_protocol(self): """Attempt adding a URL with an invalid protocol to a url claim.""" @@ -184,9 +194,11 @@ item = pywikibot.ItemPage(repo, 'Q68') claim = pywikibot.page.Claim(repo, 'P506', datatype='url') claim.setTarget('wtf://wikiba.se') - self.assertAPIError('modification-failed', - 'Unsupported URL scheme: wtf', - item.addClaim, claim) + self.assertRaisesRegex( + OtherPageSaveError, + r'Edit to page \[\[wikidata:test:Q68]] failed:\n' + r'modification-failed: An URL scheme "wtf" is not supported.', + item.addClaim, claim) if __name__ == '__main__': # pragma: no cover -- To view, visit https://gerrit.wikimedia.org/r/422208 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iab28a36e1edf6a5a6ed8902bba36df29267b3b0e Gerrit-Change-Number: 422208 Gerrit-PatchSet: 3 Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: [TEST] add testImageAndDataRepository
by jenkins-bot (Code Review) 27 Mar '18

27 Mar '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/421718 ) Change subject: [TEST] add testImageAndDataRepository ...................................................................... [TEST] add testImageAndDataRepository Test image_repository and data_repository page attributes. Change-Id: I72e9eea0ab88045057ab8d1759ad8e43f33caee2 --- M tests/page_tests.py 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/page_tests.py b/tests/page_tests.py index b404028..8b90fdf 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -264,6 +264,19 @@ withNamespace=False, insite=site), u"[[:File:Jean-Léon Gérôme 003.jpg|Jean-Léon Gérôme 003.jpg]]") + def testImageAndDataRepository(self): + """Test image_repository and data_repository page attributes.""" + site = self.get_site() + p1 = pywikibot.Page(site, 'Help:Test page#Testing') + self.assertIsInstance(p1.image_repository, pywikibot.site.APISite) + self.assertEqual(p1.image_repository, + pywikibot.site.APISite('commons', 'commons')) + + p2 = pywikibot.Page(site, 'File:Jean-Léon Gérôme 003.jpg') + self.assertIsInstance(p2.data_repository, pywikibot.site.APISite) + self.assertEqual(p2.data_repository, + pywikibot.site.APISite('wikidata', 'wikidata')) + def test_creation(self): """Test Page.oldest_revision.""" mainpage = self.get_mainpage() -- To view, visit https://gerrit.wikimedia.org/r/421718 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I72e9eea0ab88045057ab8d1759ad8e43f33caee2 Gerrit-Change-Number: 421718 Gerrit-PatchSet: 3 Gerrit-Owner: 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 <>

1 0

[Gerrit] pywikibot/core[master]: Make sure interwiki title is parsed in textlib.getLanguageLinks
by jenkins-bot (Code Review) 27 Mar '18

27 Mar '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/421701 ) Change subject: Make sure interwiki title is parsed in textlib.getLanguageLinks ...................................................................... Make sure interwiki title is parsed in textlib.getLanguageLinks The try-except block was redundant because InvalidTitle is raised when the title is parsed, not just constructed. Change-Id: I34b0265acae52ad5bb9e5e38cf2f84d92bb2bdf5 --- M pywikibot/textlib.py M tests/textlib_tests.py 2 files changed, 15 insertions(+), 9 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 2be1ea8..7a40a55 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -861,17 +861,18 @@ # skip language links to its own site if site == insite: continue + previous_key_count = len(result) + page = pywikibot.Page(site, pagetitle) try: - previous_key_count = len(result) - result[site] = pywikibot.Page(site, pagetitle) - if previous_key_count == len(result): - pywikibot.warning('[getLanguageLinks] 2 or more interwiki ' - 'links point to site %s.' % site) + result[page.site] = page # need to trigger page._link.parse() except InvalidTitle: - pywikibot.output(u'[getLanguageLinks] Text contains invalid ' - u'interwiki link [[%s:%s]].' + pywikibot.output('[getLanguageLinks] Text contains invalid ' + 'interwiki link [[%s:%s]].' % (lang, pagetitle)) continue + if previous_key_count == len(result): + pywikibot.warning('[getLanguageLinks] 2 or more interwiki ' + 'links point to site %s.' % site) return result diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index 45e09ef..ca49ada 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -1472,7 +1472,8 @@ }, } - example_text = '[[en:Site]] [[de:Site|Piped]] [[commons:Site]] [[baden:Site]]' + example_text = ('[[en:Site]] [[de:Site|Piped]] [[commons:Site]] ' + '[[baden:Site]] [[fr:{{PAGENAME}}]]') @classmethod def setUpClass(cls): @@ -1482,7 +1483,11 @@ def test_getLanguageLinks(self, key): """Test if the function returns the correct titles and sites.""" - lang_links = textlib.getLanguageLinks(self.example_text, self.site) + with mock.patch('pywikibot.output') as m: + lang_links = textlib.getLanguageLinks(self.example_text, self.site) + m.assert_called_once_with( + '[getLanguageLinks] Text contains invalid interwiki link ' + '[[fr:{{PAGENAME}}]].') self.assertEqual(set(page.title() for page in lang_links.values()), set(['Site'])) self.assertEqual(set(lang_links), self.sites_set - set([self.site])) -- To view, visit https://gerrit.wikimedia.org/r/421701 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I34b0265acae52ad5bb9e5e38cf2f84d92bb2bdf5 Gerrit-Change-Number: 421701 Gerrit-PatchSet: 3 Gerrit-Owner: Matěj Suchánek <matejsuchanek97(a)gmail.com> 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: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: Make sure entites are preloaded on a DataSite
by jenkins-bot (Code Review) 27 Mar '18

27 Mar '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/421539 ) Change subject: Make sure entites are preloaded on a DataSite ...................................................................... Make sure entites are preloaded on a DataSite This resulted in AttributeError. Change-Id: Iab08428441c35d8b762a55e89e8b182f3a47245e --- M pywikibot/pagegenerators.py M tests/pagegenerators_tests.py M tests/wikibase_tests.py 3 files changed, 30 insertions(+), 11 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 55a5c1b..aeddfe5 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -2081,6 +2081,7 @@ Function basically is copied from above, but for Wikibase entities. @param generator: pages to iterate over + @type generator: Iterable @param groupsize: how many pages to preload at once @type groupsize: int """ @@ -2091,11 +2092,13 @@ if len(sites[site]) >= groupsize: # if this site is at the groupsize, process it group = sites.pop(site) - for i in site.preload_entities(group, groupsize): + repo = site.data_repository() + for i in repo.preload_entities(group, groupsize): yield i for site, pages in sites.items(): # process any leftover sites that never reached the groupsize - for i in site.preload_entities(pages, groupsize): + repo = site.data_repository() + for i in repo.preload_entities(pages, groupsize): yield i diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index 43ca6ce..d8d5a0c 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -600,16 +600,16 @@ self.assertTrue(pages_out[1].isTalkPage()) -class TestPreloadingItemGenerator(WikidataTestCase): +class TestPreloadingEntityGenerator(WikidataTestCase): """Test preloading item generator.""" def test_non_item_gen(self): - """Test TestPreloadingItemGenerator with ReferringPageGenerator.""" + """Test TestPreloadingEntityGenerator with ReferringPageGenerator.""" site = self.get_site() instance_of_page = pywikibot.Page(site, 'Property:P31') ref_gen = pagegenerators.ReferringPageGenerator(instance_of_page, total=5) - gen = pagegenerators.PreloadingItemGenerator(ref_gen) + gen = pagegenerators.PreloadingEntityGenerator(ref_gen) self.assertTrue(all(isinstance(item, pywikibot.ItemPage) for item in gen)) diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index f6bb342..2fc7fee 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -1647,19 +1647,35 @@ self.assertEqual(response, self.data_out) -class TestPreloadingItemGenerator(TestCase): +class TestPreloadingEntityGenerator(TestCase): """Test preloading item generator.""" - family = 'wikidata' - code = 'wikidata' + sites = { + 'wikidata': { + 'family': 'wikidata', + 'code': 'wikidata', + }, + 'enwiki': { + 'family': 'wikipedia', + 'code': 'en', + } + } def test_non_item_gen(self): - """Test TestPreloadingItemGenerator with ReferringPageGenerator.""" - site = self.get_site() + """Test PreloadingEntityGenerator with ReferringPageGenerator.""" + site = self.get_site('wikidata') instance_of_page = pywikibot.Page(site, 'Property:P31') ref_gen = pagegenerators.ReferringPageGenerator(instance_of_page, total=5) - gen = pagegenerators.PreloadingItemGenerator(ref_gen) + gen = pagegenerators.PreloadingEntityGenerator(ref_gen) + self.assertTrue(all(isinstance(item, ItemPage) for item in gen)) + + def test_foreign_page_item_gen(self): + """Test PreloadingEntityGenerator with connected pages.""" + site = self.get_site('enwiki') + page_gen = [pywikibot.Page(site, 'Main Page'), + pywikibot.Page(site, 'New York City')] + gen = pagegenerators.PreloadingEntityGenerator(page_gen) self.assertTrue(all(isinstance(item, ItemPage) for item in gen)) -- To view, visit https://gerrit.wikimedia.org/r/421539 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iab08428441c35d8b762a55e89e8b182f3a47245e Gerrit-Change-Number: 421539 Gerrit-PatchSet: 4 Gerrit-Owner: Matěj Suchánek <matejsuchanek97(a)gmail.com> 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: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: threadedhttp.py: Deprecate HttpRequest.content in favour of text
by jenkins-bot (Code Review) 26 Mar '18

26 Mar '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/421282 ) Change subject: threadedhttp.py: Deprecate HttpRequest.content in favour of text ...................................................................... threadedhttp.py: Deprecate HttpRequest.content in favour of text Bug: T173352 Change-Id: I2769f207fd297969c2de38996a6c741fd9f597a0 --- M pywikibot/comms/http.py M pywikibot/comms/threadedhttp.py M pywikibot/data/sparql.py M pywikibot/pagegenerators.py M pywikibot/proofreadpage.py M pywikibot/site_detect.py M pywikibot/version.py M pywikibot/weblib.py M scripts/flickrripper.py M scripts/imagerecat.py M scripts/reflinks.py M tests/http_tests.py M tests/sparql_tests.py M tests/weblib_tests.py 14 files changed, 55 insertions(+), 46 deletions(-) Approvals: Mpaa: Looks good to me, but someone else must approve Framawiki: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index 76878ae..d98ab8a 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -14,7 +14,7 @@ from __future__ import absolute_import, print_function, unicode_literals # -# (C) Pywikibot team, 2007-2017 +# (C) Pywikibot team, 2007-2018 # # Distributed under the terms of the MIT license. # @@ -303,7 +303,7 @@ issue_deprecation_warning( 'Invoking http.request without argument site', 'http.fetch()', 3) r = fetch(uri, method, params, body, headers, **kwargs) - return r.content + return r.text baseuri = site.base_url(uri) @@ -319,7 +319,7 @@ headers['user-agent'] = user_agent(site, format_string) r = fetch(baseuri, method, params, body, headers, **kwargs) - return r.content + return r.text def get_authentication(uri): diff --git a/pywikibot/comms/threadedhttp.py b/pywikibot/comms/threadedhttp.py index 835fa50..4eadb57 100644 --- a/pywikibot/comms/threadedhttp.py +++ b/pywikibot/comms/threadedhttp.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals # -# (C) Pywikibot team, 2007-2017 +# (C) Pywikibot team, 2007-2018 # # Distributed under the terms of the MIT license. # @@ -22,7 +22,7 @@ import pywikibot -from pywikibot.tools import UnicodeMixin +from pywikibot.tools import deprecated, UnicodeMixin _logger = "comm.threadedhttp" @@ -189,13 +189,19 @@ return self.raw.decode(encoding, errors) @property + @deprecated('the `text` property') def content(self): + """DEPRECATED. Return the response decoded by the detected encoding.""" + return self.text + + @property + def text(self): """Return the response decoded by the detected encoding.""" return self.decode(self.encoding) def __unicode__(self): """Return the response decoded by the detected encoding.""" - return self.content + return self.text def __bytes__(self): """Return the undecoded response.""" diff --git a/pywikibot/data/sparql.py b/pywikibot/data/sparql.py index 392f8a8..13ec4ca 100644 --- a/pywikibot/data/sparql.py +++ b/pywikibot/data/sparql.py @@ -144,10 +144,10 @@ while True: try: self.last_response = http.fetch(url, headers=headers) - if not self.last_response.content: + if not self.last_response.text: return None try: - return json.loads(self.last_response.content) + return json.loads(self.last_response.text) except ValueError: return None except Timeout: diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 55a5c1b..0392e0f 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -2961,7 +2961,7 @@ if 500 <= req.status < 600: raise ServerError( 'received {0} status from {1}'.format(req.status, req.uri)) - j = json.loads(req.content) + j = json.loads(req.text) raw_pages = j['*'][0]['a']['*'] for raw_page in raw_pages: yield raw_page diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py index 5b36e5b..44059f4 100644 --- a/pywikibot/proofreadpage.py +++ b/pywikibot/proofreadpage.py @@ -18,7 +18,7 @@ """ # -# (C) Pywikibot team, 2015-2017 +# (C) Pywikibot team, 2015-2018 # # Distributed under the terms of the MIT license. # @@ -527,7 +527,7 @@ pywikibot.error('Error fetching HTML for %s.' % self) raise - soup = Soup(response.content) + soup = Soup(response.text) try: self._url_image = soup.find(class_='prp-page-image') @@ -566,7 +566,7 @@ pywikibot.error('Querying %s: %s' % (cmd_uri, e)) return (True, e) - data = json.loads(response.content) + data = json.loads(response.text) assert 'error' in data, 'Error from phe-tools: %s' % data assert data['error'] in [0, 1], 'Error from phe-tools: %s' % data diff --git a/pywikibot/site_detect.py b/pywikibot/site_detect.py index 1d82dea..a9dea68 100644 --- a/pywikibot/site_detect.py +++ b/pywikibot/site_detect.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Classes for detecting a MediaWiki site.""" # -# (C) Pywikibot team, 2010-2015 +# (C) Pywikibot team, 2010-2018 # # Distributed under the terms of the MIT license. # @@ -63,7 +63,7 @@ self.fromurl = fromurl - data = r.content + data = r.text wp = WikiHTMLPageParser(fromurl) wp.feed(data) @@ -118,7 +118,7 @@ response = fetch( self.api + "?action=query&meta=siteinfo&siprop=interwikimap&sifilteriw=local&format=json") - iw = json.loads(response.content) + iw = json.loads(response.text) if 'error' in iw: raise RuntimeError('%s - %s' % (iw['error']['code'], iw['error']['info'])) @@ -146,7 +146,7 @@ """Extract the version from API help with ?version enabled.""" if self.version is None: try: - d = fetch(self.api + '?version&format=json').content + d = fetch(self.api + '?version&format=json').text try: d = json.loads(d) except ValueError: @@ -167,7 +167,7 @@ response = fetch(self.api + '?action=query&meta=siteinfo&format=json') check_response(response) # remove preleading newlines and Byte Order Mark (BOM), see T128992 - content = response.content.strip().lstrip('\uFEFF') + content = response.text.strip().lstrip('\uFEFF') info = json.loads(content) self.private_wiki = ('error' in info and info['error']['code'] == 'readapidenied') @@ -306,5 +306,5 @@ raise ServerError('Bad Gateway') elif response.status == 500: raise ServerError('Internal Server Error') - elif response.status == 200 and SERVER_DB_ERROR_MSG in response.content: + elif response.status == 200 and SERVER_DB_ERROR_MSG in response.text: raise ServerError('Server cannot access the database') diff --git a/pywikibot/version.py b/pywikibot/version.py index e671c90..77f4c34 100644 --- a/pywikibot/version.py +++ b/pywikibot/version.py @@ -383,7 +383,7 @@ url = 'https://gerrit.wikimedia.org/r/projects/pywikibot%2Fcore/branches/master' # Gerrit API responses include )]}' at the beginning, make sure to strip it out buf = http.fetch(uri=url, - headers={'user-agent': '{pwb}'}).content[4:] + headers={'user-agent': '{pwb}'}).text[4:] try: hsh = json.loads(buf)['revision'] diff --git a/pywikibot/weblib.py b/pywikibot/weblib.py index 3cf13c6..87494fa 100644 --- a/pywikibot/weblib.py +++ b/pywikibot/weblib.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Functions for manipulating external links or querying third-party sites.""" # -# (C) Pywikibot team, 2013 +# (C) Pywikibot team, 2013-2018 # # Distributed under the terms of the MIT license. # @@ -48,7 +48,7 @@ retry_count = 0 while retry_count <= config2.max_retries: try: - jsontext = http.fetch(uri).content + jsontext = http.fetch(uri).text break except RequestsConnectionError as e: error = e @@ -85,7 +85,7 @@ query['date'] = timestamp uri = uri + urlencode(query) - xmltext = http.fetch(uri).content + xmltext = http.fetch(uri).text if "success" in xmltext: data = ET.fromstring(xmltext) return data.find('.//webcite_url').text diff --git a/scripts/flickrripper.py b/scripts/flickrripper.py index b03604d..3ef2fb2 100755 --- a/scripts/flickrripper.py +++ b/scripts/flickrripper.py @@ -168,7 +168,7 @@ parameters = urlencode({'id': photo_id, 'raw': 'on'}) return fetch( - 'http://wikipedia.ramselehof.de/flinfo.php?%s' % parameters).content + 'http://wikipedia.ramselehof.de/flinfo.php?%s' % parameters).text def getFilename(photoInfo, site=None, project=u'Flickr'): diff --git a/scripts/imagerecat.py b/scripts/imagerecat.py index ea4c5d2..884da46 100755 --- a/scripts/imagerecat.py +++ b/scripts/imagerecat.py @@ -166,7 +166,7 @@ commonsHelperPage = fetch( "https://toolserver.org/~daniel/WikiSense/CommonSense.php?%s" % parameters) matches = commonsenseRe.search( - commonsHelperPage.content) + commonsHelperPage.text) gotInfo = True else: break @@ -229,7 +229,7 @@ while not gotInfo: try: page = fetch('https://nominatim.openstreetmap.org/reverse?format=xml&%s' % parameters) - et = xml.etree.ElementTree.fromstring(page.content) + et = xml.etree.ElementTree.fromstring(page.text) gotInfo = True except IOError: pywikibot.output(u'Got an IOError, let\'s try again') diff --git a/scripts/reflinks.py b/scripts/reflinks.py index b4356bc..d713f9f 100755 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -462,7 +462,7 @@ pywikibot.output(u'PDF file.') fd, infile = tempfile.mkstemp() urlobj = os.fdopen(fd, 'w+') - urlobj.write(f.content) + urlobj.write(f.text) try: pdfinfo_out = subprocess.Popen([r"pdfinfo", "/dev/stdin"], diff --git a/tests/http_tests.py b/tests/http_tests.py index f0829a7..e348f5a 100644 --- a/tests/http_tests.py +++ b/tests/http_tests.py @@ -48,8 +48,8 @@ r = http._enqueue('http://www.wikipedia.org/') self.assertIsInstance(r, threadedhttp.HttpRequest) self.assertEqual(r.status, 200) - self.assertIn('<html lang="mul"', r.content) - self.assertIsInstance(r.content, unicode) + self.assertIn('<html lang="mul"', r.text) + self.assertIsInstance(r.text, unicode) self.assertIsInstance(r.raw, bytes) def test_fetch(self): @@ -57,8 +57,10 @@ r = http.fetch('http://www.wikipedia.org/') self.assertIsInstance(r, threadedhttp.HttpRequest) self.assertEqual(r.status, 200) - self.assertIn('<html lang="mul"', r.content) - self.assertIsInstance(r.content, unicode) + self.assertIn('<html lang="mul"', r.text) + self.assertIsInstance(r.text, unicode) + with suppress_warnings(r'.*HttpRequest\.content is deprecated'): + self.assertEqual(r.content, r.text) self.assertIsInstance(r.raw, bytes) @@ -150,7 +152,7 @@ response = http.fetch( uri='https://testssl-expire-r2i2.disig.sk/index.en.html', disable_ssl_certificate_validation=True) - r = response.content + r = response.text self.assertIsInstance(r, unicode) self.assertTrue(re.search(r'<title>.*</title>', r)) http.session.close() # clear the connection @@ -454,7 +456,7 @@ self.assertIsNone(req.charset) self.assertEqual('latin1', req.encoding) self.assertEqual(req.raw, CharsetTestCase.LATIN1_BYTES) - self.assertEqual(req.content, CharsetTestCase.STR) + self.assertEqual(req.text, CharsetTestCase.STR) def test_no_charset(self): """Test decoding without explicit charset.""" @@ -466,7 +468,7 @@ self.assertIsNone(req.charset) self.assertEqual('latin1', req.encoding) self.assertEqual(req.raw, CharsetTestCase.LATIN1_BYTES) - self.assertEqual(req.content, CharsetTestCase.STR) + self.assertEqual(req.text, CharsetTestCase.STR) def test_content_type_application_json_without_charset(self): """Test decoding without explicit charset but JSON content.""" @@ -537,7 +539,7 @@ self.assertIsNone(req.charset) self.assertEqual('utf-8', req.encoding) self.assertEqual(req.raw, CharsetTestCase.UTF8_BYTES) - self.assertEqual(req.content, CharsetTestCase.STR) + self.assertEqual(req.text, CharsetTestCase.STR) def test_same_charset(self): """Test decoding with explicit and equal charsets.""" @@ -545,7 +547,7 @@ self.assertEqual('utf-8', req.charset) self.assertEqual('utf-8', req.encoding) self.assertEqual(req.raw, CharsetTestCase.UTF8_BYTES) - self.assertEqual(req.content, CharsetTestCase.STR) + self.assertEqual(req.text, CharsetTestCase.STR) def test_header_charset(self): """Test decoding with different charsets and valid header charset.""" @@ -555,7 +557,7 @@ with patch('pywikibot.warning'): self.assertEqual('utf-8', req.encoding) self.assertEqual(req.raw, CharsetTestCase.UTF8_BYTES) - self.assertEqual(req.content, CharsetTestCase.STR) + self.assertEqual(req.text, CharsetTestCase.STR) def test_code_charset(self): """Test decoding with different charsets and invalid header charset.""" @@ -566,7 +568,7 @@ with patch('pywikibot.warning'): self.assertEqual('latin1', req.encoding) self.assertEqual(req.raw, CharsetTestCase.LATIN1_BYTES) - self.assertEqual(req.content, CharsetTestCase.STR) + self.assertEqual(req.text, CharsetTestCase.STR) def test_invalid_charset(self): """Test decoding with different and invalid charsets.""" @@ -579,7 +581,8 @@ UnicodeDecodeError, self.CODEC_CANT_DECODE_RE, lambda: req.encoding) self.assertEqual(req.raw, CharsetTestCase.LATIN1_BYTES) - self.assertRaisesRegex(UnicodeDecodeError, self.CODEC_CANT_DECODE_RE, lambda: req.content) + self.assertRaisesRegex( + UnicodeDecodeError, self.CODEC_CANT_DECODE_RE, lambda: req.text) class BinaryTestCase(TestCase): @@ -645,7 +648,7 @@ r = http.fetch(uri=self.get_httpbin_url('/get'), params={}) self.assertEqual(r.status, 200) - content = json.loads(r.content) + content = json.loads(r.text) self.assertDictEqual(content['args'], {}) def test_unencoded_params(self): @@ -658,7 +661,7 @@ r = http.fetch(uri=self.get_httpbin_url('/get'), params={'fish&chips': 'delicious'}) self.assertEqual(r.status, 200) - content = json.loads(r.content) + content = json.loads(r.text) self.assertDictEqual(content['args'], {'fish&chips': 'delicious'}) def test_encoded_params(self): @@ -672,7 +675,7 @@ params={'fish%26chips': 'delicious'}) self.assertEqual(r.status, 200) - content = json.loads(r.content) + content = json.loads(r.text) self.assertDictEqual(content['args'], {'fish%26chips': 'delicious'}) @@ -686,8 +689,8 @@ r_body = http.fetch(uri=self.get_httpbin_url('/post'), method='POST', body={'fish&chips': 'delicious'}) - self.assertDictEqual(json.loads(r_data.content), - json.loads(r_body.content)) + self.assertDictEqual(json.loads(r_data.text), + json.loads(r_body.text)) if __name__ == '__main__': # pragma: no cover diff --git a/tests/sparql_tests.py b/tests/sparql_tests.py index 933de95..838e567 100644 --- a/tests/sparql_tests.py +++ b/tests/sparql_tests.py @@ -87,7 +87,7 @@ def __init__(self, value): """Create container.""" - self.content = value + self.text = value class TestSparql(WikidataTestCase): diff --git a/tests/weblib_tests.py b/tests/weblib_tests.py index e4b5414..fe4982a 100644 --- a/tests/weblib_tests.py +++ b/tests/weblib_tests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Weblib test module.""" # -# (C) Pywikibot team, 2014-2015 +# (C) Pywikibot team, 2014-2018 # # Distributed under the terms of the MIT license. # @@ -35,7 +35,7 @@ def _test_response(self, response, *args, **kwargs): # for later tests this is must be present, and it'll tell us the # original content if that does not match - self.assertIn('closest', response.content) + self.assertIn('closest', response.text) def _get_archive_url(self, url, date_string=None): with PatchedHttp(weblib, False) as p: -- To view, visit https://gerrit.wikimedia.org/r/421282 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2769f207fd297969c2de38996a6c741fd9f597a0 Gerrit-Change-Number: 421282 Gerrit-PatchSet: 1 Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> 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: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: Update families files
by jenkins-bot (Code Review) 25 Mar '18

25 Mar '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/421788 ) Change subject: Update families files ...................................................................... Update families files Change-Id: I253985e215a42cb407db6f1a9f9397d65c0bafe2 --- M pywikibot/families/wikibooks_family.py M pywikibot/families/wikipedia_family.py M pywikibot/families/wiktionary_family.py 3 files changed, 17 insertions(+), 17 deletions(-) Approvals: Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikibooks_family.py b/pywikibot/families/wikibooks_family.py index ab899c4..dffaf7b 100644 --- a/pywikibot/families/wikibooks_family.py +++ b/pywikibot/families/wikibooks_family.py @@ -40,7 +40,7 @@ 'gl', 'sv', 'sr', 'ko', 'cs', 'hr', 'ba', 'no', 'tr', 'ar', 'ta', 'sa', 'sk', 'uk', 'hi', 'is', 'ro', 'eo', 'si', 'mk', 'bn', 'bg', 'ka', 'ms', 'lt', 'tt', 'li', 'el', 'ur', 'sl', 'km', 'tl', 'kk', - 'et', 'ml', 'oc', 'be', 'ia', 'eu', 'ne', 'pa', 'hy', 'la', 'cv', + 'et', 'ml', 'oc', 'be', 'ia', 'ne', 'eu', 'pa', 'hy', 'la', 'cv', 'tg', 'fy', 'ku', 'bs', 'te', 'af', 'cy', 'mr', 'mg', 'ky', ] diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index d094215..fd61fce 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -36,30 +36,30 @@ 'fi', 'hu', 'id', 'ko', 'cs', 'ro', 'ms', 'tr', 'eu', 'eo', 'bg', 'hy', 'da', 'zh-min-nan', 'sk', 'min', 'he', 'kk', 'lt', 'hr', 'et', 'ce', 'sl', 'be', 'gl', 'el', 'ur', 'nn', 'az', 'simple', - 'uz', 'la', 'hi', 'th', 'ka', 'vo', 'ta', 'cy', 'tg', 'mk', 'tl', - 'mg', 'oc', 'lv', 'ky', 'bs', 'tt', 'sq', 'new', 'azb', 'ast', + 'uz', 'la', 'hi', 'th', 'ka', 'vo', 'ta', 'cy', 'mk', 'tg', 'tl', + 'mg', 'oc', 'lv', 'ky', 'tt', 'bs', 'ast', 'sq', 'new', 'azb', 'te', 'zh-yue', 'pms', 'br', 'be-tarask', 'bn', 'ml', 'jv', 'ht', 'lb', 'mr', 'sco', 'af', 'ga', 'pnb', 'is', 'ba', 'cv', 'sw', 'fy', 'su', 'my', 'lmo', 'an', 'yo', 'ne', 'nds', 'pa', 'gu', 'io', 'scn', 'bar', 'bpy', 'als', 'ku', 'kn', 'ckb', 'ia', 'qu', 'arz', - 'mn', 'bat-smg', 'gd', 'si', 'wa', 'nap', 'yi', 'am', 'bug', 'cdo', - 'or', 'map-bms', 'fo', 'mzn', 'hsb', 'mai', 'xmf', 'li', 'sah', + 'mn', 'bat-smg', 'gd', 'si', 'wa', 'nap', 'yi', 'am', 'bug', 'or', + 'cdo', 'map-bms', 'fo', 'mzn', 'hsb', 'mai', 'xmf', 'li', 'sah', 'sa', 'vec', 'ilo', 'os', 'mrj', 'mhr', 'hif', 'eml', 'bh', - 'roa-tara', 'ps', 'sd', 'diq', 'pam', 'hak', 'nso', 'wuu', + 'roa-tara', 'sd', 'ps', 'diq', 'pam', 'hak', 'nso', 'wuu', 'zh-classical', 'bcl', 'se', 'ace', 'mi', 'nah', 'szl', 'nds-nl', 'frr', 'rue', 'gan', 'vls', 'km', 'bo', 'crh', 'vep', 'sc', 'glk', 'co', 'fiu-vro', 'lrc', 'tk', 'kv', 'csb', 'myv', 'gv', 'as', 'lad', 'so', 'nv', 'zea', 'udm', 'ay', 'lez', 'stq', 'ie', 'kw', 'nrm', 'pcd', 'mwl', 'ug', 'gom', 'rm', 'gn', 'koi', 'ab', 'lij', - 'mt', 'sn', 'fur', 'dsb', 'dv', 'ang', 'ln', 'ext', 'kab', + 'mt', 'sn', 'fur', 'dsb', 'dv', 'ang', 'ln', 'kab', 'ext', 'cbk-zam', 'frp', 'dty', 'ksh', 'lo', 'gag', 'olo', 'pag', 'pi', 'av', 'bxr', 'pfl', 'haw', 'xal', 'krc', 'pap', 'kaa', 'rw', 'pdc', 'bjn', 'ha', 'to', 'nov', 'kl', 'arc', 'jam', 'kbd', 'tyv', 'tpi', - 'tet', 'kbp', 'ki', 'na', 'ig', 'bi', 'roa-rup', 'lbe', 'jbo', + 'tet', 'kbp', 'ki', 'na', 'ig', 'bi', 'jbo', 'roa-rup', 'lbe', 'ty', 'mdf', 'za', 'kg', 'wo', 'lg', 'srn', 'tcy', 'zu', 'chr', 'ltg', 'sm', 'om', 'xh', 'rmy', 'cu', 'tn', 'pih', 'rn', 'chy', - 'tw', 'tum', 'ts', 'st', 'got', 'bm', 'pnt', 'ss', 'ch', 'fj', - 'atj', 'ady', 'ak', 'iu', 'ny', 'ee', 'ks', 'ik', 've', 'sg', 'ff', + 'tw', 'tum', 'ts', 'got', 'st', 'bm', 'pnt', 'ss', 'atj', 'ch', + 'ak', 'fj', 'ady', 'iu', 'ny', 'ee', 'ks', 'ik', 've', 'sg', 'ff', 'dz', 'ti', 'cr', 'din', ] diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index ef60ce6..a1b2acf 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -32,19 +32,19 @@ def __init__(self): """Initializer.""" self.languages_by_size = [ - 'en', 'mg', 'fr', 'sh', 'ru', 'es', 'zh', 'de', 'nl', 'lt', 'sv', - 'ku', 'pl', 'el', 'it', 'fi', 'ta', 'hu', 'tr', 'ca', 'ko', 'io', + 'en', 'mg', 'fr', 'sh', 'ru', 'es', 'zh', 'de', 'nl', 'sv', 'lt', + 'pl', 'ku', 'el', 'it', 'fi', 'ta', 'hu', 'tr', 'ca', 'ko', 'io', 'kn', 'pt', 'hy', 'vi', 'sr', 'ja', 'chr', 'hi', 'th', 'ro', 'no', - 'id', 'ml', 'et', 'uz', 'li', 'my', 'or', 'te', 'cs', 'fa', 'eo', + 'id', 'ml', 'et', 'my', 'uz', 'li', 'or', 'te', 'cs', 'fa', 'eo', 'ar', 'jv', 'az', 'eu', 'gl', 'oc', 'da', 'br', 'lo', 'uk', 'hr', 'fj', 'tg', 'bg', 'simple', 'ps', 'sk', 'cy', 'vo', 'wa', 'is', 'zh-min-nan', 'la', 'af', 'scn', 'ast', 'he', 'ky', 'tl', 'sw', - 'fy', 'nn', 'lv', 'co', 'pa', 'pnb', 'mn', 'ka', 'nds', 'sl', 'sq', + 'fy', 'nn', 'lv', 'pa', 'co', 'pnb', 'mn', 'ka', 'nds', 'sl', 'sq', 'lb', 'bs', 'nah', 'sa', 'kk', 'bn', 'tk', 'km', 'sm', 'mk', 'hsb', - 'be', 'ms', 'ur', 'ga', 'an', 'wo', 'vec', 'ang', 'tt', 'sd', 'gn', - 'mr', 'so', 'mt', 'csb', 'ug', 'ie', 'gd', 'st', 'roa-rup', 'si', + 'ur', 'be', 'ms', 'ga', 'an', 'wo', 'vec', 'ang', 'tt', 'sd', 'mt', + 'gn', 'mr', 'ie', 'so', 'csb', 'ug', 'gd', 'st', 'roa-rup', 'si', 'hif', 'ia', 'mi', 'ay', 'kl', 'fo', 'jbo', 'ln', 'zu', 'na', 'gu', - 'gv', 'kw', 'rw', 'ne', 'ts', 'om', 'qu', 'su', 'ss', 'ha', 'iu', + 'gv', 'kw', 'rw', 'ts', 'ne', 'om', 'qu', 'su', 'ss', 'ha', 'iu', 'am', 'dv', 'tpi', 'yi', 'ti', 'sg', 'tn', 'ks', ] -- To view, visit https://gerrit.wikimedia.org/r/421788 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I253985e215a42cb407db6f1a9f9397d65c0bafe2 Gerrit-Change-Number: 421788 Gerrit-PatchSet: 2 Gerrit-Owner: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: Add a sitelink with a summary in interwikidata.py
by jenkins-bot (Code Review) 24 Mar '18

24 Mar '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/421700 ) Change subject: Add a sitelink with a summary in interwikidata.py ...................................................................... Add a sitelink with a summary in interwikidata.py The automatic summary "Updated item" isn't very useful. Change-Id: Ic2c9771792c0f011c9ed27f4f526b21aaf966750 --- M scripts/interwikidata.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/interwikidata.py b/scripts/interwikidata.py index 5b80cfb..9b3449d 100644 --- a/scripts/interwikidata.py +++ b/scripts/interwikidata.py @@ -186,7 +186,8 @@ item.title(asLink=True)) return False output('Adding link to %s' % item.title()) - item.setSitelink(self.current_page) + item.setSitelink(self.current_page, summary='Added %s' % ( + self.current_page.title(asLink=True, insite=item.site))) return item def try_to_merge(self, item): -- To view, visit https://gerrit.wikimedia.org/r/421700 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic2c9771792c0f011c9ed27f4f526b21aaf966750 Gerrit-Change-Number: 421700 Gerrit-PatchSet: 2 Gerrit-Owner: Matěj Suchánek <matejsuchanek97(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: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: [IMPR] Simplify isCategoryRedirect method
by jenkins-bot (Code Review) 22 Mar '18

22 Mar '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/398474 ) Change subject: [IMPR] Simplify isCategoryRedirect method ...................................................................... [IMPR] Simplify isCategoryRedirect method - test for args length instead of try/except IndexError construct - assign self._catredirect = False only once - use Namespace.CATEGORY constants - improve error messages Change-Id: Ib74d6215d4b57ccd6eb9d74fa46b09d71c6cb12c --- M pywikibot/page.py 1 file changed, 12 insertions(+), 14 deletions(-) Approvals: Framawiki: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 7d1babf..7a7ee82 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -849,28 +849,26 @@ if not self.is_categorypage(): return False if not hasattr(self, "_catredirect"): + self._catredirect = False catredirs = self.site.category_redirects() for template, args in self.templatesWithParams(): if template.title(withNamespace=False) in catredirs: - # Get target (first template argument) - try: - p = pywikibot.Page(self.site, args[0].strip(), ns=14) - if p.namespace() == 14: + if args: + # Get target (first template argument) + p = pywikibot.Page( + self.site, args[0].strip(), Namespace.CATEGORY) + if p.namespace() == Namespace.CATEGORY: self._catredirect = p.title() else: pywikibot.warning( - u"Target %s on %s is not a category" - % (p.title(asLink=True), - self.title(asLink=True))) - self._catredirect = False - except IndexError: + 'Category redirect target {0} on {1} is not a ' + 'category'.format(p.title(asLink=True), + self.title(asLink=True))) + else: pywikibot.warning( - u"No target for category redirect on %s" - % self.title(asLink=True)) - self._catredirect = False + 'No target found for category redirect on ' + + self.title(asLink=True)) break - else: - self._catredirect = False return bool(self._catredirect) def getCategoryRedirectTarget(self): -- To view, visit https://gerrit.wikimedia.org/r/398474 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib74d6215d4b57ccd6eb9d74fa46b09d71c6cb12c Gerrit-Change-Number: 398474 Gerrit-PatchSet: 4 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: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: travis.yml: Upgrade setuptools before running script
by jenkins-bot (Code Review) 22 Mar '18

22 Mar '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/421250 ) Change subject: travis.yml: Upgrade setuptools before running script ...................................................................... travis.yml: Upgrade setuptools before running script README.rst: - Add the same instruction to "Quick start" section of the readme file. - Remove the --pre argument of pip since the released version of pywikibot is stable now. Bug: T190383 Change-Id: Ice597677272dbef296ed2e0d56bb62fe7e1b25fd --- M .travis.yml M README.rst 2 files changed, 3 insertions(+), 1 deletion(-) Approvals: Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/.travis.yml b/.travis.yml index 0585bf0..89d281a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,6 +50,7 @@ fi before_script: + - pip install -U setuptools - pip install -r dev-requirements.txt script: diff --git a/README.rst b/README.rst index 9615d2c..7622c1c 100644 --- a/README.rst +++ b/README.rst @@ -40,7 +40,8 @@ Or to install using PyPI (excluding scripts) :: - pip install pywikibot --pre + pip install -U setuptools + pip install pywikibot Our `installation guide <https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Pywikibot/Installa…>`_ -- To view, visit https://gerrit.wikimedia.org/r/421250 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ice597677272dbef296ed2e0d56bb62fe7e1b25fd Gerrit-Change-Number: 421250 Gerrit-PatchSet: 1 Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: tools/__init__.py: Add param info to issue_deprecation_warning.__doc__
by jenkins-bot (Code Review) 21 Mar '18

21 Mar '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/421056 ) Change subject: tools/__init__.py: Add param info to issue_deprecation_warning.__doc__ ...................................................................... tools/__init__.py: Add param info to issue_deprecation_warning.__doc__ Change-Id: Ib302125e8da2d689ebddfdff2890f18d3b321cd3 --- M pywikibot/tools/__init__.py 1 file changed, 12 insertions(+), 1 deletion(-) Approvals: Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index 376f1b4..8dba207 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -1356,7 +1356,18 @@ def issue_deprecation_warning(name, instead, depth, warning_class=None): - """Issue a deprecation warning.""" + """Issue a deprecation warning. + + @param name: the name of the deprecated object + @type name: str + @param instead: suggested replacement for the deprecated object + @type instead: str + @param depth: depth + 1 will be used as stacklevel for the warnings + @type depth: int + @param warning_class: a warning class (category) to be used, defaults to + DeprecationWarning + @type warning_class: type + """ if instead: if warning_class is None: warning_class = DeprecationWarning -- To view, visit https://gerrit.wikimedia.org/r/421056 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib302125e8da2d689ebddfdff2890f18d3b321cd3 Gerrit-Change-Number: 421056 Gerrit-PatchSet: 2 Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits March 2018