jenkins-bot has submitted this change and it was merged.
Change subject: [FIX] Imagetransfer: Don't use str()
......................................................................
[FIX] Imagetransfer: Don't use str()
As the version history table is already a unicode string it is not required to
be casted. This also removes the need for 'unicode' which was removed in
Python 3.
Bug: 71399
Change-Id: I366e84198b40f69c580425d1bd64c79408271416
---
M scripts/imagetransfer.py
1 file changed, 3 insertions(+), 2 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/imagetransfer.py b/scripts/imagetransfer.py
index d4573ef..aad4744 100644
--- a/scripts/imagetransfer.py
+++ b/scripts/imagetransfer.py
@@ -183,10 +183,11 @@
description = i18n.translate(self.targetSite, copy_message,
fallback=True) % (sourceSite, description)
- description += '\n\n' +
str(sourceImagePage.getFileVersionHistoryTable())
+ description += '\n\n'
+ description += sourceImagePage.getFileVersionHistoryTable()
# add interwiki link
if sourceSite.family == self.targetSite.family:
- description += "\r\n\r\n" + unicode(sourceImagePage)
+ description += u'\r\n\r\n{0}'.format(sourceImagePage)
except pywikibot.NoPage:
description = ''
print("Image does not exist or description page is empty.")
--
To view, visit
https://gerrit.wikimedia.org/r/163530
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I366e84198b40f69c580425d1bd64c79408271416
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.de>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de>
Gerrit-Reviewer: jenkins-bot <>