Unify PY3 UCS2/UCS4 unicode methods

vmuriart · vmuriart · commit 6e9fed9f96f3 · 2017-03-01T10:12:37.000-07:00
CustomMarshal implementation deals w UCS2/4 differences
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -1243,19 +1243,23 @@ internal static bool PyUnicode_Check(IntPtr ob)
             return PyObject_TYPE(ob) == PyUnicodeType;
         }
 
-#if UCS2 && PYTHON3
+#if PYTHON3
         [DllImport(PythonDll)]
         internal static extern IntPtr PyUnicode_FromObject(IntPtr ob);
 
         [DllImport(PythonDll)]
         internal static extern IntPtr PyUnicode_FromEncodedObject(IntPtr ob, IntPtr enc, IntPtr err);
 
-        [DllImport(PythonDll, EntryPoint = "PyUnicode_FromKindAndData", CharSet = CharSet.Unicode)]
-        internal static extern IntPtr PyUnicode_FromKindAndString(int kind, string s, int size);
+        [DllImport(PythonDll, EntryPoint = "PyUnicode_FromKindAndData")]
+        internal static extern IntPtr PyUnicode_FromKindAndString(
+            int kind,
+            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(StrMarshaler))] string s,
+            int size
+        );
 
         internal static IntPtr PyUnicode_FromUnicode(string s, int size)
         {
-            return PyUnicode_FromKindAndString(2, s, size);
+            return PyUnicode_FromKindAndString(UCS, s, size);
         }
 
         [DllImport(PythonDll)]
@@ -1284,33 +1288,6 @@ internal static IntPtr PyUnicode_FromUnicode(string s, int size)
 
         [DllImport(PythonDll, EntryPoint = "PyUnicodeUCS2_FromOrdinal")]
         internal static extern IntPtr PyUnicode_FromOrdinal(int c);
-#elif UCS4 && PYTHON3
-        [DllImport(PythonDll)]
-        internal static extern IntPtr PyUnicode_FromObject(IntPtr ob);
-
-        [DllImport(PythonDll)]
-        internal static extern IntPtr PyUnicode_FromEncodedObject(IntPtr ob, IntPtr enc, IntPtr err);
-
-        [DllImport(PythonDll, EntryPoint = "PyUnicode_FromKindAndData")]
-        internal static extern IntPtr PyUnicode_FromKindAndString(
-            int kind,
-            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(StrMarshaler))] string s,
-            int size
-        );
-
-        internal static IntPtr PyUnicode_FromUnicode(string s, int size)
-        {
-            return PyUnicode_FromKindAndString(4, s, size);
-        }
-
-        [DllImport(PythonDll)]
-        internal static extern int PyUnicode_GetSize(IntPtr ob);
-
-        [DllImport(PythonDll)]
-        internal static extern IntPtr PyUnicode_AsUnicode(IntPtr ob);
-
-        [DllImport(PythonDll)]
-        internal static extern IntPtr PyUnicode_FromOrdinal(int c);
 #elif UCS4 && PYTHON2
         [DllImport(PythonDll, EntryPoint = "PyUnicodeUCS4_FromObject")]
         internal static extern IntPtr PyUnicode_FromObject(IntPtr ob);
