Rebased update

vmuriart · vmuriart · commit 46b6cdaf69ad · 2017-02-28T09:23:17.000-07:00
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs
@@ -502,7 +502,7 @@ public class PySessionDisposedException: Exception
     {
 
     }
-    
+
     public class PyScope : IDisposable
     {
         public class GILState : IDisposable
@@ -669,7 +669,7 @@ public PyObject ImportAs(string name, string asname)
         public PyObject Execute(PyObject script)
         {
             IntPtr ptr = Runtime.PyEval_EvalCode(script.Handle, globals, locals);
-            Py.Throw();
+            Runtime.CheckExceptionOccurred();
             if(ptr == Runtime.PyNone)
             {
                 Runtime.XDecref(ptr);
@@ -699,7 +699,7 @@ public PyObject Compile(string code, string filename = "", RunFlagType mode = Ru
         {
             IntPtr flag = (IntPtr)mode;
             IntPtr ptr = Runtime.Py_CompileString(code, filename, flag);
-            Py.Throw();
+            Runtime.CheckExceptionOccurred();
             return new PyObject(ptr);
         }
 
@@ -717,7 +717,7 @@ public PyObject Eval(string code)
             IntPtr ptr = Runtime.PyRun_String(
                 code, flag, globals, locals
             );
-            Py.Throw();
+            Runtime.CheckExceptionOccurred();
             return new PyObject(ptr);
         }
 
@@ -745,14 +745,14 @@ public void Exec(string code)
             this.AcquireLock();
             Exec(code, this.globals, this.locals);
         }
-        
+
         private void Exec(string code, IntPtr _globals, IntPtr _locals)
         {
             var flag = (IntPtr)Runtime.Py_file_input;
             IntPtr ptr = Runtime.PyRun_String(
                 code, flag, _globals, _locals
             );
-            Py.Throw();
+            Runtime.CheckExceptionOccurred();
             if (ptr != Runtime.PyNone)
             {
                 throw new PythonException();
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -760,10 +760,8 @@ internal static extern void Py_SetPath(
         [DllImport(PythonDll)]
         internal static extern IntPtr PyRun_String(string code, IntPtr st, IntPtr globals, IntPtr locals);
 
-        [DllImport(PythonDll, CallingConvention = CallingConvention.Cdecl,
-            ExactSpelling = true, CharSet = CharSet.Ansi)]
-        internal unsafe static extern IntPtr
-            PyEval_EvalCode(IntPtr co, IntPtr globals, IntPtr locals);
+        [DllImport(PythonDll)]
+        internal static extern IntPtr PyEval_EvalCode(IntPtr co, IntPtr globals, IntPtr locals);
 
         [DllImport(PythonDll)]
         internal static extern IntPtr Py_CompileString(string code, string file, IntPtr tok);

Original file line number	Diff line number	Diff line change
`@@ -502,7 +502,7 @@ public class PySessionDisposedException: Exception`
`502`	`502`	`{`
`503`	`503`
`504`	`504`	`}`
`505`		`-`
	`505`	`+`
`506`	`506`	`public class PyScope : IDisposable`
`507`	`507`	`{`
`508`	`508`	`public class GILState : IDisposable`
`@@ -669,7 +669,7 @@ public PyObject ImportAs(string name, string asname)`
`669`	`669`	`public PyObject Execute(PyObject script)`
`670`	`670`	`{`
`671`	`671`	`IntPtr ptr = Runtime.PyEval_EvalCode(script.Handle, globals, locals);`
`672`		`- Py.Throw();`
	`672`	`+ Runtime.CheckExceptionOccurred();`
`673`	`673`	`if(ptr == Runtime.PyNone)`
`674`	`674`	`{`
`675`	`675`	`Runtime.XDecref(ptr);`
`@@ -699,7 +699,7 @@ public PyObject Compile(string code, string filename = "", RunFlagType mode = Ru`
`699`	`699`	`{`
`700`	`700`	`IntPtr flag = (IntPtr)mode;`
`701`	`701`	`IntPtr ptr = Runtime.Py_CompileString(code, filename, flag);`
`702`		`- Py.Throw();`
	`702`	`+ Runtime.CheckExceptionOccurred();`
`703`	`703`	`return new PyObject(ptr);`
`704`	`704`	`}`
`705`	`705`
`@@ -717,7 +717,7 @@ public PyObject Eval(string code)`
`717`	`717`	`IntPtr ptr = Runtime.PyRun_String(`
`718`	`718`	`code, flag, globals, locals`
`719`	`719`	`);`
`720`		`- Py.Throw();`
	`720`	`+ Runtime.CheckExceptionOccurred();`
`721`	`721`	`return new PyObject(ptr);`
`722`	`722`	`}`
`723`	`723`
`@@ -745,14 +745,14 @@ public void Exec(string code)`
`745`	`745`	`this.AcquireLock();`
`746`	`746`	`Exec(code, this.globals, this.locals);`
`747`	`747`	`}`
`748`		`-`
	`748`	`+`
`749`	`749`	`private void Exec(string code, IntPtr _globals, IntPtr _locals)`
`750`	`750`	`{`
`751`	`751`	`var flag = (IntPtr)Runtime.Py_file_input;`
`752`	`752`	`IntPtr ptr = Runtime.PyRun_String(`
`753`	`753`	`code, flag, _globals, _locals`
`754`	`754`	`);`
`755`		`- Py.Throw();`
	`755`	`+ Runtime.CheckExceptionOccurred();`
`756`	`756`	`if (ptr != Runtime.PyNone)`
`757`	`757`	`{`
`758`	`758`	`throw new PythonException();`