Skip to content

Add a failing test for Unicode conversion #1467

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 8 commits into from
Jun 11, 2021
Merged

Add a failing test for Unicode conversion #1467

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
da051a9
Add a failing test for Unicode conversion
Jun 8, 2021
1b6c6c0
Fix Python -> .Net unicode string conversion
pkese Jun 8, 2021
4674b5c
Add separate test for the initial problem (passing); disable failing …
pkese Jun 8, 2021
1629116
Use exclusively PyUnicode_DecodeUTF16 for .NET->Python string convers…
filmor Jun 9, 2021
df5ebc2
Activate UnicodeSurrogate test
filmor Jun 9, 2021
d084b2e
Apply suggested changes
pkese Jun 9, 2021
f061d28
Revert stuff that I don't understand
pkese Jun 9, 2021
49ccc1e
Apply code review suggestions
filmor Jun 11, 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
Next Next commit
Fix Python -> .Net unicode string conversion
  • Loading branch information
@pkese
pkese committed Jun 8, 2021
commit 1b6c6c059b5adc6b09d3673a1d4034c40902b777
7 changes: 4 additions & 3 deletions src/runtime/runtime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1646,11 +1646,12 @@ internal static string GetManagedString(IntPtr op)
if (type == PyUnicodeType)
{
using var p = PyUnicode_AsUTF16String(new BorrowedReference(op));
int length = (int)PyUnicode_GetSize(op);
char* codePoints = (char*)PyBytes_AsString(p.DangerousGetAddress());
var bytesPtr = p.DangerousGetAddress();
int bytesLength = (int)Runtime.PyBytes_Size(bytesPtr);
char* codePoints = (char*)PyBytes_AsString(bytesPtr);
Copy link
Copy Markdown
Member

@lostmsu lostmsu Jun 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NIT: better add overload for PyBytes_AsString that takes BorrowedReference. This would remove unnecessary call to DangerousGetAddress above.

return new string(codePoints,
startIndex: 1, // skip BOM
length: length);
length: bytesLength/2-1); // utf16 - BOM
}

return null;
Expand Down