Fix Python 3.7 support.

dgrunwald · dgrunwald · commit 78df48952f27 · 2018-08-31T19:49:01.000+02:00
Closes #144, #147.
diff --git a/python3-sys/src/ceval.rs b/python3-sys/src/ceval.rs
@@ -19,7 +19,7 @@ pub unsafe fn PyEval_CallObject(callable: *mut PyObject, arg: *mut PyObject) ->
                                format: *const c_char, ...)
      -> *mut PyObject;
     pub fn PyEval_CallMethod(obj: *mut PyObject,
-                             methodname: *const c_char,
+                             name: *const c_char,
                              format: *const c_char, ...)
      -> *mut PyObject;
     pub fn PyEval_GetBuiltins() -> *mut PyObject;
@@ -51,7 +51,7 @@ pub unsafe fn PyEval_CallObject(callable: *mut PyObject, arg: *mut PyObject) ->
     pub fn PyEval_RestoreThread(arg1: *mut PyThreadState) -> ();
 }
 
-#[cfg(py_sys_config = "WITH_THREAD")]
+#[cfg(any(Py_3_7, py_sys_config = "WITH_THREAD"))]
 #[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub fn PyEval_ThreadsInitialized() -> c_int;
     pub fn PyEval_InitThreads() -> ();
diff --git a/python3-sys/src/descrobject.rs b/python3-sys/src/descrobject.rs
@@ -16,10 +16,16 @@ pub type setter =
 #[repr(C)]
 #[derive(Copy)]
 pub struct PyGetSetDef {
+	#[cfg(not(Py_3_7))]
     pub name: *mut c_char,
+	#[cfg(Py_3_7)]
+    pub name: *const c_char,
     pub get: Option<getter>,
     pub set: Option<setter>,
+	#[cfg(not(Py_3_7))]
     pub doc: *mut c_char,
+	#[cfg(Py_3_7)]
+    pub doc: *const c_char,
     pub closure: *mut c_void,
 }
 
diff --git a/python3-sys/src/eval.rs b/python3-sys/src/eval.rs
@@ -4,10 +4,10 @@ use object::PyObject;
 #[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub fn PyEval_EvalCode(arg1: *mut PyObject, arg2: *mut PyObject,
                            arg3: *mut PyObject) -> *mut PyObject;
-    pub fn PyEval_EvalCodeEx(co: *mut PyObject, globals: *mut PyObject,
-                             locals: *mut PyObject, args: *mut *mut PyObject,
-                             argc: c_int, kwds: *mut *mut PyObject,
-                             kwdc: c_int, defs: *mut *mut PyObject,
-                             defc: c_int, kwdefs: *mut PyObject,
-                             closure: *mut PyObject) -> *mut PyObject;
+    pub fn PyEval_EvalCodeEx(co: *mut PyObject,
+                             globals: *mut PyObject, locals: *mut PyObject,
+                             args: *const *mut PyObject, argc: c_int,
+                             kwds: *const *mut PyObject, kwdc: c_int,
+                             defs: *const *mut PyObject, defc: c_int,
+                             kwdefs: *mut PyObject, closure: *mut PyObject) -> *mut PyObject;
 }
diff --git a/python3-sys/src/fileobject.rs b/python3-sys/src/fileobject.rs
@@ -21,5 +21,7 @@ pub const PY_STDIOTEXTMODE : &'static str = "b";
     #[cfg(Py_3_6)]
     pub static mut Py_FileSystemDefaultEncodeErrors: *const c_char;
     pub static mut Py_HasFileSystemDefaultEncoding: c_int;
+    #[cfg(Py_3_7)]
+    pub static mut Py_UTF8Mode: c_int;
 }
 
diff --git a/python3-sys/src/frameobject.rs b/python3-sys/src/frameobject.rs
@@ -27,10 +27,18 @@ pub struct PyFrameObject {
     pub f_stacktop: *mut *mut PyObject,
     pub f_trace: *mut PyObject,		/* Trace function */
 
+    #[cfg(not(Py_3_7))]
     pub f_exc_type: *mut PyObject,
+    #[cfg(not(Py_3_7))]
     pub f_exc_value: *mut PyObject,
+    #[cfg(not(Py_3_7))]
     pub f_exc_traceback: *mut PyObject,
 
+    #[cfg(Py_3_7)]
+    pub f_trace_lines: c_char,
+    #[cfg(Py_3_7)]
+    pub f_trace_opcodes: c_char,
+
     #[cfg(not(Py_3_4))]
     pub f_tstate: *mut PyThreadState,
 
diff --git a/python3-sys/src/import.rs b/python3-sys/src/import.rs
@@ -23,6 +23,8 @@ use object::PyObject;
                                          cpathname: *mut PyObject)
      -> *mut PyObject;
     pub fn PyImport_GetModuleDict() -> *mut PyObject;
+    #[cfg(Py_3_7)]
+    pub fn PyImport_GetModule(name: *mut PyObject) -> *mut PyObject;
     pub fn PyImport_AddModuleObject(name: *mut PyObject) -> *mut PyObject;
     pub fn PyImport_AddModule(name: *const c_char) -> *mut PyObject;
     pub fn PyImport_ImportModule(name: *const c_char)
@@ -61,6 +63,8 @@ pub unsafe fn PyImport_ImportModuleEx(name: *const c_char,
     pub fn PyImport_ImportFrozenModule(name: *const c_char)
      -> c_int;
 
+    // pub static mut PyNullImporter_Type: PyTypeObject; -- does not actually exist in shared library
+
     pub fn PyImport_AppendInittab(name: *const c_char,
                                   initfunc: Option<extern "C" fn() -> *mut PyObject>)
      -> c_int;
diff --git a/python3-sys/src/intrcheck.rs b/python3-sys/src/intrcheck.rs
@@ -1,6 +1,13 @@
 use libc::c_int;
 
 #[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
+    #[cfg(all(unix, Py_3_7))]
+    pub fn PyOS_BeforeFork() -> ();
+    #[cfg(all(unix, Py_3_7))]
+    pub fn PyOS_AfterFork_Parent() -> ();
+    #[cfg(all(unix, Py_3_7))]
+    pub fn PyOS_AfterFork_Child() -> ();
+
     pub fn PyOS_InterruptOccurred() -> c_int;
     pub fn PyOS_InitInterrupts() -> ();
     pub fn PyOS_AfterFork() -> ();
diff --git a/python3-sys/src/methodobject.rs b/python3-sys/src/methodobject.rs
@@ -16,17 +16,33 @@ pub type PyCFunction =
                               (slf: *mut PyObject, args: *mut PyObject)
                               -> *mut PyObject;
 
-#[cfg(all(Py_3_6, not(Py_LIMITED_API)))]
+#[cfg(all(Py_3_6, not(Py_LIMITED_API), not(Py_3_7)))]
 pub type _PyCFunctionFast =
     unsafe extern "C" fn
                               (slf: *mut PyObject, args: *mut *mut PyObject,
                                nargs: ::pyport::Py_ssize_t, kwnames: *mut PyObject)
                               -> *mut PyObject;
 
+#[cfg(all(Py_3_7, not(Py_LIMITED_API)))]
+pub type _PyCFunctionFast =
+    unsafe extern "C" fn(
+        slf: *mut PyObject,
+        args: *const *mut PyObject, nargs: ::pyport::Py_ssize_t
+    ) -> *mut PyObject;
+
 pub type PyCFunctionWithKeywords =
     unsafe extern "C" fn
                               (slf: *mut PyObject, args: *mut PyObject,
                                kwds: *mut PyObject) -> *mut PyObject;
+
+#[cfg(all(Py_3_7, not(Py_LIMITED_API)))]
+pub type _PyCFunctionFastWithKeywords =
+    unsafe extern "C" fn(
+        slf: *mut PyObject,
+        args: *const *mut PyObject, nargs: ::pyport::Py_ssize_t,
+        kwnames: *mut PyObject
+    ) -> *mut PyObject;
+
 pub type PyNoArgsFunction =
     unsafe extern "C" fn(slf: *mut PyObject)
                               -> *mut PyObject;
diff --git a/python3-sys/src/objectabstract.rs b/python3-sys/src/objectabstract.rs
@@ -14,23 +14,23 @@ pub unsafe fn PyObject_DelAttr(o: *mut PyObject, attr_name: *mut PyObject) -> c_
 }
 
 #[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
-    pub fn PyObject_Call(callable_object: *mut PyObject, args: *mut PyObject,
-                         kw: *mut PyObject) -> *mut PyObject;
-    pub fn PyObject_CallObject(callable_object: *mut PyObject,
+    pub fn PyObject_Call(callable: *mut PyObject, args: *mut PyObject,
+                         kwargs: *mut PyObject) -> *mut PyObject;
+    pub fn PyObject_CallObject(callable: *mut PyObject,
                                args: *mut PyObject) -> *mut PyObject;
-    pub fn PyObject_CallFunction(callable_object: *mut PyObject,
+    pub fn PyObject_CallFunction(callable: *mut PyObject,
                                  format: *const c_char, ...)
      -> *mut PyObject;
-    pub fn PyObject_CallMethod(o: *mut PyObject,
-                               method: *const c_char,
+    pub fn PyObject_CallMethod(obj: *mut PyObject,
+                               name: *const c_char,
                                format: *const c_char, ...)
      -> *mut PyObject;
-     
+
 
     pub fn PyObject_CallFunctionObjArgs(callable: *mut PyObject, ...)
      -> *mut PyObject;
-    pub fn PyObject_CallMethodObjArgs(o: *mut PyObject,
-                                      method: *mut PyObject, ...)
+    pub fn PyObject_CallMethodObjArgs(obj: *mut PyObject,
+                                      name: *mut PyObject, ...)
      -> *mut PyObject;
     pub fn PyObject_Type(o: *mut PyObject) -> *mut PyObject;
     pub fn PyObject_Size(o: *mut PyObject) -> Py_ssize_t;
diff --git a/python3-sys/src/pydebug.rs b/python3-sys/src/pydebug.rs
@@ -10,6 +10,7 @@ use libc::c_int;
     pub static mut Py_OptimizeFlag: c_int;
     pub static mut Py_NoSiteFlag: c_int;
     pub static mut Py_BytesWarningFlag: c_int;
+    #[cfg(not(Py_3_7))]
     pub static mut Py_UseClassExceptionsFlag: c_int;
     pub static mut Py_FrozenFlag: c_int;
     pub static mut Py_IgnoreEnvironmentFlag: c_int;
@@ -19,6 +20,8 @@ use libc::c_int;
     pub static mut Py_HashRandomizationFlag: c_int;
     #[cfg(Py_3_4)]
     pub static mut Py_IsolatedFlag: c_int;
+    #[cfg(all(Py_3_7, windows))]
+    pub static mut Py_LegacyWindowsFSEncodingFlag: c_int;
     #[cfg(all(Py_3_6, windows))]
     pub static mut Py_LegacyWindowsStdioFlag: c_int;
 }
diff --git a/python3-sys/src/pyerrors.rs b/python3-sys/src/pyerrors.rs
@@ -55,6 +55,7 @@ pub unsafe fn PyExceptionInstance_Class(x: *mut PyObject) -> *mut PyObject {
 #[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub static mut PyExc_BaseException: *mut PyObject;
     pub static mut PyExc_Exception: *mut PyObject;
+    #[cfg(Py_3_5)] pub static mut PyExc_StopAsyncIteration: *mut PyObject;
     pub static mut PyExc_StopIteration: *mut PyObject;
     pub static mut PyExc_GeneratorExit: *mut PyObject;
     pub static mut PyExc_ArithmeticError: *mut PyObject;
@@ -66,15 +67,15 @@ pub unsafe fn PyExceptionInstance_Class(x: *mut PyObject) -> *mut PyObject {
     pub static mut PyExc_FloatingPointError: *mut PyObject;
     pub static mut PyExc_OSError: *mut PyObject;
     pub static mut PyExc_ImportError: *mut PyObject;
-    #[cfg(Py_3_6)]
-    pub static mut PyExc_ModuleNotFoundError: *mut PyObject;
+    #[cfg(Py_3_6)] pub static mut PyExc_ModuleNotFoundError: *mut PyObject;
     pub static mut PyExc_IndexError: *mut PyObject;
     pub static mut PyExc_KeyError: *mut PyObject;
     pub static mut PyExc_KeyboardInterrupt: *mut PyObject;
     pub static mut PyExc_MemoryError: *mut PyObject;
     pub static mut PyExc_NameError: *mut PyObject;
     pub static mut PyExc_OverflowError: *mut PyObject;
     pub static mut PyExc_RuntimeError: *mut PyObject;
+    #[cfg(Py_3_5)] pub static mut PyExc_RecursionError: *mut PyObject;
     pub static mut PyExc_NotImplementedError: *mut PyObject;
     pub static mut PyExc_SyntaxError: *mut PyObject;
     pub static mut PyExc_IndentationError: *mut PyObject;
@@ -104,11 +105,15 @@ pub unsafe fn PyExceptionInstance_Class(x: *mut PyObject) -> *mut PyObject {
     pub static mut PyExc_NotADirectoryError: *mut PyObject;
     pub static mut PyExc_PermissionError: *mut PyObject;
     pub static mut PyExc_ProcessLookupError: *mut PyObject;
+
+    // Compatibility aliases
     pub static mut PyExc_TimeoutError: *mut PyObject;
     pub static mut PyExc_EnvironmentError: *mut PyObject;
     pub static mut PyExc_IOError: *mut PyObject;
     #[cfg(windows)] pub static mut PyExc_WindowsError: *mut PyObject;
-    pub static mut PyExc_RecursionErrorInst: *mut PyObject;
+    #[cfg(not(Py_3_7))] pub static mut PyExc_RecursionErrorInst: *mut PyObject;
+
+    // Predefined warning categories
     pub static mut PyExc_Warning: *mut PyObject;
     pub static mut PyExc_UserWarning: *mut PyObject;
     pub static mut PyExc_DeprecationWarning: *mut PyObject;
diff --git a/python3-sys/src/pystate.rs b/python3-sys/src/pystate.rs
@@ -1,9 +1,9 @@
-use libc::{c_int, c_long};
+use libc;
 use object::PyObject;
 use moduleobject::PyModuleDef;
 
 #[cfg(Py_3_6)]
-pub const MAX_CO_EXTRA_USERS: c_int = 255;
+pub const MAX_CO_EXTRA_USERS: libc::c_int = 255;
 
 pub enum PyInterpreterState { }
 pub enum PyThreadState { }
@@ -12,8 +12,8 @@ pub enum PyThreadState { }
     pub fn PyInterpreterState_New() -> *mut PyInterpreterState;
     pub fn PyInterpreterState_Clear(arg1: *mut PyInterpreterState) -> ();
     pub fn PyInterpreterState_Delete(arg1: *mut PyInterpreterState) -> ();
-    //fn _PyState_AddModule(arg1: *mut PyObject,
-    //                      arg2: *mut PyModuleDef) -> c_int;
+    #[cfg(Py_3_7)]
+    pub fn PyInterpreterState_GetID(arg1: *mut PyInterpreterState) -> i64;
     pub fn PyState_FindModule(arg1: *mut PyModuleDef) -> *mut PyObject;
     pub fn PyThreadState_New(arg1: *mut PyInterpreterState)
      -> *mut PyThreadState;
@@ -22,13 +22,17 @@ pub enum PyThreadState { }
     //fn _PyThreadState_Init(arg1: *mut PyThreadState) -> ();
     pub fn PyThreadState_Clear(arg1: *mut PyThreadState) -> ();
     pub fn PyThreadState_Delete(arg1: *mut PyThreadState) -> ();
-    #[cfg(py_sys_config="WITH_THREAD")]
+    #[cfg(any(Py_3_7, py_sys_config="WITH_THREAD"))]
     pub fn PyThreadState_DeleteCurrent() -> ();
     pub fn PyThreadState_Get() -> *mut PyThreadState;
     pub fn PyThreadState_Swap(arg1: *mut PyThreadState) -> *mut PyThreadState;
     pub fn PyThreadState_GetDict() -> *mut PyObject;
-    pub fn PyThreadState_SetAsyncExc(arg1: c_long,
-                                     arg2: *mut PyObject) -> c_int;
+    #[cfg(not(Py_3_7))]
+    pub fn PyThreadState_SetAsyncExc(arg1: libc::c_long,
+                                     arg2: *mut PyObject) -> libc::c_int;
+    #[cfg(Py_3_7)]
+    pub fn PyThreadState_SetAsyncExc(arg1: libc::c_ulong,
+                                     arg2: *mut PyObject) -> libc::c_int;
 }
 
 #[repr(C)]
@@ -38,6 +42,7 @@ pub enum PyGILState_STATE {
     PyGILState_UNLOCKED
 }
 
+#[cfg(any(Py_3_7, py_sys_config="WITH_THREAD"))]
 #[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub fn PyGILState_Ensure() -> PyGILState_STATE;
     pub fn PyGILState_Release(arg1: PyGILState_STATE) -> ();
diff --git a/python3-sys/src/pythonrun.rs b/python3-sys/src/pythonrun.rs
@@ -6,9 +6,9 @@ use pystate::PyThreadState;
 use pyarena::PyArena;
 
 #[cfg_attr(windows, link(name="pythonXY"))] extern "C" { // TODO: these moved to pylifecycle.h
-    pub fn Py_SetProgramName(arg1: *mut wchar_t) -> ();
+    pub fn Py_SetProgramName(arg1: *const wchar_t) -> ();
     pub fn Py_GetProgramName() -> *mut wchar_t;
-    pub fn Py_SetPythonHome(arg1: *mut wchar_t) -> ();
+    pub fn Py_SetPythonHome(arg1: *const wchar_t) -> ();
     pub fn Py_GetPythonHome() -> *mut wchar_t;
     pub fn Py_Initialize() -> ();
     pub fn Py_InitializeEx(arg1: c_int) -> ();
@@ -18,7 +18,7 @@ use pyarena::PyArena;
     pub fn Py_EndInterpreter(arg1: *mut PyThreadState) -> ();
 }
 
-// Note: PyCompilerFlags was moved to compile.h in PYthon 3.7;
+// Note: PyCompilerFlags was moved to compile.h in Python 3.7;
 // We still have our version in pythonrun.rs
 #[repr(C)]
 #[derive(Copy, Clone)]
diff --git a/python3-sys/src/sliceobject.rs b/python3-sys/src/sliceobject.rs
@@ -33,10 +33,10 @@ pub unsafe fn PySlice_Check(op: *mut PyObject) -> c_int {
                                 slicelength: *mut Py_ssize_t)
      -> c_int;
 	
-	#[cfg(Py_3_7)] // available since 3.6.1, but we don't have a cfg for the point releases
+	#[cfg(Py_3_7)] // available since 3.5.4/3.6.1, but we don't have a cfg for the point releases
 	pub fn PySlice_Unpack(slice: *mut PyObject,
                           start: *mut Py_ssize_t, stop: *mut Py_ssize_t, step: *mut Py_ssize_t) -> c_int;
-	#[cfg(Py_3_7)] // available since 3.6.1, but we don't have a cfg for the point releases
+	#[cfg(Py_3_7)] // available since 3.5.4/3.6.1, but we don't have a cfg for the point releases
 	pub fn PySlice_AdjustIndices(length: Py_ssize_t,
 								 start: *mut Py_ssize_t, stop: *mut Py_ssize_t,
 								 step: Py_ssize_t) -> Py_ssize_t;
diff --git a/python3-sys/src/tupleobject.rs b/python3-sys/src/tupleobject.rs
@@ -47,6 +47,7 @@ pub unsafe fn PyTuple_GET_ITEM(op: *mut PyObject, i: Py_ssize_t) -> *mut PyObjec
 #[inline(always)]
 #[cfg(not(Py_LIMITED_API))]
 pub unsafe fn PyTuple_GET_SIZE(op: *mut PyObject) -> Py_ssize_t {
+    debug_assert!(PyTuple_Check(op) != 0);
     Py_SIZE(op)
 }
 
diff --git a/src/pythonrun.rs b/src/pythonrun.rs
@@ -54,8 +54,13 @@ pub fn prepare_freethreaded_python() {
             // as we can't make the existing Python main thread acquire the GIL.
             assert!(ffi::PyEval_ThreadsInitialized() != 0);
         } else {
-            // If Python isn't initialized yet, we expect that Python threading isn't initialized either.
-            assert!(ffi::PyEval_ThreadsInitialized() == 0);
+            #[cfg(feature="python27-sys")] {
+                // If Python isn't initialized yet, we expect that Python threading isn't initialized either.
+                assert!(ffi::PyEval_ThreadsInitialized() == 0);
+                // Note: starting with Python 3.2 it's no longer possible to initialize threading
+                // without initializing Python; and in Python 3.7 PyEval_ThreadsInitialized() started
+                // misbehaving when Python was not initialized yet.
+            }
             // Initialize Python.
             // We use Py_InitializeEx() with initsigs=0 to disable Python signal handling.
             // Signal handling depends on the notion of a 'main thread', which doesn't exist in this case.

Original file line number	Diff line number	Diff line change
`@@ -21,5 +21,7 @@ pub const PY_STDIOTEXTMODE : &'static str = "b";`
`21`	`21`	`#[cfg(Py_3_6)]`
`22`	`22`	`pub static mut Py_FileSystemDefaultEncodeErrors: *const c_char;`
`23`	`23`	`pub static mut Py_HasFileSystemDefaultEncoding: c_int;`
	`24`	`+ #[cfg(Py_3_7)]`
	`25`	`+ pub static mut Py_UTF8Mode: c_int;`
`24`	`26`	`}`
`25`	`27`