Use python macros to stay on public API for new pythons

jcpunk · stefanseefeld · commit 9ad5298d0be8 · 2020-10-16T12:35:44.000-04:00
diff --git a/src/wrapper.cpp b/src/wrapper.cpp
@@ -25,7 +25,7 @@ namespace detail
             
               if (
                   PyMethod_Check(m.get())
-                  && ((PyMethodObject*)m.get())->im_self == this->m_self
+                  && PyMethod_GET_SELF(m.get()) == this->m_self
                   && class_object->tp_dict != 0
               )
               {
@@ -34,7 +34,7 @@ namespace detail
 
 
               }
-              if (borrowed_f != ((PyMethodObject*)m.get())->im_func)
+              if (borrowed_f != PyMethod_GET_FUNCTION(m.get()))
                   return override(m);
           }
       }

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ namespace detail`
`25`	`25`
`26`	`26`	`if (`
`27`	`27`	`PyMethod_Check(m.get())`
`28`		`- && ((PyMethodObject*)m.get())->im_self == this->m_self`
	`28`	`+ && PyMethod_GET_SELF(m.get()) == this->m_self`
`29`	`29`	`&& class_object->tp_dict != 0`
`30`	`30`	`)`
`31`	`31`	`{`
`@@ -34,7 +34,7 @@ namespace detail`
`34`	`34`
`35`	`35`
`36`	`36`	`}`
`37`		`- if (borrowed_f != ((PyMethodObject*)m.get())->im_func)`
	`37`	`+ if (borrowed_f != PyMethod_GET_FUNCTION(m.get()))`
`38`	`38`	`return override(m);`
`39`	`39`	`}`
`40`	`40`	`}`