Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Fixed double call toPyType_Ready in CLR MetaType'stp_new#1486

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
Changes fromall commits
Commits
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
7 changes: 4 additions & 3 deletionssrc/runtime/metatype.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,9 @@ public static IntPtr tp_new(IntPtr tp, IntPtr args, IntPtr kw)
return IntPtr.Zero;
}

var flags = TypeFlags.Default;
var flags = (TypeFlags)Util.ReadCLong(type, TypeOffset.tp_flags);
if (!flags.HasFlag(TypeFlags.Ready))
throw new NotSupportedException("PyType.tp_new returned an incomplete type");
flags |= TypeFlags.HasClrInstance;
flags |= TypeFlags.HeapType;
flags |= TypeFlags.BaseType;
Expand All@@ -170,8 +172,7 @@ public static IntPtr tp_new(IntPtr tp, IntPtr args, IntPtr kw)
IntPtr gc = Marshal.ReadIntPtr(base_type, Offsets.tp_clr_inst);
Marshal.WriteIntPtr(type, Offsets.tp_clr_inst, gc);

if (Runtime.PyType_Ready(type) != 0)
throw PythonException.ThrowLastAsClrException();
Runtime.PyType_Modified(new BorrowedReference(type));

return type;
}
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp