disable stopInterpreter function for now

fridgerator · Oct 16, 2019 · 60d3bc8 · 60d3bc8
1 parent e54860c
commit 60d3bc8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -15,7 +15,7 @@ declare module '@fridgerator/pynode' {
   /**
    * Stops the Python interpreter
    */
-  export function stopInterpreter(pythonpath?: string): void;
+  // export function stopInterpreter(pythonpath?: string): void;
 
   /**
    * Add an additional path as a python module search path

diff --git a/src/main.cpp b/src/main.cpp
@@ -93,9 +93,9 @@ void stopInterpreter(const v8::FunctionCallbackInfo<v8::Value>& info)
 
   auto isInitialized = Py_IsInitialized();
   if (isInitialized == 0) return;
-  Py_Finalize();
   Py_DECREF(data->pModule);
   data->pModule = NULL;
+  Py_Finalize();
 }
 
 void appendSysPath(const Nan::FunctionCallbackInfo<v8::Value> &args)
@@ -158,7 +158,13 @@ void eval(const Nan::FunctionCallbackInfo<v8::Value> &args)
   }
 
   Nan::Utf8String statement(args[0]);
-  int response = PyRun_SimpleString(*statement);
+  int response;
+  {
+    py_context ctx;
+
+    response = PyRun_SimpleString(*statement);
+  }
+  // int response = PyRun_SimpleString(*statement);
   args.GetReturnValue().Set(Nan::New(response));
 }
 
@@ -381,11 +387,11 @@ NODE_MODULE_INITIALIZER(v8::Local<v8::Object> exports,
                v8::FunctionTemplate::New(isolate, startInterpreter, external)
                   ->GetFunction(context).ToLocalChecked()).FromJust();
 
-  exports->Set(context,
-               v8::String::NewFromUtf8(isolate, "stopInterpreter", v8::NewStringType::kNormal)
-                  .ToLocalChecked(),
-               v8::FunctionTemplate::New(isolate, stopInterpreter, external)
-                  ->GetFunction(context).ToLocalChecked()).FromJust();
+  // exports->Set(context,
+  //              v8::String::NewFromUtf8(isolate, "stopInterpreter", v8::NewStringType::kNormal)
+  //                 .ToLocalChecked(),
+  //              v8::FunctionTemplate::New(isolate, stopInterpreter, external)
+  //                 ->GetFunction(context).ToLocalChecked()).FromJust();
 
   exports->Set(context,
                v8::String::NewFromUtf8(isolate, "openFile", v8::NewStringType::kNormal)

diff --git a/test.js b/test.js
@@ -262,9 +262,9 @@ describe('nodePython', () => {
     })
   })
 
-  describe('stopInterpreter', () => {
-    it('should stop the interpreter', () => {
-      nodePython.stopInterpreter()
-    })
-  })
+  // describe('stopInterpreter', () => {
+  //   it('should stop the interpreter', () => {
+  //     nodePython.stopInterpreter()
+  //   })
+  // })
 })