Skip to content

add a scope class to manage the context of interaction with Python an… #381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Jun 9, 2017
Merged

add a scope class to manage the context of interaction with Python an… #381

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
8e0b1a2
Deprecate public RunString
vmuriart Mar 3, 2017
72003aa
add a scope class to manage the context of interaction with Python an…
yagweb Feb 15, 2017
efd3798
Rename several methods and add three methods
yagweb Feb 23, 2017
9f50e25
rebased
yagweb Feb 24, 2017
add5ba8
Rebased update
vmuriart Feb 28, 2017
c15555c
format cleanup
vmuriart Feb 28, 2017
b0d57e9
create unnamed pyscope, make PyScope.GILState save
yagweb Mar 1, 2017
ceaaef0
fixup! create unnamed pyscope, make PyScope.GILState save
yagweb Mar 2, 2017
dec39c7
remove GIL and rebased
yagweb Mar 7, 2017
e117d60
Add several methods
yagweb Mar 7, 2017
904d9ed
add a Variables method
yagweb Mar 14, 2017
5484451
fixup! add a Variables method
yagweb Mar 15, 2017
2e063c2
remove private method _GetVariable
yagweb Mar 15, 2017
dd492f4
add unit test for Variables() method
yagweb Mar 15, 2017
df6a49a
add several methods and rebased
yagweb Apr 7, 2017
f35d75b
add a new class PyScopeManager
yagweb Apr 24, 2017
497d7aa
cleaned up the Import methods
yagweb Apr 28, 2017
60ce28b
Merge branch 'master' into add_scope
May 24, 2017
ebf5a2b
Merge branch 'master' into add_scope
May 24, 2017
2c3db3d
updated according to filmor's comments
yagweb May 31, 2017
30543eb
fixup! updated according to filmor's comments
yagweb May 31, 2017
b9dcdac
Get/Set Methods renamed
yagweb Jun 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rebased update
  • Loading branch information
@vmuriart @yagweb
vmuriart authored and yagweb committed Apr 7, 2017
commit add5ba8fe7ad4ef7c73ec0a3ea980a033d05e905
12 changes: 6 additions & 6 deletions src/runtime/pythonengine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ public class PySessionDisposedException: Exception
{

}

public class PyScope : IDisposable
{
public class GILState : IDisposable
Expand Down Expand Up @@ -698,7 +698,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);
Expand Down Expand Up @@ -728,7 +728,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);
}

Expand All @@ -746,7 +746,7 @@ public PyObject Eval(string code)
IntPtr ptr = Runtime.PyRun_String(
code, flag, globals, locals
);
Py.Throw();
Runtime.CheckExceptionOccurred();
return new PyObject(ptr);
}

Expand Down Expand Up @@ -774,14 +774,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();
Expand Down
6 changes: 2 additions & 4 deletions src/runtime/runtime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,10 +707,8 @@ public static extern int Py_Main(
[DllImport(PythonDll, CallingConvention = CallingConvention.Cdecl)]
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);
Expand Down