- Notifications
You must be signed in to change notification settings - Fork749
MovedPy
class into its own file#1649
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
197 changes: 197 additions & 0 deletionssrc/runtime/Py.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,197 @@ | ||
namespace Python.Runtime; | ||
using System; | ||
using System.Collections.Generic; | ||
using System.Linq; | ||
using System.Runtime.Serialization; | ||
using System.Threading; | ||
using Python.Runtime.Native; | ||
public static class Py | ||
{ | ||
public static GILState GIL() | ||
{ | ||
if (!PythonEngine.IsInitialized) | ||
{ | ||
PythonEngine.Initialize(); | ||
} | ||
return PythonEngine.DebugGIL ? new DebugGILState() : new GILState(); | ||
} | ||
public static PyModule CreateScope() => new(); | ||
public static PyModule CreateScope(string name) | ||
=> new(name ?? throw new ArgumentNullException(nameof(name))); | ||
public class GILState : IDisposable | ||
{ | ||
private readonly PyGILState state; | ||
private bool isDisposed; | ||
internal GILState() | ||
{ | ||
state = PythonEngine.AcquireLock(); | ||
} | ||
public virtual void Dispose() | ||
{ | ||
if (this.isDisposed) return; | ||
PythonEngine.ReleaseLock(state); | ||
GC.SuppressFinalize(this); | ||
this.isDisposed = true; | ||
} | ||
~GILState() | ||
{ | ||
throw new InvalidOperationException("GIL must always be released, and it must be released from the same thread that acquired it."); | ||
} | ||
} | ||
public class DebugGILState : GILState | ||
{ | ||
readonly Thread owner; | ||
internal DebugGILState() : base() | ||
{ | ||
this.owner = Thread.CurrentThread; | ||
} | ||
public override void Dispose() | ||
{ | ||
if (this.owner != Thread.CurrentThread) | ||
throw new InvalidOperationException("GIL must always be released from the same thread, that acquired it"); | ||
base.Dispose(); | ||
} | ||
} | ||
public class KeywordArguments : PyDict | ||
{ | ||
public KeywordArguments() : base() | ||
{ | ||
} | ||
protected KeywordArguments(SerializationInfo info, StreamingContext context) | ||
: base(info, context) { } | ||
} | ||
public static KeywordArguments kw(params object?[] kv) | ||
{ | ||
var dict = new KeywordArguments(); | ||
if (kv.Length % 2 != 0) | ||
{ | ||
throw new ArgumentException("Must have an equal number of keys and values"); | ||
} | ||
for (var i = 0; i < kv.Length; i += 2) | ||
{ | ||
var key = kv[i] as string; | ||
if (key is null) | ||
throw new ArgumentException("Keys must be non-null strings"); | ||
BorrowedReference value; | ||
NewReference temp = default; | ||
if (kv[i + 1] is PyObject pyObj) | ||
{ | ||
value = pyObj; | ||
} | ||
else | ||
{ | ||
temp = Converter.ToPythonDetectType(kv[i + 1]); | ||
value = temp.Borrow(); | ||
} | ||
using (temp) | ||
{ | ||
if (Runtime.PyDict_SetItemString(dict, key, value) != 0) | ||
{ | ||
throw new ArgumentException( | ||
string.Format("Cannot add key '{0}' to dictionary.", key), | ||
innerException: PythonException.FetchCurrent()); | ||
} | ||
} | ||
} | ||
return dict; | ||
} | ||
/// <summary> | ||
/// Given a module or package name, import the module and return the resulting object. | ||
/// </summary> | ||
/// <param name="name">Fully-qualified module or package name</param> | ||
public static PyObject Import(string name) => PyModule.Import(name); | ||
public static void SetArgv() | ||
{ | ||
IEnumerable<string> args; | ||
try | ||
{ | ||
args = Environment.GetCommandLineArgs(); | ||
} | ||
catch (NotSupportedException) | ||
{ | ||
args = Enumerable.Empty<string>(); | ||
} | ||
SetArgv( | ||
new[] { "" }.Concat( | ||
Environment.GetCommandLineArgs().Skip(1) | ||
) | ||
); | ||
} | ||
public static void SetArgv(params string[] argv) | ||
{ | ||
SetArgv(argv as IEnumerable<string>); | ||
} | ||
public static void SetArgv(IEnumerable<string> argv) | ||
{ | ||
if (argv is null) throw new ArgumentNullException(nameof(argv)); | ||
using (GIL()) | ||
{ | ||
string[] arr = argv.ToArray(); | ||
Runtime.PySys_SetArgvEx(arr.Length, arr, 0); | ||
Runtime.CheckExceptionOccurred(); | ||
} | ||
} | ||
public static void With(PyObject obj, Action<PyObject> Body) | ||
{ | ||
if (obj is null) throw new ArgumentNullException(nameof(obj)); | ||
if (Body is null) throw new ArgumentNullException(nameof(Body)); | ||
// Behavior described here: | ||
// https://docs.python.org/2/reference/datamodel.html#with-statement-context-managers | ||
Exception? ex = null; | ||
PythonException? pyError = null; | ||
try | ||
{ | ||
PyObject enterResult = obj.InvokeMethod("__enter__"); | ||
Body(enterResult); | ||
} | ||
catch (PythonException e) | ||
{ | ||
ex = pyError = e; | ||
} | ||
catch (Exception e) | ||
{ | ||
ex = e; | ||
Exceptions.SetError(e); | ||
pyError = PythonException.FetchCurrentRaw(); | ||
} | ||
PyObject type = pyError?.Type ?? PyObject.None; | ||
PyObject val = pyError?.Value ?? PyObject.None; | ||
PyObject traceBack = pyError?.Traceback ?? PyObject.None; | ||
var exitResult = obj.InvokeMethod("__exit__", type, val, traceBack); | ||
if (ex != null && !exitResult.IsTrue()) throw ex; | ||
} | ||
public static void With(PyObject obj, Action<dynamic> Body) | ||
=> With(obj, (PyObject context) => Body(context)); | ||
} |
187 changes: 0 additions & 187 deletionssrc/runtime/pythonengine.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.