Skip to content

Modernisation #1015

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

Closed
filmor wants to merge 22 commits into from
Closed

Modernisation #1015

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
5a45156
Drop monoclr and clrmodule
filmor Nov 9, 2019
2f07774
Add stub module
filmor Nov 26, 2019
a5e6aca
Move projects around and add clean project/solution files
filmor Nov 26, 2019
95f07f0
Drop nuget config
filmor Nov 26, 2019
04ab475
Adjust embed test project
filmor Nov 26, 2019
627c4c4
Add test helper project
filmor Nov 26, 2019
c0415be
Readd benchmark project
filmor Nov 26, 2019
3031e96
Update setup.py
filmor Nov 26, 2019
8aba5fc
Drop PYTHON3 flag (default now)
filmor Dec 14, 2019
e933e79
Remove unneeded additional interop files
filmor Dec 14, 2019
f27d7be
Make NETSTANDARD the default
filmor Dec 15, 2019
52caf17
Add very simple initial load in pythonnet
filmor Dec 15, 2019
ca99b17
Remove Runtime._UCS dependency from CustomMarshaler
filmor Dec 15, 2019
146e6ac
Stop using Runtime.IsPython2/3
filmor Dec 15, 2019
e61dd72
Start implementing interface ILibPython
filmor Dec 16, 2019
0185bcb
Make the code compile with ILibPython
filmor Dec 16, 2019
908f0f0
Move interface to separate DLL for simpler dynamic loading
filmor Dec 16, 2019
946b9a0
Add template to generate PInvoke-based implementation
filmor Dec 17, 2019
60d15cd
Make setup.py work again
filmor Dec 17, 2019
5753d38
Drop InitializePlatformData
filmor Dec 18, 2019
41577fc
Fix define for interop2, add comment on interop3
filmor Dec 18, 2019
22a24a4
First try on loading the correct 'DLL' on .NET Core
filmor Dec 18, 2019
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
Start implementing interface ILibPython
  • Loading branch information
@filmor
filmor committed Dec 16, 2019
commit e61dd723ae505da263fe7c275c55684f0639fbfd
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,5 @@ cov-int/
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json

pythonnet/dlls
18 changes: 12 additions & 6 deletions Python.Runtime/CustomMarshaler.cs → Python.Runtime.Native/CustomMarshaler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,22 @@
using System.Runtime.InteropServices;
using System.Text;

namespace Python.Runtime
namespace Python.Runtime.Native
{
/// <summary>
/// Abstract class defining boiler plate methods that
/// Custom Marshalers will use.
/// </summary>
internal abstract class MarshalerBase : ICustomMarshaler
{
#if UCS2 && PYTHON2
internal static Encoding PyEncoding = Encoding.Unicode;
internal static int UCS = 2;
#else
internal static Encoding PyEncoding = Encoding.UTF32;
internal static int UCS = 4;
#endif

public object MarshalNativeToManaged(IntPtr pNativeData)
{
throw new NotImplementedException();
Expand Down Expand Up @@ -42,7 +50,6 @@ public int GetNativeDataSize()
internal class UcsMarshaler : MarshalerBase
{
private static readonly MarshalerBase Instance = new UcsMarshaler();
private static readonly Encoding PyEncoding = Runtime.PyEncoding;

public override IntPtr MarshalManagedToNative(object managedObj)
{
Expand Down Expand Up @@ -91,15 +98,15 @@ public static int GetUnicodeByteLength(IntPtr p)
var len = 0;
while (true)
{
#if UCS2
#if UCS2 && PYTHON2
int c = Marshal.ReadInt16(p, len * 2);
#else
int c = Marshal.ReadInt32(p, len * 4);
#endif

if (c == 0)
{
return len * Runtime._UCS;
return len * UCS;
}
checked
{
Expand Down Expand Up @@ -157,7 +164,6 @@ public static string PtrToPy3UnicodePy2String(IntPtr p)
internal class StrArrayMarshaler : MarshalerBase
{
private static readonly MarshalerBase Instance = new StrArrayMarshaler();
private static readonly Encoding PyEncoding = Runtime.PyEncoding;

public override IntPtr MarshalManagedToNative(object managedObj)
{
Expand All @@ -169,7 +175,7 @@ public override IntPtr MarshalManagedToNative(object managedObj)
}

int totalStrLength = argv.Sum(arg => arg.Length + 1);
int memSize = argv.Length * IntPtr.Size + totalStrLength * Runtime._UCS;
int memSize = argv.Length * IntPtr.Size + totalStrLength * UCS;

IntPtr mem = Marshal.AllocHGlobal(memSize);
try
Expand Down
Loading