jenkins-bot has submitted this change and it was merged.
Change subject: make-release: fix up python comparison
......................................................................
make-release: fix up python comparison
if foo == None:
becomes:
foo is None:
Change-Id: I73d03deeeb2eac109e50918187840dcb65c4f089
---
M make-release/make-release
1 file changed, 6 insertions(+), 6 deletions(-)
Approvals:
Demon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/make-release/make-release b/make-release/make-release
index ded266f..c9a57a6 100755
--- a/make-release/make-release
+++ b/make-release/make-release
@@ -73,7 +73,7 @@
dieUsage()
decomposed = decomposeVersion(args[0])
- if decomposed == None:
+ if decomposed is None:
print 'Invalid version number "%s"' % (args[0])
sys.exit(1)
@@ -96,7 +96,7 @@
gitRoot=gitRoot)
return
- if decomposed['prevVersion'] == None:
+ if decomposed['prevVersion'] is None:
if not ask("No previous release found. Do you want to make a
release with no patch?"):
print 'Please specify the correct previous release on
the command line'
sys.exit(1)
@@ -140,7 +140,7 @@
def decomposeVersion(version):
ret = {}
m = re.compile('(\d+)\.(\d+)\.(\d+)$').match(version)
- if m != None:
+ if m is not None:
ret['major'] = m.group(1) + "." + m.group(2)
ret['branch'] = 'tags/' + m.group(1) + '.' + m.group(2) + '.' +
m.group(3)
if int(m.group(3)) == 0:
@@ -152,7 +152,7 @@
return ret
m = re.compile('(\d+)\.(\d+)\.(\d+)([A-Za-z]+)(\d+)$').match(version)
- if m == None:
+ if m is None:
return None
ret['major'] = m.group(1) + "." + m.group(2)
@@ -344,7 +344,7 @@
outFiles.append(makeTarFile(package, package, dir, rootDir))
# Patch
- if prevVersion != None:
+ if prevVersion is not None:
prevDir = 'mediawiki-' + prevVersion
export(prevBranch, prevDir, gitRoot)
@@ -397,7 +397,7 @@
print 'http://download.wikimedia.org/mediawiki/' + dir + '/' + package
+ '.tar.gz'
print
- if prevVersion != None:
+ if prevVersion is not None:
if haveI18n:
print "Patch to previous version (" + prevVersion + "),
without interface text:"
print 'http://download.wikimedia.org/mediawiki/' + dir
+ '/' + package + '.patch.gz'
--
To view, visit https://gerrit.wikimedia.org/r/81035
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I73d03deeeb2eac109e50918187840dcb65c4f089
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Demon <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
