Commitbe8154f

dse

committed

Merge

2 parents866de1a +e2efdda commitbe8154fCopy full SHA for be8154f

File tree

+42

-2

lines changed

+42

-2

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].`
`8`	`8`	`##[unreleased][]`
`9`	`9`
`10`	`10`	`###Added`
	`11`	`+- Optimized implicit assembly loading on module import, PythonEngine.ImplicitAssemblyLoading event added.`
`11`	`12`	`- Added support for embedding python into dotnet core 2.0 (NetCoreApp2.0)`
`12`	`13`	`- Added new build system (pythonnet.15.sln) based on dotnetcore-sdk/xplat(crossplatform msbuild).`
`13`	`14`	`Currently there two side-by-side build systems that produces the same output (net40) from the same sources.`

Lines changed: 13 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -196,6 +196,14 @@ public static Assembly LoadAssembly(string name)`
`196`	`196`	`Assemblyassembly=null;`
`197`	`197`	`try`
`198`	`198`	`{`
	`199`	`+varimportEvent=newImplicitAssemblyLoadingEventArgs(name);`
	`200`	`+if(importEvent.SkipAssemblyLoad)`
	`201`	`+{`
	`202`	`+returnnull;`
	`203`	`+}`
	`204`	`+`
	`205`	`+PythonEngine.RaiseAssemblyAsModuleImportingEvent(importEvent);`
	`206`	`+`
`199`	`207`	`assembly=Assembly.Load(name);`
`200`	`208`	`}`
`201`	`209`	`catch(Exception)`
`@@ -419,12 +427,15 @@ public static List<string> GetNames(string nsname)`
`419`	`427`	`{`
`420`	`428`	`foreach(Assemblyainnamespaces[nsname].Keys)`
`421`	`429`	`{`
`422`		`-Type[]types=a.GetTypes();`
	`430`	`+Type[]types=a.IsDynamic?a.GetTypes():a.GetExportedTypes();`
`423`	`431`	`foreach(Typetintypes)`
`424`	`432`	`{`
`425`	`433`	`if((t.Namespace??"")==nsname)`
`426`	`434`	`{`
`427`		`-names.Add(t.Name);`
	`435`	`+if(!t.IsNested)`
	`436`	`+{`
	`437`	`+names.Add(t.Name);`
	`438`	`+}`
`428`	`439`	`}`
`429`	`440`	`}`
`430`	`441`	`}`

Lines changed: 28 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,11 @@ public static string Compiler`
`136`	`136`
`137`	`137`	`internalstaticPyReferenceDecrementerCurrentRefDecrementer{get;privateset;}`
`138`	`138`
	`139`	`+/// <summary>`
	`140`	`+/// Fires when python engines importing module and probably tries to load an assembly.`
	`141`	`+/// </summary>`
	`142`	`+publicstaticeventEventHandler<ImplicitAssemblyLoadingEventArgs>ImplicitAssemblyLoading;`
	`143`	`+`
`139`	`144`	`publicstaticintRunSimpleString(stringcode)`
`140`	`145`	`{`
`141`	`146`	`returnRuntime.PyRun_SimpleString(code);`
`@@ -549,6 +554,29 @@ internal static PyObject RunString(string code, IntPtr? globals, IntPtr? locals,`
`549`	`554`	`}`
`550`	`555`	`}`
`551`	`556`	`}`
	`557`	`+`
	`558`	`+internalstaticvoidRaiseAssemblyAsModuleImportingEvent(ImplicitAssemblyLoadingEventArgse)`
	`559`	`+{`
	`560`	`+ImplicitAssemblyLoading?.Invoke(null,e);`
	`561`	`+}`
	`562`	`+}`
	`563`	`+`
	`564`	`+publicclassImplicitAssemblyLoadingEventArgs:EventArgs`
	`565`	`+{`
	`566`	`+publicImplicitAssemblyLoadingEventArgs(stringmoduleName)`
	`567`	`+{`
	`568`	`+ModuleName=moduleName;`
	`569`	`+}`
	`570`	`+`
	`571`	`+/// <summary>`
	`572`	`+/// The name of the module to import that is probably assembly name.`
	`573`	`+/// </summary>`
	`574`	`+publicstringModuleName{get;}`
	`575`	`+`
	`576`	`+/// <summary>`
	`577`	`+/// Set it to true, if you know that <see cref="ModuleName"/> is not an assembly to import.`
	`578`	`+/// </summary>`
	`579`	`+publicboolSkipAssemblyLoad{get;set;}`
`552`	`580`	`}`
`553`	`581`
`554`	`582`	`publicenumRunFlagType`

Comments

(0)