checkSyntax now uses promises

Author: Almenon

index.ts

@@ -35,6 +35,7 @@ function extend(obj:{}, ...args) {
 function getRandomInt(){
     return Math.floor(Math.random()*10000000000);
 }
+
 const execPromise = promisify(exec)
 
 export interface Options extends SpawnOptions{
@@ -236,59 +237,25 @@ export class PythonShell extends EventEmitter{
 
     /**
 	 * checks syntax without executing code
-<<<<<<< HEAD
-	 * @returns {Promise} rejects w/ stderr if syntax failure
+	 * @returns rejects promise w/ string error output if syntax failure
 	 */
 	static async checkSyntax(code:string){
         const randomInt = getRandomInt();
         const filePath = tmpdir() + sep + `pythonShellSyntaxCheck${randomInt}.py`
-        
-        // todo: replace this with util.promisify (once we no longer support node v7)
-	    return new Promise((resolve, reject) => {
-            writeFile(filePath, code, (err)=>{
-                if (err) reject(err);
-                resolve(this.checkSyntaxFile(filePath));
-            });
-        });
-    }
-    
-    static getPythonPath(){
-        return this.defaultOptions.pythonPath ? this.defaultOptions.pythonPath : this.defaultPythonPath;
-    }
-=======
-	 * @returns rejects promise w/ string error output if syntax failure
-	 */
-	static async checkSyntax(code:string){
-        let randomInt = PythonShell.getRandomInt();
-        let filePath = tmpdir() + sep + `pythonShellSyntaxCheck${randomInt}.py`
 
         const writeFilePromise = promisify(writeFile)
         return writeFilePromise(filePath, code).then(()=>{
             return this.checkSyntaxFile(filePath)
         })
 	}
->>>>>>> checkSyntax now uses promises
 
 	/**
 	 * checks syntax without executing code
 	 * @returns {Promise} rejects w/ stderr if syntax failure
 	 */
 	static async checkSyntaxFile(filePath:string){
-<<<<<<< HEAD
-
-        const pythonPath = this.getPythonPath()
-	    const compileCommand = `${pythonPath} -m py_compile ${filePath}`
-
-        return new Promise<string>((resolve, reject) => {
-            exec(compileCommand, (error, stdout, stderr) => {
-                if(error == null) resolve()
-                else reject(stderr)
-            })
-        })
-=======
 	    let compileCommand = `${this.defaultPythonPath} -m py_compile ${filePath}`
         return execPromise(compileCommand)
->>>>>>> checkSyntax now uses promises
 	}
 
     /**
@@ -327,17 +294,12 @@ export class PythonShell extends EventEmitter{
     };
 
     static getVersion(pythonPath?:string){
-<<<<<<< HEAD
-        if(!pythonPath) pythonPath = this.getPythonPath()
-        const execPromise = promisify(exec)
-=======
         if(!pythonPath) pythonPath = this.defaultPythonPath
->>>>>>> checkSyntax now uses promises
         return execPromise(pythonPath + " --version");
     }
 
     static getVersionSync(pythonPath?:string){
-        if(!pythonPath) pythonPath = this.getPythonPath()
+        if(!pythonPath) pythonPath = this.defaultPythonPath
         return execSync(pythonPath + " --version").toString()
     }