Pywikibot-commits December 2017

pywikibot-commits@lists.wikimedia.org

1 participants
74 discussions

[Gerrit] pywikibot/core[master]: [TEST] Verify the group of site.botusers() users
by jenkins-bot (Code Review) 31 Dec '17

31 Dec '17

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401184 ) Change subject: [TEST] Verify the group of site.botusers() users ...................................................................... [TEST] Verify the group of site.botusers() users Follows I066eecb25358ae054d7abc925574550153a83a6a Change-Id: Ibb94045325493348642570e93bd331f8452b3f03 --- M tests/site_tests.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tests/site_tests.py b/tests/site_tests.py index b0f7287..0acfa44 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -760,6 +760,7 @@ self.assertIn('userid', botuser) self.assertIn('editcount', botuser) self.assertIn('registration', botuser) + self.assertIn('bot', botuser['groups']) def test_allusers(self): """Test the site.allusers() method.""" @@ -771,6 +772,7 @@ self.assertIn("name", user) self.assertIn("editcount", user) self.assertIn("registration", user) + self.assertIn('user', user['groups']) def test_allusers_with_start(self): """Test the site.allusers(start=..) method.""" -- To view, visit https://gerrit.wikimedia.org/r/401184 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibb94045325493348642570e93bd331f8452b3f03 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master 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]: [TEST] Add Test for site.botusers() method
by jenkins-bot (Code Review) 31 Dec '17

31 Dec '17

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401083 ) Change subject: [TEST] Add Test for site.botusers() method ...................................................................... [TEST] Add Test for site.botusers() method Added test for the site.botusers() method, as my GCI task. Bug: T60941 Change-Id: I066eecb25358ae054d7abc925574550153a83a6a --- M tests/site_tests.py 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/site_tests.py b/tests/site_tests.py index bd77485..b0f7287 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -749,6 +749,18 @@ self.assertIsInstance(cat, pywikibot.Category) self.assertLessEqual(cat.title(withNamespace=False), "Hij") + def test_botusers(self): + """Test the site.botusers() method.""" + mysite = self.get_site() + bu = list(mysite.botusers(total=10)) + self.assertLessEqual(len(bu), 10) + for botuser in bu: + self.assertIsInstance(botuser, dict) + self.assertIn('name', botuser) + self.assertIn('userid', botuser) + self.assertIn('editcount', botuser) + self.assertIn('registration', botuser) + def test_allusers(self): """Test the site.allusers() method.""" mysite = self.get_site() -- To view, visit https://gerrit.wikimedia.org/r/401083 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I066eecb25358ae054d7abc925574550153a83a6a Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Anpans <anpans444(a)gmail.com> Gerrit-Reviewer: Anpans <anpans444(a)gmail.com> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: Add an add_only parameter to replaceCategoryInPlace in textlib
by jenkins-bot (Code Review) 31 Dec '17

31 Dec '17

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/400264 ) Change subject: Add an add_only parameter to replaceCategoryInPlace in textlib ...................................................................... Add an add_only parameter to replaceCategoryInPlace in textlib Bug: T183707 Change-Id: I67238337ee82e51ab6c876bbdfe32b05e7836cd2 --- M pywikibot/textlib.py M tests/textlib_tests.py 2 files changed, 20 insertions(+), 1 deletion(-) Approvals: Framawiki: Looks good to me, but someone else must approve jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index cedb30d..71abed2 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -1164,13 +1164,16 @@ return removeCategoryLinks(text, site, marker) -def replaceCategoryInPlace(oldtext, oldcat, newcat, site=None): +def replaceCategoryInPlace(oldtext, oldcat, newcat, site=None, + add_only=False): """ Replace old category with new one and return the modified text. @param oldtext: Content of the old category @param oldcat: pywikibot.Category object of the old category @param newcat: pywikibot.Category object of the new category + @param add_only: If add_only is True, the old category won't + be replaced and the category given will be added after it. @return: the modified text @rtype: unicode """ @@ -1203,6 +1206,13 @@ text = replaceExcept(text, categoryR, '', ['nowiki', 'comment', 'math', 'pre', 'source'], site=site) + elif add_only: + text = replaceExcept(oldtext, categoryR, + '{0}\n{1}'.format( + oldcat.title(asLink=True), + newcat.title(asLink=True)), + ['nowiki', 'comment', 'math', 'pre', 'source'], + site=site) else: text = replaceExcept(oldtext, categoryR, '[[%s:%s\\2' % (site.namespace(14), diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index fb77566..476a7ba 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -244,6 +244,15 @@ # First and third categories are the same self.assertEqual([cats[1], cats[3]], temp_cats) + # Testing adding categories + temp = textlib.replaceCategoryInPlace( + self.old, cats[0], cats[1], site=self.site, + add_only=True) + self.assertNotEqual(temp, self.old) + temp_cats = textlib.getCategoryLinks(temp, site=self.site) + self.assertEqual([cats[0], cats[1], cats[1], + cats[2], cats[1], cats[3]], temp_cats) + new_cats = textlib.getCategoryLinks(new, site=self.site) self.assertEqual(cats, new_cats) -- To view, visit https://gerrit.wikimedia.org/r/400264 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I67238337ee82e51ab6c876bbdfe32b05e7836cd2 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Eflyjason <eflyjason(a)gmail.com> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: download_dump: Add -revision parameter
by jenkins-bot (Code Review) 31 Dec '17

31 Dec '17

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401091 ) Change subject: download_dump: Add -revision parameter ...................................................................... download_dump: Add -revision parameter Add `-revision` parameter in `scripts/maintenance/download_dump.py` which used for specifying the revision of the file dump that wanna be downloaded. Bug: T183789 Change-Id: I3e7e22f3f5f35e71e3793f8f5b568c7e97aa4b1c --- M scripts/maintenance/download_dump.py 1 file changed, 29 insertions(+), 4 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/scripts/maintenance/download_dump.py b/scripts/maintenance/download_dump.py index c55940b..853d33f 100644 --- a/scripts/maintenance/download_dump.py +++ b/scripts/maintenance/download_dump.py @@ -9,6 +9,9 @@ -storepath:# The stored file's path. + -revision:# The revision date of the dump (default to `latest`) + formatted as YYYYMMDD. + """ # # (C) Pywikibot team, 2017 @@ -55,6 +58,7 @@ 'wikiname': '', 'filename': '', 'storepath': './', + 'revision': 'latest', } def __init__(self, **kwargs): @@ -78,8 +82,11 @@ """Run bot.""" pywikibot.output('Downloading dump from ' + self.getOption('wikiname')) - download_filename = self.getOption('wikiname') + \ - '-latest-' + self.getOption('filename') + download_filename = '{wiki_name}-{revision}-{filename}'.format( + wiki_name=self.getOption('wikiname'), + revision=self.getOption('revision'), + filename=self.getOption('filename') + ) temp_filename = download_filename + '-' + \ binascii.b2a_hex(urandom(8)).decode('ascii') + '.part' @@ -104,14 +111,27 @@ remove(file_final_storepath) symlink(toolforge_dump_filepath, file_current_storepath) else: - url = 'https://dumps.wikimedia.org/{0}/latest/{1}'.format( - self.getOption('wikiname'), download_filename) + url = 'https://dumps.wikimedia.org/{0}/{1}/{2}'.format( + self.getOption('wikiname'), + self.getOption('revision'), + download_filename) pywikibot.output('Downloading file from ' + url) response = fetch(url, stream=True) if response.status == 200: with open(file_current_storepath, 'wb') as result_file: for data in response.data.iter_content(100 * 1024): result_file.write(data) + elif response.status == 404: + pywikibot.output( + 'File with name "{filename}", ' + 'from revision "{revision}", ' + 'and wiki "{wikiname}" ({url}) isn\'t ' + 'available in the Wikimedia Dumps'.format( + filename=self.getOption('filename'), + revision=self.getOption('revision'), + url=url, + wikiname=self.getOption('wikiname'))) + return else: return # Rename the temporary file to the target file @@ -165,6 +185,11 @@ opts[option] = os.path.abspath(value) or pywikibot.input( 'Enter the store path: ') continue + elif option == 'revision': + opts[option] = value or pywikibot.input( + 'Enter the revision of the dump: ') + continue + unknown_args += [arg] missing = [] -- To view, visit https://gerrit.wikimedia.org/r/401091 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3e7e22f3f5f35e71e3793f8f5b568c7e97aa4b1c Gerrit-PatchSet: 5 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Rafidaslam <rafidteam(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: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: comms.http: Include HttpRequest.kwargs in session.request call
by jenkins-bot (Code Review) 31 Dec '17

31 Dec '17

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401116 ) Change subject: comms.http: Include HttpRequest.kwargs in session.request call ...................................................................... comms.http: Include HttpRequest.kwargs in session.request call Include threadedhttp.HttpRequest.kwargs in session.request call in `_http_process()`. Before this HttpRequest.kwargs didn't get into session.request call so if we call a function like `pywikibot.comms.http.fetch()` with parameter like `stream=True`, the `stream` param would be ignored. Bug: T183830 Change-Id: I02d71a933bc1ef0073a0ec34534b4eeeefc10e91 --- M pywikibot/comms/http.py 1 file changed, 12 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index b6fb20d..ba569f6 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -349,6 +349,16 @@ def _http_process(session, http_request): + """ + Process an `threadedhttp.HttpRequest` instance. + + @param session: Session that will be used to process the `http_request`. + @type session: L{requests.Session} + @param http_request: Request that will be processed. + @type http_request: L{threadedhttp.HttpRequest} + @return: None + @rtype: None + """ method = http_request.method uri = http_request.uri params = http_request.params @@ -374,7 +384,8 @@ # verify=True, when a request with verify=False happened before response = session.request(method, uri, params=params, data=body, headers=headers, auth=auth, timeout=timeout, - verify=not ignore_validation) + verify=not ignore_validation, + **http_request.kwargs) except Exception as e: http_request.data = e else: -- To view, visit https://gerrit.wikimedia.org/r/401116 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I02d71a933bc1ef0073a0ec34534b4eeeefc10e91 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Rafidaslam <rafidteam(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Rafidaslam <rafidteam(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]: Made download_dump.py download process atomic
by jenkins-bot (Code Review) 30 Dec '17

30 Dec '17

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/400616 ) Change subject: Made download_dump.py download process atomic ...................................................................... Made download_dump.py download process atomic Bug: T183675 Change-Id: I142629bb89ffc1c810adcf8f1417ecc824594e41 --- M scripts/maintenance/download_dump.py 1 file changed, 66 insertions(+), 22 deletions(-) Approvals: Zhuyifei1999: Looks good to me, but someone else must approve Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/maintenance/download_dump.py b/scripts/maintenance/download_dump.py index d3a5123..c55940b 100644 --- a/scripts/maintenance/download_dump.py +++ b/scripts/maintenance/download_dump.py @@ -18,10 +18,27 @@ # from __future__ import absolute_import, division, unicode_literals +import binascii + import os.path import sys -from os import remove, symlink +from os import remove, symlink, urandom + +try: + from os import replace +except ImportError: # py2 + if sys.platform == 'win32': + import os + + def replace(src, dst): + try: + os.rename(src, dst) + except OSError: + remove(dst) + os.rename(src, dst) + else: + from os import rename as replace import pywikibot @@ -63,36 +80,63 @@ download_filename = self.getOption('wikiname') + \ '-latest-' + self.getOption('filename') - file_storepath = os.path.join( + temp_filename = download_filename + '-' + \ + binascii.b2a_hex(urandom(8)).decode('ascii') + '.part' + + file_final_storepath = os.path.join( self.getOption('storepath'), download_filename) + file_current_storepath = os.path.join( + self.getOption('storepath'), temp_filename) # https://wikitech.wikimedia.org/wiki/Help:Toolforge#Dumps toolforge_dump_filepath = self.get_dump_name( self.getOption('wikiname'), self.getOption('filename')) - if toolforge_dump_filepath: - pywikibot.output('Symlinking file from ' + toolforge_dump_filepath) - if os.path.exists(file_storepath): - remove(file_storepath) - symlink(toolforge_dump_filepath, file_storepath) - else: - url = 'https://dumps.wikimedia.org/' + \ - os.path.join(self.getOption('wikiname'), - 'latest', download_filename) - pywikibot.output('Downloading file from ' + url) - response = fetch(url, stream=True) - if response.status == 200: + # First iteration for atomic download with temporary file + # Second iteration for fallback non-atomic download + for non_atomic in range(2): + try: + if toolforge_dump_filepath: + pywikibot.output('Symlinking file from ' + + toolforge_dump_filepath) + if non_atomic: + if os.path.exists(file_final_storepath): + remove(file_final_storepath) + symlink(toolforge_dump_filepath, file_current_storepath) + else: + url = 'https://dumps.wikimedia.org/{0}/latest/{1}'.format( + self.getOption('wikiname'), download_filename) + pywikibot.output('Downloading file from ' + url) + response = fetch(url, stream=True) + if response.status == 200: + with open(file_current_storepath, 'wb') as result_file: + for data in response.data.iter_content(100 * 1024): + result_file.write(data) + else: + return + # Rename the temporary file to the target file + # if the download completes successfully + if not non_atomic: + replace(file_current_storepath, file_final_storepath) + break + except (OSError, IOError): + pywikibot.exception() + try: - with open(file_storepath, 'wb') as result_file: - for chunk in response.data.iter_content(100 * 1024): - result_file.write(chunk) - except IOError: + remove(file_current_storepath) + except (OSError, IOError): pywikibot.exception() - return False - else: - return - pywikibot.output('Done! File stored as ' + file_storepath) + # If the atomic download fails, try without a temporary file + # If the non-atomic download also fails, exit the script + if not non_atomic: + pywikibot.output('Cannot make temporary file, ' + + 'falling back to non-atomic download') + file_current_storepath = file_final_storepath + else: + return False + + pywikibot.output('Done! File stored as ' + file_final_storepath) return -- To view, visit https://gerrit.wikimedia.org/r/400616 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I142629bb89ffc1c810adcf8f1417ecc824594e41 Gerrit-PatchSet: 12 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ryan10145 <chang.ryan10145(a)gmail.com> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ryan10145 <chang.ryan10145(a)gmail.com> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: Add kwargs tp changeRank
by jenkins-bot (Code Review) 29 Dec '17

29 Dec '17

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/400617 ) Change subject: Add kwargs tp changeRank ...................................................................... Add kwargs tp changeRank This will allow to set summaries when changing rank. Change-Id: I05195bb1e420434f73169f70f4c0b988bc469795 --- M pywikibot/page.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/page.py b/pywikibot/page.py index 3511f43..1291d4e 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -4923,10 +4923,10 @@ """Set the rank of the Claim.""" self.rank = rank - def changeRank(self, rank): + def changeRank(self, rank, **kwargs): """Change the rank of the Claim and save.""" self.rank = rank - return self.repo.save_claim(self) + return self.repo.save_claim(self, **kwargs) def changeSnakType(self, value=None, **kwargs): """ -- To view, visit https://gerrit.wikimedia.org/r/400617 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I05195bb1e420434f73169f70f4c0b988bc469795 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Smalyshev <smalyshev(a)wikimedia.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <Ladsgroup(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]: utils.py: Use more descriptive variable names in detailed_sh...
by jenkins-bot (Code Review) 28 Dec '17

28 Dec '17

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/400400 ) Change subject: utils.py: Use more descriptive variable names in detailed_show_warning ...................................................................... utils.py: Use more descriptive variable names in detailed_show_warning Also in DeprecationTestCase use source_adjustment_skips instead of skip_list which could be easily confused with a mechanism to prevent warnings from being shown. Change-Id: I1d6ebacfe4f4062017c5a217a0a0a91d6d2b1f4e --- M tests/aspects.py M tests/utils.py 2 files changed, 33 insertions(+), 23 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tests/aspects.py b/tests/aspects.py index d132ad2..077d2c1 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -1492,7 +1492,7 @@ _generic_match = re.compile(r'.* is deprecated(; use .* instead)?\.') - skip_list = [ + source_adjustment_skips = [ unittest.case._AssertRaisesContext, TestCase.assertRaises, TestCase.assertRaisesRegex, @@ -1506,7 +1506,7 @@ # Python 3 component in the call stack of _AssertRaisesContext if hasattr(unittest.case, '_AssertRaisesBaseContext'): - skip_list.append(unittest.case._AssertRaisesBaseContext) + source_adjustment_skips.append(unittest.case._AssertRaisesBaseContext) def __init__(self, *args, **kwargs): """Constructor.""" @@ -1520,7 +1520,8 @@ self._do_test_warning_filename = True self._ignore_unknown_warning_packages = False - self.context_manager = WarningSourceSkipContextManager(self.skip_list) + self.context_manager = WarningSourceSkipContextManager( + self.source_adjustment_skips) def _reset_messages(self): """Reset captured deprecation warnings.""" @@ -1667,7 +1668,7 @@ assertion, *args, **kwargs) self.assertOneDeprecation() - skip_list = DeprecationTestCase.skip_list + [ + source_adjustment_skips = DeprecationTestCase.source_adjustment_skips + [ CapturingTestCase.process_assert, CapturingTestCase.patch_assert, ] diff --git a/tests/utils.py b/tests/utils.py index f73f48e..240cda8 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -182,7 +182,8 @@ """ Constructor. - @param skip_list: List of objects to be skipped + @param skip_list: List of objects to be skipped. The source of any + warning that matches the skip_list won't be adjusted. @type skip_list: list of object or (obj, str, int, int) """ super(WarningSourceSkipContextManager, self).__init__(record=True) @@ -220,40 +221,48 @@ """Enter the context manager.""" def detailed_show_warning(*args, **kwargs): """Replacement handler for warnings.showwarning.""" - entry = warnings.WarningMessage(*args, **kwargs) + warn_msg = warnings.WarningMessage(*args, **kwargs) - skip_lines = 0 - entry_line_found = False + skip_frames = 0 + a_frame_has_matched_warn_msg = False - for (_, filename, fileno, _, line, _) in inspect.stack(): - if any(start <= fileno <= end + # The following for-loop will adjust the warn_msg only if the + # warning does not match the skip_list. + for (_, frame_filename, frame_lineno, _, _, _) in inspect.stack(): + if any(start <= frame_lineno <= end for (_, skip_filename, start, end) in self.skip_list - if skip_filename == filename): - if entry_line_found: + if skip_filename == frame_filename): + # this frame matches to one of the items in the skip_list + if a_frame_has_matched_warn_msg: continue else: - skip_lines += 1 + skip_frames += 1 - if (filename, fileno) == (entry.filename, entry.lineno): - if not skip_lines: + if ( + frame_filename == warn_msg.filename + and frame_lineno == warn_msg.lineno + ): + if not skip_frames: break - entry_line_found = True + a_frame_has_matched_warn_msg = True - if entry_line_found: - if not skip_lines: - (entry.filename, entry.lineno) = (filename, fileno) + if a_frame_has_matched_warn_msg: + if not skip_frames: + # adjust the warn_msg + warn_msg.filename = frame_filename + warn_msg.lineno = frame_lineno break else: - skip_lines -= 1 + skip_frames -= 1 # Avoid failures because cryptography is mentioning Python 2.6 # is outdated if PYTHON_VERSION < (2, 7): - if (isinstance(entry, DeprecationWarning) and - str(entry.message) == PYTHON_26_CRYPTO_WARN): + if (isinstance(warn_msg, DeprecationWarning) and + str(warn_msg.message) == PYTHON_26_CRYPTO_WARN): return - log.append(entry) + log.append(warn_msg) log = super(WarningSourceSkipContextManager, self).__enter__() self._module.showwarning = detailed_show_warning -- To view, visit https://gerrit.wikimedia.org/r/400400 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1d6ebacfe4f4062017c5a217a0a0a91d6d2b1f4e Gerrit-PatchSet: 5 Gerrit-Project: pywikibot/core Gerrit-Branch: master 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: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: [L10N] Disable cleanUpSectionHeaders on en.wiktionary
by jenkins-bot (Code Review) 27 Dec '17

27 Dec '17

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/400428 ) Change subject: [L10N] Disable cleanUpSectionHeaders on en.wiktionary ...................................................................... [L10N] Disable cleanUpSectionHeaders on en.wiktionary Bug: T169064 Change-Id: I3509e466216c2465ed6978b966f065c4368175f4 --- M pywikibot/cosmetic_changes.py 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py index 6631531..48db5f3 100755 --- a/pywikibot/cosmetic_changes.py +++ b/pywikibot/cosmetic_changes.py @@ -644,11 +644,11 @@ Example: ==Section title== becomes == Section title == NOTE: This space is recommended in the syntax help on the English and - German Wikipedia. It is not wanted on Lojban Wiktionary (per T168399) - and it might be that it is not wanted on other wikis. If there are any - complaints, please file a bug report. + German Wikipedia. It is not wanted on Lojban and English Wiktionary + (T168399, T169064) and it might be that it is not wanted on other + wikis. If there are any complaints, please file a bug report. """ - if self.site.sitename == 'wiktionary:jbo': + if self.site.sitename in ['wiktionary:jbo', 'wiktionary:en']: return text return textlib.replaceExcept( text, -- To view, visit https://gerrit.wikimedia.org/r/400428 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3509e466216c2465ed6978b966f065c4368175f4 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: MarcoAurelio <maurelio(a)tools.wmflabs.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: download_dump: Use response.iter_content
by jenkins-bot (Code Review) 27 Dec '17

27 Dec '17

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/400205 ) Change subject: download_dump: Use response.iter_content ...................................................................... download_dump: Use response.iter_content Use `response.iter_content` instead of `response.raw` and add `stream=True` when fetching the dump file. Bug: T183666 Change-Id: I92ae2cef5b6f43b0be689e498f1c0b530d197b4a --- M scripts/maintenance/download_dump.py 1 file changed, 3 insertions(+), 4 deletions(-) Approvals: Zhuyifei1999: Looks good to me, but someone else must approve Framawiki: Looks good to me, but someone else must approve Dalba: Looks good to me, approved jenkins-bot: Verified Eflyjason: Looks good to me, but someone else must approve diff --git a/scripts/maintenance/download_dump.py b/scripts/maintenance/download_dump.py index febf342..d3a5123 100644 --- a/scripts/maintenance/download_dump.py +++ b/scripts/maintenance/download_dump.py @@ -18,12 +18,10 @@ # from __future__ import absolute_import, division, unicode_literals -import io import os.path import sys from os import remove, symlink -from shutil import copyfileobj import pywikibot @@ -82,11 +80,12 @@ os.path.join(self.getOption('wikiname'), 'latest', download_filename) pywikibot.output('Downloading file from ' + url) - response = fetch(url) + response = fetch(url, stream=True) if response.status == 200: try: with open(file_storepath, 'wb') as result_file: - copyfileobj(io.BytesIO(response.raw), result_file) + for chunk in response.data.iter_content(100 * 1024): + result_file.write(chunk) except IOError: pywikibot.exception() return False -- To view, visit https://gerrit.wikimedia.org/r/400205 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I92ae2cef5b6f43b0be689e498f1c0b530d197b4a Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Rafidaslam <rafidteam(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Eflyjason <eflyjason(a)gmail.com> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Rafidaslam <rafidteam(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits December 2017