Fix compilation for Python 2

PyO3 · Mar 17, 2019 · 5a3466d · 5a3466d
1 parent dd8e621
commit 5a3466d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/src/ffi2/descrobject.rs b/src/ffi2/descrobject.rs
@@ -27,6 +27,8 @@ pub const PyGetSetDef_INIT: PyGetSetDef = PyGetSetDef {
     closure: ptr::null_mut(),
 };
 
+pub const PyGetSetDef_DICT: PyGetSetDef = PyGetSetDef_INIT;
+
 impl Clone for PyGetSetDef {
     #[inline]
     fn clone(&self) -> PyGetSetDef {

diff --git a/src/ffi3/descrobject.rs b/src/ffi3/descrobject.rs
@@ -1,5 +1,7 @@
 use crate::ffi3::methodobject::PyMethodDef;
-use crate::ffi3::object::{PyObject, PyTypeObject};
+use crate::ffi3::object::{
+    PyObject, PyObject_GenericGetDict, PyObject_GenericSetDict, PyTypeObject,
+};
 use crate::ffi3::structmember::PyMemberDef;
 use std::os::raw::{c_char, c_int, c_void};
 use std::ptr;
@@ -27,6 +29,14 @@ pub const PyGetSetDef_INIT: PyGetSetDef = PyGetSetDef {
     closure: ptr::null_mut(),
 };
 
+pub const PyGetSetDef_DICT: PyGetSetDef = PyGetSetDef {
+    name: "__dict__\0".as_ptr() as *mut c_char,
+    get: Some(PyObject_GenericGetDict),
+    set: Some(PyObject_GenericSetDict),
+    doc: ptr::null_mut(),
+    closure: ptr::null_mut(),
+};
+
 #[cfg_attr(windows, link(name = "pythonXY"))]
 extern "C" {
     pub static mut PyClassMethodDescr_Type: PyTypeObject;

diff --git a/src/type_object.rs b/src/type_object.rs
@@ -14,9 +14,7 @@ use crate::{class, ffi, gil};
 use class::methods::PyMethodsProtocol;
 use std::collections::HashMap;
 use std::ffi::CString;
-use std::os::raw::c_char;
 use std::os::raw::c_void;
-use std::ptr;
 use std::ptr::NonNull;
 
 /// Python type information.
@@ -397,14 +395,7 @@ where
     let mut props = py_class_properties::<T>();
 
     if cfg!(Py_3) && has_dict {
-        let dict_slot = ffi::PyGetSetDef {
-            name: "__dict__\0".as_ptr() as *mut c_char,
-            get: Some(ffi::PyObject_GenericGetDict),
-            set: Some(ffi::PyObject_GenericSetDict),
-            doc: ptr::null_mut(),
-            closure: ptr::null_mut(),
-        };
-        props.push(dict_slot);
+        props.push(ffi::PyGetSetDef_DICT);
     }
     if !props.is_empty() {
         props.push(ffi::PyGetSetDef_INIT);