Commitcac82a6

authored

ABI.Initialize gives a helpful message when the TypeOffset interop class is not configured correctly (#1340)

+ Added LoadNativeTypeOffsetClass test* Remove reference to PythonInteropFile

1 parent1f40564 commitcac82a6Copy full SHA for cac82a6

File tree

+55

-7

lines changed

+55

-7

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,10 @@`
`12`	`12`	`<NoneInclude="fixtures/*/.py"CopyToOutputDirectory="PreserveNewest" />`
`13`	`13`	`</ItemGroup>`
`14`	`14`
	`15`	`+ <PropertyGroup>`
	`16`	`+ <DefineConstants>$(DefineConstants);$(ConfiguredConstants)</DefineConstants>`
	`17`	`+ </PropertyGroup>`
	`18`	`+`
`15`	`19`	`<ItemGroup>`
`16`	`20`	`<PackageReferenceInclude="NUnit"Version="3.*" />`
`17`	`21`	`<PackageReferenceInclude="NUnit3TestAdapter"Version="3.*">`

Lines changed: 45 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,45 @@`
	`1`	`+usingSystem;`
	`2`	`+usingSystem.Collections.Generic;`
	`3`	`+usingSystem.Linq;`
	`4`	`+usingSystem.Reflection;`
	`5`	`+usingSystem.Text;`
	`6`	`+usingSystem.Threading.Tasks;`
	`7`	`+`
	`8`	`+usingNUnit.Framework;`
	`9`	`+`
	`10`	`+usingPython.Runtime;`
	`11`	`+`
	`12`	`+namespacePython.EmbeddingPythonTest`
	`13`	`+{`
	`14`	`+publicclassTestNativeTypeOffset`
	`15`	`+{`
	`16`	`+privatePy.GILState_gs;`
	`17`	`+`
	`18`	`+[SetUp]`
	`19`	`+publicvoidSetUp()`
	`20`	`+{`
	`21`	`+_gs=Py.GIL();`
	`22`	`+}`
	`23`	`+`
	`24`	`+[TearDown]`
	`25`	`+publicvoidDispose()`
	`26`	`+{`
	`27`	`+_gs.Dispose();`
	`28`	`+}`
	`29`	`+`
	`30`	`+/// <summary>`
	`31`	`+/// Tests that installation has generated code for NativeTypeOffset and that it can be loaded.`
	`32`	`+/// </summary>`
	`33`	`+[Test]`
	`34`	`+publicvoidLoadNativeTypeOffsetClass()`
	`35`	`+{`
	`36`	`+PyObjectsys=Py.Import("sys");`
	`37`	`+stringattributeName="abiflags";`
	`38`	`+if(sys.HasAttr(attributeName)&&!string.IsNullOrEmpty(sys.GetAttr(attributeName).ToString()))`
	`39`	`+{`
	`40`	`+stringtypeName="Python.Runtime.NativeTypeOffset, Python.Runtime";`
	`41`	`+Assert.NotNull(Type.GetType(typeName),$"{typeName} does not exist and sys.{attributeName} is not empty");`
	`42`	`+}`
	`43`	`+}`
	`44`	`+}`
	`45`	`+}`

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,6 @@`
`19`	`19`	`<DefineConstants>$(DefineConstants);$(ConfiguredConstants)</DefineConstants>`
`20`	`20`	`</PropertyGroup>`
`21`	`21`
`22`		`- <ItemGroupCondition=" '$(PythonInteropFile)' != ''">`
`23`		`- <CompileRemove="interop*.cs" />`
`24`		`- <CompileInclude="interop.cs" />`
`25`		`- <CompileInclude="$(PythonInteropFile)" />`
`26`		`- </ItemGroup>`
`27`		`-`
`28`	`22`	`<ItemGroup>`
`29`	`23`	`<NoneRemove="resources\clr.py" />`
`30`	`24`	`<EmbeddedResourceInclude="resources\clr.py">`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,12 @@ internal static void Initialize(Version version, BorrowedReference pyType)`
`22`	`22`	`thisAssembly.GetType(nativeTypeOffsetClassName,throwOnError:false)`
`23`	`23`	`??thisAssembly.GetType(className,throwOnError:false);`
`24`	`24`	`if(typeOffsetsClassisnull)`
`25`		`-thrownewNotSupportedException($"Python ABI v{version} is not supported");`
	`25`	`+{`
	`26`	`+vartypes=thisAssembly.GetTypes().Select(type=>type.Name).Where(name=>name.StartsWith("TypeOffset"));`
	`27`	`+stringmessage=$"Searching for{className}, found{string.Join(",",types)}. "+`
	`28`	`+"If you are building Python.NET from source, make sure you have run 'python setup.py configure' to fill in configured.props";`
	`29`	`+thrownewNotSupportedException($"Python ABI v{version} is not supported:{message}");`
	`30`	`+}`
`26`	`31`	`vartypeOffsets=(ITypeOffsets)Activator.CreateInstance(typeOffsetsClass);`
`27`	`32`	`TypeOffset.Use(typeOffsets);`
`28`	`33`

Comments

(0)