Skip to content

Commit

Permalink
configure: use sys.version_info to get python version
Browse files Browse the repository at this point in the history
This is cleaner than filtering additional strings from
platform.python_version().

PR-URL: #1504
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Jon Moss <me@jonathanmoss.me>
Reviewed-By: Rod Vagg <rod@vagg.org>
  • Loading branch information
hashseed authored and rvagg committed Aug 9, 2018
1 parent 25208f1 commit da5db40
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 19 deletions.
10 changes: 1 addition & 9 deletions lib/configure.js
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ PythonFinder.prototype = {
},

checkPythonVersion: function checkPythonVersion () {
var args = ['-c', 'import platform; print(platform.python_version());']
var args = ['-c', 'import sys; print "%s.%s.%s" % sys.version_info[:3];']
var env = extend({}, this.env)
env.TERM = 'dumb'

Expand All @@ -449,14 +449,6 @@ PythonFinder.prototype = {
'`%s -c "' + args[1] + '"` returned: %j',
this.python, stdout)
var version = stdout.trim()
if (~version.indexOf('+')) {
this.log.silly('stripping "+" sign(s) from version')
version = version.replace(/\+/g, '')
}
if (~version.indexOf('rc')) {
this.log.silly('stripping "rc" identifier from version')
version = version.replace(/rc(.*)$/ig, '')
}
var range = semver.Range('>=2.5.0 <3.0.0')
var valid = false
try {
Expand Down
20 changes: 10 additions & 10 deletions test/test-find-python.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ test('find python - python', function (t) {
}
f.execFile = function(program, args, opts, cb) {
t.strictEqual(program, 'python')
t.ok(/import platform/.test(args[1]))
t.ok(/import sys/.test(args[1]))
cb(null, '2.7.0')
}
f.checkPython()
Expand All @@ -83,7 +83,7 @@ test('find python - python too old', function (t) {
}
f.execFile = function(program, args, opts, cb) {
t.strictEqual(program, 'python')
t.ok(/import platform/.test(args[1]))
t.ok(/import sys/.test(args[1]))
cb(null, '2.3.4')
}
f.checkPython()
Expand All @@ -103,7 +103,7 @@ test('find python - python too new', function (t) {
}
f.execFile = function(program, args, opts, cb) {
t.strictEqual(program, 'python')
t.ok(/import platform/.test(args[1]))
t.ok(/import sys/.test(args[1]))
cb(null, '3.0.0')
}
f.checkPython()
Expand Down Expand Up @@ -142,7 +142,7 @@ test('find python - no python2', function (t) {
}
f.execFile = function(program, args, opts, cb) {
t.strictEqual(program, 'python')
t.ok(/import platform/.test(args[1]))
t.ok(/import sys/.test(args[1]))
cb(null, '2.7.0')
}
f.checkPython()
Expand Down Expand Up @@ -189,7 +189,7 @@ test('find python - no python, use python launcher', function (t) {
f.execFile = function(program, args, opts, cb) {
f.execFile = function(program, args, opts, cb) {
t.strictEqual(program, 'Z:\\snake.exe')
t.ok(/import platform/.test(args[1]))
t.ok(/import sys/.test(args[1]))
cb(null, '2.7.0')
}
t.strictEqual(program, 'py.exe')
Expand Down Expand Up @@ -220,7 +220,7 @@ test('find python - python 3, use python launcher', function (t) {
f.execFile = function(program, args, opts, cb) {
f.execFile = function(program, args, opts, cb) {
t.strictEqual(program, 'Z:\\snake.exe')
t.ok(/import platform/.test(args[1]))
t.ok(/import sys/.test(args[1]))
cb(null, '2.7.0')
}
t.strictEqual(program, 'py.exe')
Expand All @@ -229,7 +229,7 @@ test('find python - python 3, use python launcher', function (t) {
cb(null, 'Z:\\snake.exe')
}
t.strictEqual(program, 'python')
t.ok(/import platform/.test(args[1]))
t.ok(/import sys/.test(args[1]))
cb(null, '3.0.0')
}
f.checkPython()
Expand Down Expand Up @@ -257,7 +257,7 @@ test('find python - python 3, use python launcher, python 2 too old',
f.execFile = function(program, args, opts, cb) {
f.execFile = function(program, args, opts, cb) {
t.strictEqual(program, 'Z:\\snake.exe')
t.ok(/import platform/.test(args[1]))
t.ok(/import sys/.test(args[1]))
cb(null, '2.3.4')
}
t.strictEqual(program, 'py.exe')
Expand All @@ -266,7 +266,7 @@ test('find python - python 3, use python launcher, python 2 too old',
cb(null, 'Z:\\snake.exe')
}
t.strictEqual(program, 'python')
t.ok(/import platform/.test(args[1]))
t.ok(/import sys/.test(args[1]))
cb(null, '3.0.0')
}
f.checkPython()
Expand All @@ -291,7 +291,7 @@ test('find python - no python, no python launcher, good guess', function (t) {
f.execFile = function(program, args, opts, cb) {
f.execFile = function(program, args, opts, cb) {
t.ok(re.test(program))
t.ok(/import platform/.test(args[1]))
t.ok(/import sys/.test(args[1]))
cb(null, '2.7.0')
}
t.strictEqual(program, 'py.exe')
Expand Down

0 comments on commit da5db40

Please sign in to comment.