fixup! fixed bug of method PyString_FromString

yagweb · yagweb · commit e9451db9a3d1 · 2018-05-11T08:39:16.000+08:00
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -1193,26 +1193,11 @@ internal static bool PyString_Check(IntPtr ob)
 
         internal static IntPtr PyString_FromString(string value)
         {
-            if (value == null)
-            {
-                return IntPtr.Zero;
-            }
-
-            byte[] bStr = Encoding.UTF8.GetBytes(value);
-            IntPtr mem = Marshal.AllocHGlobal(bStr.Length);
-            try
-            {
-                Marshal.Copy(bStr, 0, mem, bStr.Length);
-            }
-            catch (Exception)
-            {
-                Marshal.FreeHGlobal(mem);
-                throw;
-            }
-
-            IntPtr result = PyString_FromStringAndSize(mem, bStr.Length);
-            Marshal.FreeHGlobal(mem);
-            return result;
+#if PYTHON3
+            return PyUnicode_FromKindAndData(_UCS, value, value.Length);
+#elif PYTHON2
+            return PyString_FromStringAndSize(value, value.Length);
+#endif
         }
 
 #if PYTHON3
@@ -1226,14 +1211,7 @@ internal static IntPtr PyBytes_AS_STRING(IntPtr ob)
         {
             return ob + BytesOffset.ob_sval;
         }
-
-        [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl,
-            EntryPoint = "PyUnicode_FromStringAndSize")]
-        internal static extern IntPtr PyString_FromStringAndSize(
-            IntPtr value,
-            int size
-        );
-
+        
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
         internal static extern IntPtr PyUnicode_FromStringAndSize(IntPtr value, int size);
 #elif PYTHON2
