Skip to content

[WIP] Add ability to create module from C# #1447

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 7 commits into from
Jul 29, 2021
Merged

[WIP] Add ability to create module from C# #1447

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ea87103
Add ability to create module from C#
slide Apr 21, 2021
807252a
Merge branch 'master' of https://github.com/pythonnet/pythonnet into …
slide Apr 26, 2021
bf679dc
Move to PyModule and add test
slide Apr 26, 2021
a5218ed
Merge remote-tracking branch 'origin/master' into addmodule
slide Jul 27, 2021
f872b3d
Changes based on feedback
slide Jul 27, 2021
d4a32ed
Fix some of the feedback
slide Jul 28, 2021
ab0cedb
More feedback fixup
slide Jul 29, 2021
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
More feedback fixup
  • Loading branch information
@slide
slide committed Jul 29, 2021
commit ab0cedb848c1feade97d8c1f63c6430143ee7fb2
7 changes: 4 additions & 3 deletions src/embed_tests/TestPyModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,13 @@ public void TestCreate()
{
using PyScope scope = Py.CreateScope();

Assert.IsFalse(PyModule.IsInSysModules("testmod"));
Assert.IsFalse(PyModule.SysModules.HasKey("testmod"));

PyModule testmod = new PyModule("testmod");

PyModule testmod = PyModule.Create("testmod");
testmod.SetAttr("testattr1", "True".ToPython());

testmod.AddToSysModules();
PyModule.SysModules.SetItem("testmod", testmod);

using PyObject code = PythonEngine.Compile(
"import testmod\n" +
Expand Down
39 changes: 19 additions & 20 deletions src/runtime/pymodule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ public class PyModule : PyScope
{
internal PyModule(ref NewReference reference) : base(ref reference, PyScopeManager.Global) { }
public PyModule(PyObject o) : base(o.Reference, PyScopeManager.Global) { }
public PyModule(string name, string filename = null) : this(Create(name, filename)) { }

/// <summary>
/// Given a module or package name, import the
Expand All @@ -32,13 +33,6 @@ public PyModule Reload()
return new PyModule(ref op);
}

public void AddToSysModules()
{
BorrowedReference modules = Runtime.PyImport_GetModuleDict();
int rc = Runtime.PyDict_SetItemString(modules, this.Name, this.Reference);
PythonException.ThrowIfIsNotZero(rc);
}

public static PyModule FromString(string name, string code)
{
using NewReference c = Runtime.Py_CompileString(code, "none", (int)RunFlagType.File);
Expand All @@ -48,15 +42,7 @@ public static PyModule FromString(string name, string code)
return new PyModule(ref m);
}

public static bool IsInSysModules(string name)
{
// first check if there is an existing module
BorrowedReference modules = Runtime.PyImport_GetModuleDict();
BorrowedReference m = Runtime.PyDict_GetItemString(modules, name);
return !m.IsNull && Runtime.PyObject_TypeCheck(m, new BorrowedReference(Runtime.PyModuleType));
}

public static PyModule Create(string name, string filename=null)
private static PyModule Create(string name, string filename=null)
{
if(string.IsNullOrWhiteSpace(name))
{
Expand All @@ -77,14 +63,27 @@ public static PyModule Create(string name, string filename=null)
return new PyModule(ref op);
}

public void AddBuiltins()
public void SetBuiltins(PyDict builtins)
{
if(builtins == null || builtins.IsNone())
{
throw new ArgumentNullException(nameof(builtins));
}

BorrowedReference globals = Runtime.PyModule_GetDict(this.Reference);
PythonException.ThrowIfIsNull(globals);
BorrowedReference __builtins__ = Runtime.PyEval_GetBuiltins();
PythonException.ThrowIfIsNull(__builtins__);
int rc = Runtime.PyDict_SetItemString(globals, "__builtins__", __builtins__);
int rc = Runtime.PyDict_SetItemString(globals, "__builtins__", builtins.Reference);
PythonException.ThrowIfIsNotZero(rc);
}

public static PyDict SysModules
{
get
{
BorrowedReference sysModulesRef = Runtime.PyImport_GetModuleDict();
PythonException.ThrowIfIsNull(sysModulesRef);
return new PyDict(sysModulesRef);
}
}
}
}
10 changes: 10 additions & 0 deletions src/runtime/runtime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2280,6 +2280,16 @@ internal static IntPtr GetBuiltins()
return PyImport_Import(PyIdentifier.builtins);
}

public static PyDict Builtins
{
get
{
BorrowedReference builtins = PyEval_GetBuiltins();
PythonException.ThrowIfIsNull(builtins);
return new PyDict(builtins);
}
}

internal static class Delegates
{
static readonly ILibraryLoader libraryLoader = LibraryLoader.Instance;
Expand Down