Internal implement Py_CompileString for compat with CPython 3.8.0 (#1000)

amos402 · filmor · commit abbe870db593 · 2019-12-02T12:53:15.000+01:00
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs
@@ -503,7 +503,7 @@ public static PyObject ReloadModule(PyObject module)
         /// </remarks>
         public static PyObject ModuleFromString(string name, string code)
         {
-            IntPtr c = Runtime.Py_CompileString(code, "none", (IntPtr)257);
+            IntPtr c = Runtime.Py_CompileString(code, "none", (int)RunFlagType.File);
             Runtime.CheckExceptionOccurred();
             IntPtr m = Runtime.PyImport_ExecCodeModule(name, c);
             Runtime.CheckExceptionOccurred();
@@ -512,7 +512,7 @@ public static PyObject ModuleFromString(string name, string code)
 
         public static PyObject Compile(string code, string filename = "", RunFlagType mode = RunFlagType.File)
         {
-            var flag = (IntPtr)mode;
+            var flag = (int)mode;
             IntPtr ptr = Runtime.Py_CompileString(code, filename, flag);
             Runtime.CheckExceptionOccurred();
             return new PyObject(ptr);
@@ -610,7 +610,7 @@ internal static PyObject RunString(string code, IntPtr? globals, IntPtr? locals,
         }
     }
 
-    public enum RunFlagType
+    public enum RunFlagType : int
     {
         Single = 256,
         File = 257, /* Py_file_input */
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -763,8 +763,36 @@ public static extern int Py_Main(
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
         internal static extern IntPtr PyEval_EvalCode(IntPtr co, IntPtr globals, IntPtr locals);
 
+#if PYTHON2
+        [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern IntPtr Py_CompileString(string code, string file, int start);
+#else
+        /// <summary>
+        /// Return value: New reference.
+        /// This is a simplified interface to Py_CompileStringFlags() below, leaving flags set to NULL.
+        /// </summary>
+        internal static IntPtr Py_CompileString(string str, string file, int start)
+        {
+            return Py_CompileStringFlags(str, file, start, IntPtr.Zero);
+        }
+
+        /// <summary>
+        /// Return value: New reference.
+        /// This is a simplified interface to Py_CompileStringExFlags() below, with optimize set to -1.
+        /// </summary>
+        internal static IntPtr Py_CompileStringFlags(string str, string file, int start, IntPtr flags)
+        {
+            return Py_CompileStringExFlags(str, file, start, flags, -1);
+        }
+
+        /// <summary>
+        /// Return value: New reference.
+        /// Like Py_CompileStringObject(), but filename is a byte string decoded from the filesystem encoding(os.fsdecode()).
+        /// </summary>
+        /// <returns></returns>
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern IntPtr Py_CompileString(string code, string file, IntPtr tok);
+        internal static extern IntPtr Py_CompileStringExFlags(string str, string file, int start, IntPtr flags, int optimize);
+#endif
 
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
         internal static extern IntPtr PyImport_ExecCodeModule(string name, IntPtr code);

Original file line number	Diff line number	Diff line change
`@@ -503,7 +503,7 @@ public static PyObject ReloadModule(PyObject module)`
`503`	`503`	`/// </remarks>`
`504`	`504`	`public static PyObject ModuleFromString(string name, string code)`
`505`	`505`	`{`
`506`		`- IntPtr c = Runtime.Py_CompileString(code, "none", (IntPtr)257);`
	`506`	`+ IntPtr c = Runtime.Py_CompileString(code, "none", (int)RunFlagType.File);`
`507`	`507`	`Runtime.CheckExceptionOccurred();`
`508`	`508`	`IntPtr m = Runtime.PyImport_ExecCodeModule(name, c);`
`509`	`509`	`Runtime.CheckExceptionOccurred();`
`@@ -512,7 +512,7 @@ public static PyObject ModuleFromString(string name, string code)`
`512`	`512`
`513`	`513`	`public static PyObject Compile(string code, string filename = "", RunFlagType mode = RunFlagType.File)`
`514`	`514`	`{`
`515`		`- var flag = (IntPtr)mode;`
	`515`	`+ var flag = (int)mode;`
`516`	`516`	`IntPtr ptr = Runtime.Py_CompileString(code, filename, flag);`
`517`	`517`	`Runtime.CheckExceptionOccurred();`
`518`	`518`	`return new PyObject(ptr);`
`@@ -610,7 +610,7 @@ internal static PyObject RunString(string code, IntPtr? globals, IntPtr? locals,`
`610`	`610`	`}`
`611`	`611`	`}`
`612`	`612`
`613`		`- public enum RunFlagType`
	`613`	`+ public enum RunFlagType : int`
`614`	`614`	`{`
`615`	`615`	`Single = 256,`
`616`	`616`	`File = 257, /* Py_file_input */`