jenkins-bot merged this change.

View Change

Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified
[cleanup] show a FutureWarning for deprecated debug and uploadByUrl parameters

Change-Id: Ic96541f4f4165ced7904aa5e03f4d6619f396419
---
M pywikibot/specialbots/_upload.py
1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pywikibot/specialbots/_upload.py b/pywikibot/specialbots/_upload.py
index eec04ad..93c905a 100644
--- a/pywikibot/specialbots/_upload.py
+++ b/pywikibot/specialbots/_upload.py
@@ -37,7 +37,7 @@

"""Upload bot."""

- @deprecated_args(uploadByUrl=None, urlEncoding='url_encoding',
+ @deprecated_args(uploadByUrl=True, urlEncoding='url_encoding',
useFilename='use_filename', keepFilename='keep_filename',
verifyDescription='verify_description',
ignoreWarning='ignore_warning', targetSite='target_site')
@@ -87,10 +87,6 @@
or aborts are set to True and that the description is also set. It
overwrites verify_description to False and keep_filename to True.
@type always: bool
-
- @deprecated: Using upload_image() is deprecated, use upload_file() with
- file_url param instead
-
"""
super(UploadRobot, self).__init__(**kwargs)
always = self.getOption('always')
@@ -392,12 +388,12 @@
return warn_code in self.ignore_warning

@deprecated('UploadRobot.upload_file()', since='20141211')
- @deprecated_args(debug=None)
+ @deprecated_args(debug=True)
def upload_image(self):
"""Upload image."""
return self.upload_file(self.url)

- @deprecated_args(debug=None)
+ @deprecated_args(debug=True)
def upload_file(self, file_url, _file_key=None, _offset=0):
"""
Upload the image at file_url to the target wiki.

To view, visit change 606656. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic96541f4f4165ced7904aa5e03f4d6619f396419
Gerrit-Change-Number: 606656
Gerrit-PatchSet: 3
Gerrit-Owner: Xqt <info@gno.de>
Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki@aol.com>
Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97@gmail.com>
Gerrit-Reviewer: Xqt <info@gno.de>
Gerrit-Reviewer: jenkins-bot (75)