Commit e17752d

committed

fix bad merge

1 parent cf88e7c commit e17752dCopy full SHA for e17752d

File tree

-3

lines changed

-3

lines changed

Lines changed: 8 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -249,12 +249,17 @@ export class PythonShell extends EventEmitter{`
`249`	`249`	`})`
`250`	`250`	`}`
`251`	`251`
	`252`	`+ static getPythonPath(){`
	`253`	`+ return this.defaultOptions.pythonPath ? this.defaultOptions.pythonPath : this.defaultPythonPath;`
	`254`	`+ }`
	`255`	`+`
`252`	`256`	`/**`
`253`	`257`	`* checks syntax without executing code`
`254`	`258`	`* @returns {Promise} rejects w/ stderr if syntax failure`
`255`	`259`	`*/`
`256`	`260`	`static async checkSyntaxFile(filePath:string){`
`257`		- let compileCommand = `${this.defaultPythonPath} -m py_compile ${filePath}`
	`261`	`+ const pythonPath = this.getPythonPath()`
	`262`	+ let compileCommand = `${pythonPath} -m py_compile ${filePath}`
`258`	`263`	`return execPromise(compileCommand)`
`259`	`264`	`}`
`260`	`265`
`@@ -294,12 +299,12 @@ export class PythonShell extends EventEmitter{`
`294`	`299`	`};`
`295`	`300`
`296`	`301`	`static getVersion(pythonPath?:string){`
`297`		`- if(!pythonPath) pythonPath = this.defaultPythonPath`
	`302`	`+ if(!pythonPath) pythonPath = this.getPythonPath()`
`298`	`303`	`return execPromise(pythonPath + " --version");`
`299`	`304`	`}`
`300`	`305`
`301`	`306`	`static getVersionSync(pythonPath?:string){`
`302`		`- if(!pythonPath) pythonPath = this.defaultPythonPath`
	`307`	`+ if(!pythonPath) pythonPath = this.getPythonPath()`
`303`	`308`	`return execSync(pythonPath + " --version").toString()`
`304`	`309`	`}`
`305`	`310`

Comments

(0)