Cut down on ifdefs (PyObject_DEL, PBG_SETATTR)

Author: stt

pybindgen/container.py

@@ -445,11 +445,7 @@ def _generate_destructor(self, code_sink):
 %s(%s *self)
 {
     %s
-    #ifdef Py_LIMITED_API
     PyObject_DEL(self);
-    #else
-    Py_TYPE(self)->tp_free((PyObject*)self);
-    #endif
 }
 ''' % (container_tp_dealloc_function_name, self.pystruct, self._get_container_delete_code()))
 
@@ -464,11 +460,7 @@ def _generate_destructor(self, code_sink):
 {
     Py_CLEAR(self->container);
     %s
-    #ifdef Py_LIMITED_API
     PyObject_DEL(self);
-    #else
-    Py_TYPE(self)->tp_free((PyObject*)self);
-    #endif
 }
 ''' % (iter_tp_dealloc_function_name, self.iter_pystruct, self._get_iter_delete_code()))
 

pybindgen/cppclass.py

@@ -2004,12 +2004,8 @@ def generate(self, code_sink, module):
                 'PyModule_AddObject(m, (char *) \"%s\", (PyObject *) _TYPEREF %s);' % (
                 class_python_name, self.pytypestruct))
         else:
-            module.after_init.write_code(
-                '#ifdef Py_LIMITED_API\n'
-                'PyObject_SetAttrString((PyObject*) %s, (char *) \"%s\", (PyObject *) %s);\n'
-                '#else\n'
-                'PyDict_SetItemString((PyObject*) %s.tp_dict, \"%s\", (PyObject *) &%s);\n'
-                '#endif\n' % (self.outer_class.pytypestruct, class_python_name, self.pytypestruct,
+            module.after_init.write_code('PBG_SETATTR(%s, \"%s\", _TYPEREF %s);\n'
+                                         % (
                               self.outer_class.pytypestruct, class_python_name, self.pytypestruct))
 
         have_constructor = self._generate_constructor(code_sink)
@@ -2578,12 +2574,7 @@ def _generate_destructor(self, code_sink, have_constructor):
         else:
             code_block.write_code(self._get_delete_code())
 
-        code_block.write_code(
-            '    #ifdef Py_LIMITED_API\n'
-            '    PyObject_DEL(self);\n'
-            '    #else\n'
-            '    Py_TYPE(self)->tp_free((PyObject*)self);\n'
-            '    #endif\n')
+        code_block.write_code('    PyObject_DEL(self);\n')
 
         code_block.write_cleanup()
 

pybindgen/enum.py

@@ -169,15 +169,10 @@ def generate(self, unused_code_sink):
                 module.after_init.write_code(
                     ' // %s\n'
                     'tmp_value = PyLong_FromLong(%s);\n'
-                    '#ifdef Py_LIMITED_API\n'
-                    'PyObject_SetAttrString((PyObject*) %s, (char *) \"%s\", tmp_value);\n'
-                    '#else\n'
-                    'PyDict_SetItemString((PyObject*) %s.tp_dict, \"%s\", tmp_value);\n'
-                    '#endif\n'
+                    'PBG_SETATTR(%s, \"%s\", tmp_value);\n'
                     'Py_DECREF(tmp_value);'
                     % (
-                      value_str, value_str, self.outer_class.pytypestruct, value_name,
-                      self.outer_class.pytypestruct, value_name))
+                      value_str, value_str, self.outer_class.pytypestruct, value_name))
             module.after_init.unindent()
             module.after_init.write_code("}")
 

pybindgen/utils.py

@@ -123,9 +123,9 @@ def write_preamble(code_sink, min_python_version=None):
 #endif
 
 #ifdef Py_LIMITED_API
-# define PBG_SETATTR(_type, _name, _value)  PyObject_SetAttrString((PyObject*) _type, (char *) _name, _value);
+# define PBG_SETATTR(_type, _name, _value)  PyObject_SetAttrString((PyObject*) _type, (char *) _name, (PyObject*) _value);
 #else
-# define PBG_SETATTR(_type, _name, _value)  PyDict_SetItemString((PyObject*) _type.tp_dict, _name, _value);
+# define PBG_SETATTR(_type, _name, _value)  PyDict_SetItemString((PyObject*) _type.tp_dict, _name, (PyObject*) _value);
 #endif
 
 #if PY_VERSION_HEX >= 0x03000000