Remove mono dependency from PY2 as well.

vmuriart · vmuriart · commit 198f6545f5ed · 2017-02-06T11:34:03.000-07:00
diff --git a/src/runtime/Python.Runtime.csproj b/src/runtime/Python.Runtime.csproj
@@ -116,7 +116,6 @@
 <Compile Include="modulefunctionobject.cs" />
 <Compile Include="moduleobject.cs" />
 <Compile Include="modulepropertyobject.cs" />
- <Compile Include="monosupport.cs" />
 <Compile Include="nativecall.cs" />
 <Compile Include="overload.cs" />
 <Compile Include="propertyobject.cs" />
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -1720,9 +1720,28 @@ internal unsafe static extern IntPtr
 EntryPoint = "PyUnicodeUCS4_FromUnicode",
 ExactSpelling = true)]
 internal unsafe static extern IntPtr
- PyUnicode_FromUnicode(
- [MarshalAs(UnmanagedType.CustomMarshaler,
- MarshalTypeRef = typeof(Utf32Marshaler))] string s, int size);
+ PyUnicode_FromUnicode(IntPtr s, int size);
+
+ internal static unsafe IntPtr PyUnicode_FromUnicode(string s, int size)
+{
+ var bufLength = Math.Max(s.Length, size) * 4;
+
+ IntPtr mem = Marshal.AllocHGlobal(bufLength);
+ try
+{
+ fixed (char* ps = s)
+{
+ Encoding.UTF32.GetBytes(ps, s.Length, (byte*)mem, bufLength);
+ }
+
+ var result = PyUnicode_FromUnicode(mem, bufLength);
+ return result;
+ }
+ finally
+{
+ Marshal.FreeHGlobal(mem);
+ }
+ }
 
 [DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
 EntryPoint = "PyUnicodeUCS4_GetSize",

-Original file line number
+Diff line change
  <CompileInclude="modulefunctionobject.cs" />
  <CompileInclude="moduleobject.cs" />
  <CompileInclude="modulepropertyobject.cs" />
 - <CompileInclude="monosupport.cs" />
  <CompileInclude="nativecall.cs" />
  <CompileInclude="overload.cs" />
  <CompileInclude="propertyobject.cs" />
-Original file line number
+Diff line change
 EntryPoint= "PyUnicodeUCS4_FromUnicode",
 ExactSpelling= true)]
  internal unsafe staticexternIntPtr
 - PyUnicode_FromUnicode(
 -[MarshalAs(UnmanagedType.CustomMarshaler,
 -MarshalTypeRef=typeof(Utf32Marshaler))]string s,intsize);
 + PyUnicode_FromUnicode(IntPtrs,intsize);
++
 + internal static unsafe IntPtr PyUnicode_FromUnicode(strings,intsize)
 +{
 +var bufLength =Math.Max(s.Length,size)*4;
++
 +IntPtr mem =Marshal.AllocHGlobal(bufLength);
 +try
 +{
 + fixed (char*ps= s)
 +{
 + Encoding.UTF32.GetBytes(ps,s.Length,(byte*)mem,bufLength);
 +}
++
 +var result =PyUnicode_FromUnicode(mem,bufLength);
 +returnresult;
 +}
 +finally
 +{
 +Marshal.FreeHGlobal(mem);
 +}
 +}
 [DllImport(Runtime.dll,CallingConvention=CallingConvention.Cdecl,
 EntryPoint= "PyUnicodeUCS4_GetSize",