Skip to content

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

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
lostmsu merged 7 commits into from
Jan 4, 2021
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8f66882
Initialize gives a helpful message when the TypeOffset interop class …
tminka Dec 30, 2020
f82d963
Changed advice to run 'python setup.py configure'
tminka Dec 31, 2020
f59e5d0
Added LoadNativeTypeOffsetClass
tminka Jan 1, 2021
16042e8
Python.Runtime.csproj includes PythonInteropFile
tminka Jan 3, 2021
48c63e7
LoadNativeTypeOffsetClass checks for sys.abiflags
tminka Jan 3, 2021
3590d06
Fix typeName in LoadNativeTypeOffsetClass
tminka Jan 3, 2021
7701005
Remove reference to PythonInteropFile
tminka Jan 3, 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
6 changes: 0 additions & 6 deletions src/runtime/Python.Runtime.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@
<DefineConstants>$(DefineConstants);$(ConfiguredConstants)</DefineConstants>
</PropertyGroup>

<ItemGroup Condition=" '$(PythonInteropFile)' != '' ">
<Compile Remove="interop*.cs" />
<Compile Include="interop.cs" />
<Compile Include="$(PythonInteropFile)" />
Comment thread
tminka marked this conversation as resolved.
</ItemGroup>

<ItemGroup>
<None Remove="resources\clr.py" />
<EmbeddedResource Include="resources\clr.py">
Expand Down
7 changes: 6 additions & 1 deletion src/runtime/native/ABI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@ internal static void Initialize(Version version, BorrowedReference pyType)
thisAssembly.GetType(nativeTypeOffsetClassName, throwOnError: false)
?? thisAssembly.GetType(className, throwOnError: false);
if (typeOffsetsClass is null)
throw new NotSupportedException($"Python ABI v{version} is not supported");
{
var types = thisAssembly.GetTypes().Select(type => type.Name).Where(name => name.StartsWith("TypeOffset"));
string message = $"Searching for {className}, found {string.Join(",", types)}. " +
"If you are building Python.NET from source, make sure you have run 'python setup.py configure' to fill in configured.props";
throw new NotSupportedException($"Python ABI v{version} is not supported: {message}");
}
var typeOffsets = (ITypeOffsets)Activator.CreateInstance(typeOffsetsClass);
TypeOffset.Use(typeOffsets);

Expand Down