jenkins-bot has submitted this change and it was merged.
Change subject: Fixup for recent standardisation of nowcommons
......................................................................
Fixup for recent standardisation of nowcommons
Fixes I1cc6b5734237d143c8100f3c26c20d78c36924c6
Change-Id: I14ea9f7be0bc0df363a2fe2945a068753645598f
---
M scripts/nowcommons.py
1 file changed, 7 insertions(+), 7 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/nowcommons.py b/scripts/nowcommons.py
index 260dcfd..3f2c60e 100644
--- a/scripts/nowcommons.py
+++ b/scripts/nowcommons.py
@@ -261,7 +261,7 @@
break
def getPageGenerator(self):
- if use_hash:
+ if self.getOption('use_hash'):
gen = self.useHashGenerator()
else:
nowCommonsTemplates = [pywikibot.Page(self.site, title,
@@ -309,7 +309,7 @@
comment = i18n.translate(self.site, nowCommonsMessage, fallback=True)
for page in self.getPageGenerator():
- if use_hash:
+ if self.getOption('use_hash'):
# Page -> Has the namespace | commons image -> Not
images_list = page # 0 -> local image, 1 -> commons image
page = pywikibot.Page(self.site, images_list[0])
@@ -325,18 +325,18 @@
pywikibot.output(u'File is already on Commons.')
continue
md5 = localImagePage.getFileMd5Sum()
- if use_hash:
+ if self.getOption('use_hash'):
filenameOnCommons = images_list[1]
else:
filenameOnCommons = self.findFilenameOnCommons(
localImagePage)
- if not filenameOnCommons and not use_hash:
+ if not filenameOnCommons and not self.getOption('use_hash'):
pywikibot.output(u'NowCommons template not found.')
continue
commonsImagePage = pywikibot.ImagePage(commons, 'Image:%s'
% filenameOnCommons)
if localImagePage.title(withNamespace=False) == \
- commonsImagePage.title(withNamespace=False) and use_hash:
+ commonsImagePage.title(withNamespace=False) and
self.getOption('use_hash'):
pywikibot.output(
u'The local and the commons images have the same name')
if localImagePage.title(withNamespace=False) != \
@@ -378,7 +378,7 @@
# refresh because we want the updated list
usingPages = len(list(pywikibot.ImagePage(
self.site, page.title()).usingPages()))
- if usingPages > 0 and use_hash:
+ if usingPages > 0 and
self.getOption('use_hash'):
# just an enter
pywikibot.input(
u'There are still %s pages with this \
@@ -397,7 +397,7 @@
if md5 == commonsImagePage.getFileMd5Sum():
pywikibot.output(
u'The image is identical to the one on Commons.')
- if len(localImagePage.getFileVersionHistory()) > 1 and not
use_hash:
+ if len(localImagePage.getFileVersionHistory()) > 1 and not
self.getOption('use_hash'):
pywikibot.output(
u"This image has a version history. Please \
delete it manually after making sure that the \
--
To view, visit
https://gerrit.wikimedia.org/r/151098
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I14ea9f7be0bc0df363a2fe2945a068753645598f
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: jenkins-bot <>