Finally removed compilation constants from Python.Runtime.dll + some debug.

dmitriyse · dmitriyse · commit 1ea3773a0433 · 2017-01-08T17:08:34.000+04:00
diff --git a/src/Python.Runtime.Interop/PythonRuntimeInterop.cs b/src/Python.Runtime.Interop/PythonRuntimeInterop.cs
@@ -1231,10 +1231,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 pstr, int size);
 
+        internal unsafe static 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(dll, CallingConvention = CallingConvention.Cdecl,
             EntryPoint = "PyUnicodeUCS4_GetSize",
             ExactSpelling = true, CharSet = CharSet.Ansi)]
@@ -1268,7 +1286,7 @@ internal static IntPtr PyUnicode_FromString(string s)
 
         internal unsafe static string GetManagedString(IntPtr op)
         {
-            IntPtr type = PyObject_TYPE(op);
+            IntPtr type = Runtime.PyObject_TYPE(op);
 
 // Python 3 strings are all unicode
 #if !(PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
@@ -1283,8 +1301,8 @@ internal unsafe static string GetManagedString(IntPtr op)
 
             if (type == Runtime.PyUnicodeType)
             {
-                IntPtr p = Runtime.PyUnicode_AsUnicode(op);
-                int length = Runtime.PyUnicode_GetSize(op);
+                IntPtr p = PyUnicode_AsUnicode(op);
+                int length = PyUnicode_GetSize(op);
                 int size = length*4;
                 byte[] buffer = new byte[size];
                 Marshal.Copy(p, buffer, 0, size);
@@ -2517,7 +2535,11 @@ IntPtr IPythonRuntimeInterop.PyUnicode_FromEncodedObject(IntPtr ob, IntPtr enc,
 
         IntPtr IPythonRuntimeInterop.PyUnicode_FromKindAndString(int kind, string s, int size)
         {
+#if (UCS2) && (PYTHON33 || PYTHON34 || PYTHON35)
             return PyUnicode_FromKindAndString(kind, s, size);
+#else
+            throw new NotSupportedException();
+#endif
         }
 
         IntPtr IPythonRuntimeInterop.PyUnicode_FromUnicode(string s, int size)
@@ -2530,11 +2552,6 @@ int IPythonRuntimeInterop.PyUnicode_GetSize(IntPtr ob)
             return PyUnicode_GetSize(ob);
         }
 
-        unsafe char* IPythonRuntimeInterop.PyUnicode_AsUnicode(IntPtr ob)
-        {
-            return PyUnicode_AsUnicode(ob);
-        }
-
         IntPtr IPythonRuntimeInterop.PyUnicode_AS_UNICODE(IntPtr op)
         {
             return PyUnicode_AS_UNICODE(op);
@@ -2756,7 +2773,11 @@ string IPythonRuntimeInterop.PyModule_GetFilename(IntPtr module)
 
         IntPtr IPythonRuntimeInterop.PyModule_Create2(IntPtr module, int apiver)
         {
+#if (PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
             return PyModule_Create2(module, apiver);
+#else
+            throw new NotSupportedException();
+#endif
         }
 
         IntPtr IPythonRuntimeInterop.PyImport_Import(IntPtr name)
diff --git a/src/Python.Runtime/InteropContracts/IPythonRuntimeInterop.cs b/src/Python.Runtime/InteropContracts/IPythonRuntimeInterop.cs
@@ -318,8 +318,6 @@ public interface IPythonRuntimeInterop
                         
         IntPtr PyUnicode_FromObject(IntPtr ob);
 
-        unsafe char* PyUnicode_AsUnicode(IntPtr ob);
-
         IntPtr PyUnicode_AS_UNICODE(IntPtr op);
 
         IntPtr PyUnicode_FromOrdinal(int c);
diff --git a/src/Python.Runtime/project.json b/src/Python.Runtime/project.json
@@ -2,12 +2,6 @@
   "version": "2.2.0-*",
 
   "buildOptions": {
-    "define": [ "TRACE", "DEBUG", "UCS2", "PYTHON35"],
-    "compile": {
-      "exclude": [
-        "interop33.cs"
-      ]
-    },
     "allowUnsafe": true,
     "embed": {
       "include": [ "**/*.resx", "resources/**/*" ]
diff --git a/src/Python.Runtime/runtime.cs b/src/Python.Runtime/runtime.cs
@@ -920,8 +920,6 @@ internal static IntPtr PyUnicode_FromKindAndString(int kind, string s, int size)
 
         internal static int PyUnicode_GetSize(IntPtr ob) => _interop.PyUnicode_GetSize(ob);
 
-        internal static unsafe char* PyUnicode_AsUnicode(IntPtr ob) => _interop.PyUnicode_AsUnicode(ob);
-
         internal static IntPtr PyUnicode_AS_UNICODE(IntPtr op) => _interop.PyUnicode_AS_UNICODE(op);
 
         internal static IntPtr PyUnicode_FromOrdinal(int c) => _interop.PyUnicode_FromOrdinal(c);
