jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/324144 )
Change subject: [IMPR] Use FilePage.upload inside UploadRobot
......................................................................
[IMPR] Use FilePage.upload inside UploadRobot
- use the new FilePage.upload method to upload a file
- move setting out of the try block
- uploadByUrl was never used by any bot script. Replace its behavior
by checking upload rights. Use read_file_content only if has no
'upload_by_url' right; the file from url is cached locally then.
Otherwise upload the file by url directly.
- deprecate unused debug parameter for upload_file and upload_image
- None is returned from that method in some cases which means null
- return upload_file's result in upload_image which was the previous behavior
- omit compat style "via API" message part
Change-Id: I1346ec6f90f1ff405afd0f9097659583dde52752
---
M pywikibot/specialbots.py
1 file changed, 20 insertions(+), 29 deletions(-)
Approvals:
Dalba: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/specialbots.py b/pywikibot/specialbots.py
index 317c4da..b778dfb 100644
--- a/pywikibot/specialbots.py
+++ b/pywikibot/specialbots.py
@@ -22,7 +22,7 @@
from pywikibot import config
from pywikibot.bot import BaseBot, QuitKeyboardInterrupt
-from pywikibot.tools import PY2, deprecated
+from pywikibot.tools import PY2, deprecated, deprecated_args
from pywikibot.tools.formatter import color_format
if not PY2:
@@ -39,10 +39,11 @@
"""Upload bot."""
+ @deprecated_args(uploadByUrl=None)
def __init__(self, url, urlEncoding=None, description=u'',
useFilename=None, keepFilename=False,
verifyDescription=True, ignoreWarning=False,
- targetSite=None, uploadByUrl=False, aborts=[], chunk_size=0,
+ targetSite=None, aborts=[], chunk_size=0,
summary=None, **kwargs):
"""
Constructor.
@@ -114,7 +115,6 @@
else:
self.targetSite = targetSite or pywikibot.Site()
self.targetSite.login()
- self.uploadByUrl = uploadByUrl
@deprecated()
def urlOK(self):
@@ -385,17 +385,18 @@
return warn_code in self.ignoreWarning
@deprecated('UploadRobot.upload_file()')
- def upload_image(self, debug=False):
+ @deprecated_args(debug=None)
+ def upload_image(self):
"""Upload image."""
- self.upload_file(self.url, debug)
+ return self.upload_file(self.url)
- def upload_file(self, file_url, debug=False, _file_key=None, _offset=0):
+ @deprecated_args(debug=None)
+ def upload_file(self, file_url, _file_key=None, _offset=0):
"""Upload the image at file_url to the target wiki.
Return the filename that was used to upload the image.
If the upload fails, ask the user whether to try again or not.
- If the user chooses not to retry, return null.
-
+ If the user chooses not to retry, return None.
"""
filename = self.process_filename(file_url)
if not filename:
@@ -405,30 +406,20 @@
imagepage = pywikibot.FilePage(site, filename) # normalizes filename
imagepage.text = self.description
- pywikibot.output(u'Uploading file to %s via API...' % site)
+ pywikibot.output('Uploading file to {0}...'.format(site))
success = False
- try:
- if self.ignoreWarning is True:
- apiIgnoreWarnings = True
- else:
- apiIgnoreWarnings = self._handle_warnings
- if self.uploadByUrl:
- success = site.upload(imagepage, source_url=file_url,
- ignore_warnings=apiIgnoreWarnings,
- _file_key=_file_key, _offset=_offset,
- comment=self.summary)
- else:
- if "://" in file_url:
- temp = self.read_file_content(file_url)
- else:
- temp = file_url
- success = site.upload(imagepage, source_filename=temp,
- ignore_warnings=apiIgnoreWarnings,
- chunk_size=self.chunk_size,
- _file_key=_file_key, _offset=_offset,
- comment=self.summary)
+ ignore_warnings = self.ignoreWarning is True or self._handle_warnings
+ if ('://' in file_url and
+ 'upload_by_url' not in site.userinfo['rights']):
+ file_url = self.read_file_content(file_url)
+ try:
+ success = imagepage.upload(file_url,
+ ignore_warnings=ignore_warnings,
+ chunk_size=self.chunk_size,
+ _file_key=_file_key, _offset=_offset,
+ comment=self.summary)
except pywikibot.data.api.APIError as error:
if error.code == u'uploaddisabled':
pywikibot.error("Upload error: Local file uploads are disabled
on %s."
--
To view, visit https://gerrit.wikimedia.org/r/324144
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1346ec6f90f1ff405afd0f9097659583dde52752
Gerrit-PatchSet: 9
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: Dalba <[email protected]>
Gerrit-Reviewer: John Vandenberg <[email protected]>
Gerrit-Reviewer: Lokal Profil <[email protected]>
Gerrit-Reviewer: Magul <[email protected]>
Gerrit-Reviewer: Multichill <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
