Rename internal methods to proper Python API name

vmuriart · vmuriart · commit 0fdb80a7ca06 · 2017-03-01T10:13:51.000-07:00
- PyUnicode_FromKindAndString to PyUnicode_FromKindAndData
- PyString_AS_STRING to PyString_AsString
diff --git a/src/runtime/converter.cs b/src/runtime/converter.cs
@@ -498,7 +498,7 @@ private static bool ToPrimitive(IntPtr value, Type obType, out object result, bo
                     {
                         if (Runtime.PyString_Size(value) == 1)
                         {
-                            op = Runtime.PyString_AS_STRING(value);
+                            op = Runtime.PyString_AsString(value);
                             result = (byte)Marshal.ReadByte(op);
                             return true;
                         }
@@ -543,7 +543,7 @@ private static bool ToPrimitive(IntPtr value, Type obType, out object result, bo
                     {
                         if (Runtime.PyString_Size(value) == 1)
                         {
-                            op = Runtime.PyString_AS_STRING(value);
+                            op = Runtime.PyString_AsString(value);
                             result = (sbyte)Marshal.ReadByte(op);
                             return true;
                         }
@@ -588,7 +588,7 @@ private static bool ToPrimitive(IntPtr value, Type obType, out object result, bo
                     {
                         if (Runtime.PyString_Size(value) == 1)
                         {
-                            op = Runtime.PyString_AS_STRING(value);
+                            op = Runtime.PyString_AsString(value);
                             result = (char)Marshal.ReadByte(op);
                             return true;
                         }
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -1243,8 +1243,8 @@ int size
         [DllImport(PythonDll)]
         internal static extern IntPtr PyString_FromStringAndSize(string value, int size);
 
-        [DllImport(PythonDll, EntryPoint = "PyString_AsString")]
-        internal static extern IntPtr PyString_AS_STRING(IntPtr op);
+        [DllImport(PythonDll)]
+        internal static extern IntPtr PyString_AsString(IntPtr op);
 
         [DllImport(PythonDll)]
         internal static extern int PyString_Size(IntPtr pointer);
@@ -1262,16 +1262,16 @@ internal static bool PyUnicode_Check(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(
+        [DllImport(PythonDll)]
+        internal static extern IntPtr PyUnicode_FromKindAndData(
             int kind,
             [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(StrMarshaler))] string s,
             int size
         );
 
         internal static IntPtr PyUnicode_FromUnicode(string s, int size)
         {
-            return PyUnicode_FromKindAndString(UCS, s, size);
+            return PyUnicode_FromKindAndData(UCS, s, size);
         }
 
         [DllImport(PythonDll)]
@@ -1330,7 +1330,7 @@ internal static string GetManagedString(IntPtr op)
 #if PYTHON2 // Python 3 strings are all Unicode
             if (type == PyStringType)
             {
-                return Marshal.PtrToStringAnsi(PyString_AS_STRING(op), PyString_Size(op));
+                return Marshal.PtrToStringAnsi(PyString_AsString(op), PyString_Size(op));
             }
 #endif
 
diff --git a/src/runtime/typemanager.cs b/src/runtime/typemanager.cs
@@ -415,7 +415,7 @@ internal static IntPtr AllocateTypeObject(string name)
             temp = Runtime.PyUnicode_FromString(name);
 #elif PYTHON2
             IntPtr temp = Runtime.PyString_FromString(name);
-            IntPtr raw = Runtime.PyString_AS_STRING(temp);
+            IntPtr raw = Runtime.PyString_AsString(temp);
 #endif
             Marshal.WriteIntPtr(type, TypeOffset.tp_name, raw);
             Marshal.WriteIntPtr(type, TypeOffset.name, temp);

Original file line number	Diff line number	Diff line change
`@@ -498,7 +498,7 @@ private static bool ToPrimitive(IntPtr value, Type obType, out object result, bo`
`498`	`498`	`{`
`499`	`499`	`if (Runtime.PyString_Size(value) == 1)`
`500`	`500`	`{`
`501`		`- op = Runtime.PyString_AS_STRING(value);`
	`501`	`+ op = Runtime.PyString_AsString(value);`
`502`	`502`	`result = (byte)Marshal.ReadByte(op);`
`503`	`503`	`return true;`
`504`	`504`	`}`
`@@ -543,7 +543,7 @@ private static bool ToPrimitive(IntPtr value, Type obType, out object result, bo`
`543`	`543`	`{`
`544`	`544`	`if (Runtime.PyString_Size(value) == 1)`
`545`	`545`	`{`
`546`		`- op = Runtime.PyString_AS_STRING(value);`
	`546`	`+ op = Runtime.PyString_AsString(value);`
`547`	`547`	`result = (sbyte)Marshal.ReadByte(op);`
`548`	`548`	`return true;`
`549`	`549`	`}`
`@@ -588,7 +588,7 @@ private static bool ToPrimitive(IntPtr value, Type obType, out object result, bo`
`588`	`588`	`{`
`589`	`589`	`if (Runtime.PyString_Size(value) == 1)`
`590`	`590`	`{`
`591`		`- op = Runtime.PyString_AS_STRING(value);`
	`591`	`+ op = Runtime.PyString_AsString(value);`
`592`	`592`	`result = (char)Marshal.ReadByte(op);`
`593`	`593`	`return true;`
`594`	`594`	`}`