jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/572028 ) Change subject: [cleanup] Some code cleanups within site.merge_history() ...................................................................... [cleanup] Some code cleanups within site.merge_history() - remove raising FatalServerError in favour of need_version decorator - dedent deeply nested flow statements Change-Id: I43b61acf9794f5f9ddab3fb6bcf7da0bc64c8af0 --- M pywikibot/site.py 1 file changed, 26 insertions(+), 29 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index c2d20cb..de6ffaf 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -49,7 +49,6 @@ EntityTypeUnknownException, Error, FamilyMaintenanceWarning, - FatalServerError, InconsistentTitleReceived, InterwikiRedirectPage, IsNotRedirectPage, @@ -5475,6 +5474,7 @@ } @need_right('mergehistory') + @need_version('1.27.0-wmf.13') def merge_history(self, source, dest, timestamp=None, reason=None): """Merge revisions from one page into another. @@ -5496,12 +5496,6 @@ @param reason: Optional reason for the history merge @type reason: str """ - # Check wiki version to see if action=mergehistory is supported - if self.mw_version < '1.27.0-wmf.13': - raise FatalServerError(str(self) + ' version must be ' - '1.27.0-wmf.13 or newer to support the ' - 'history merge API.') - # Data for error messages errdata = { 'site': self, @@ -6263,30 +6257,33 @@ """ if self.mw_version >= '1.27wmf9': return not self._siteinfo.get('general')['uploadsenabled'] + if hasattr(self, '_uploaddisabled'): return self._uploaddisabled - else: - # attempt a fake upload; on enabled sites will fail for: - # missingparam: One of the parameters - # filekey, file, url, statuskey is required - # TODO: is there another way? - try: - req = self._request(throttle=False, - parameters={'action': 'upload', - 'token': self.tokens['edit']}) - req.submit() - except api.APIError as error: - if error.code == 'uploaddisabled': - self._uploaddisabled = True - elif error.code == 'missingparam': - # If the upload module is enabled, the above dummy request - # does not have sufficient parameters and will cause a - # 'missingparam' error. - self._uploaddisabled = False - else: - # Unexpected error - raise - return self._uploaddisabled + + # attempt a fake upload; on enabled sites will fail for: + # missingparam: One of the parameters + # filekey, file, url, statuskey is required + # TODO: is there another way? + try: + req = self._request(throttle=False, + parameters={'action': 'upload', + 'token': self.tokens['edit']}) + req.submit() + except api.APIError as error: + if error.code == 'uploaddisabled': + self._uploaddisabled = True + elif error.code == 'missingparam': + # If the upload module is enabled, the above dummy request + # does not have sufficient parameters and will cause a + # 'missingparam' error. + self._uploaddisabled = False + else: + # Unexpected error + raise + return self._uploaddisabled + raise RuntimeError( + 'Unexpected success of upload action without parameters.') def stash_info(self, file_key, props=False): """Get the stash info for a given file key. -- To view, visit https://gerrit.wikimedia.org/r/572028 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: I43b61acf9794f5f9ddab3fb6bcf7da0bc64c8af0 Gerrit-Change-Number: 572028 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt &lt;info(a)gno.de&gt; Gerrit-Reviewer: JJMC89 &lt;JJMC89.Wikimedia(a)gmail.com&gt; Gerrit-Reviewer: jenkins-bot (75)