Remove internal PyUnicode_AS_UNICODE

vmuriart · vmuriart · commit edafdf2db546 · 2017-02-27T18:58:06.000-07:00
Its redundant with PyUnicode_AsUnicode now that the signature
is fixed between UCS2/UCS4.

Apply char conversion that work on both UCS2/UCS4
diff --git a/src/runtime/converter.cs b/src/runtime/converter.cs
@@ -599,21 +599,10 @@ private static bool ToPrimitive(IntPtr value, Type obType, out object result, bo
                     {
                         if (Runtime.PyUnicode_GetSize(value) == 1)
                         {
-                            op = Runtime.PyUnicode_AS_UNICODE(value);
-                            if (Runtime.UCS == 2) // Don't trust linter, statement not always true.
-                            {
-                                // 2011-01-02: Marshal as character array because the cast
-                                // result = (char)Marshal.ReadInt16(op); throws an OverflowException
-                                // on negative numbers with Check Overflow option set on the project
-                                Char[] buff = new Char[1];
-                                Marshal.Copy(op, buff, 0, 1);
-                                result = buff[0];
-                            }
-                            else // UCS4
-                            {
-                                // XXX this is probably NOT correct?
-                                result = (char)Marshal.ReadInt32(op);
-                            }
+                            op = Runtime.PyUnicode_AsUnicode(value);
+                            Char[] buff = new Char[1];
+                            Marshal.Copy(op, buff, 0, 1);
+                            result = buff[0];
                             return true;
                         }
                         goto type_error;
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -1575,12 +1575,6 @@ internal unsafe static extern int
         internal unsafe static extern IntPtr
             PyUnicode_AsUnicode(IntPtr ob);
 
-        [DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
-            EntryPoint = "PyUnicode_AsUnicode",
-            ExactSpelling = true, CharSet = CharSet.Unicode)]
-        internal unsafe static extern IntPtr
-            PyUnicode_AS_UNICODE(IntPtr op);
-
         [DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
             ExactSpelling = true, CharSet = CharSet.Unicode)]
         internal unsafe static extern IntPtr
@@ -1616,12 +1610,6 @@ internal unsafe static extern int
         internal unsafe static extern IntPtr
             PyUnicode_AsUnicode(IntPtr ob);
 
-        [DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
-            EntryPoint = "PyUnicodeUCS2_AsUnicode",
-            ExactSpelling = true, CharSet = CharSet.Unicode)]
-        internal unsafe static extern IntPtr
-            PyUnicode_AS_UNICODE(IntPtr op);
-
         [DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
             EntryPoint = "PyUnicodeUCS2_FromOrdinal",
             ExactSpelling = true, CharSet = CharSet.Unicode)]
@@ -1663,12 +1651,6 @@ internal unsafe static extern int
         internal unsafe static extern IntPtr
             PyUnicode_AsUnicode(IntPtr ob);
 
-        [DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
-            EntryPoint = "PyUnicode_AsUnicode",
-            ExactSpelling = true, CharSet = CharSet.Unicode)]
-        internal unsafe static extern IntPtr
-            PyUnicode_AS_UNICODE(IntPtr op);
-
         [DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
             ExactSpelling = true, CharSet = CharSet.Unicode)]
         internal unsafe static extern IntPtr
@@ -1707,12 +1689,6 @@ internal unsafe static extern int
         internal unsafe static extern IntPtr
             PyUnicode_AsUnicode(IntPtr ob);
 
-        [DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
-            EntryPoint = "PyUnicodeUCS4_AsUnicode",
-            ExactSpelling = true, CharSet = CharSet.Unicode)]
-        internal unsafe static extern IntPtr
-            PyUnicode_AS_UNICODE(IntPtr op);
-
         [DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
             EntryPoint = "PyUnicodeUCS4_FromOrdinal",
             ExactSpelling = true, CharSet = CharSet.Unicode)]
