remove python 2 code bits

Signed-off-by: oleg.hoefling <[email protected]>

Author: hoefling

src/constants.c

@@ -245,15 +245,13 @@ static PyObject* PyXmlSec_KeyDataNew(xmlSecKeyDataId id) {
     return (PyObject*)keydata;
 }
 
-#ifdef PY3K
 static PyModuleDef PyXmlSec_ConstantsModule =
 {
     PyModuleDef_HEAD_INIT,
     STRINGIFY(MODULE_NAME) ".constants",
     PYXMLSEC_CONSTANTS_DOC,
     -1, NULL, NULL, NULL, NULL, NULL
 };
-#endif  // PY3K
 
 // initialize constants module and registers it base package
 int PyXmlSec_ConstantsModule_Init(PyObject* package) {
@@ -267,12 +265,7 @@ int PyXmlSec_ConstantsModule_Init(PyObject* package) {
     PyObject* keyDataTypeCls = NULL;
     PyObject* tmp = NULL;
 
-#ifdef PY3K
     constants = PyModule_Create(&PyXmlSec_ConstantsModule);
-#else
-    constants = Py_InitModule3(STRINGIFY(MODULE_NAME) ".constants", NULL, PYXMLSEC_CONSTANTS_DOC);
-    Py_XINCREF(constants);
-#endif
 
     if (!constants) return -1;
 

src/main.c

@@ -203,8 +203,6 @@ int PyXmlSec_EncModule_Init(PyObject* package);
 // templates management
 int PyXmlSec_TemplateModule_Init(PyObject* package);
 
-#ifdef PY3K
-
 static int PyXmlSec_PyClear(PyObject *self) {
     PyXmlSec_Free(free_mode);
     return 0;
@@ -225,54 +223,12 @@ static PyModuleDef PyXmlSecModule = {
 
 #define PYENTRY_FUNC_NAME JOIN(PyInit_, MODULE_NAME)
 #define PY_MOD_RETURN(m) return m
-#else // PY3K
-#define PYENTRY_FUNC_NAME JOIN(init, MODULE_NAME)
-#define PY_MOD_RETURN(m) return
-
-static void PyXmlSec_PyModuleGuard__del__(PyObject* self)
-{
-    PyXmlSec_Free(free_mode);
-    Py_TYPE(self)->tp_free(self);
-}
-
-// we need guard to free resources on module unload
-typedef struct {
-    PyObject_HEAD
-} PyXmlSec_PyModuleGuard;
-
-static PyTypeObject PyXmlSec_PyModuleGuardType = {
-    PyVarObject_HEAD_INIT(NULL, 0)
-    STRINGIFY(MODULE_NAME) "__Guard",              /* tp_name */
-    sizeof(PyXmlSec_PyModuleGuard),                /* tp_basicsize */
-    0,                                             /* tp_itemsize */
-    PyXmlSec_PyModuleGuard__del__,                 /* tp_dealloc */
-    0,                                             /* tp_print */
-    0,                                             /* tp_getattr */
-    0,                                             /* tp_setattr */
-    0,                                             /* tp_reserved */
-    0,                                             /* tp_repr */
-    0,                                             /* tp_as_number */
-    0,                                             /* tp_as_sequence */
-    0,                                             /* tp_as_mapping */
-    0,                                             /* tp_hash  */
-    0,                                             /* tp_call */
-    0,                                             /* tp_str */
-    0,                                             /* tp_getattro */
-    0,                                             /* tp_setattro */
-    0,                                             /* tp_as_buffer */
-    Py_TPFLAGS_DEFAULT,                            /* tp_flags */
-};
-#endif  // PY3K
 
 PyMODINIT_FUNC
 PYENTRY_FUNC_NAME(void)
 {
     PyObject *module = NULL;
-#ifdef PY3K
     module = PyModule_Create(&PyXmlSecModule);
-#else
-    module = Py_InitModule3(STRINGIFY(MODULE_NAME), PyXmlSec_MainMethods, MODULE_DOC);
-#endif
     if (!module) {
         PY_MOD_RETURN(NULL); /* this really should never happen */
     }
@@ -294,13 +250,6 @@ PYENTRY_FUNC_NAME(void)
     if (PyXmlSec_EncModule_Init(module) < 0) goto ON_FAIL;
     if (PyXmlSec_TemplateModule_Init(module) < 0) goto ON_FAIL;
 
-#ifndef PY3K
-    if (PyType_Ready(&PyXmlSec_PyModuleGuardType) < 0) goto ON_FAIL;
-    PYXMLSEC_DEBUGF("%p", &PyXmlSec_PyModuleGuardType);
-    // added guard to free resources on module unload, this should be called after last
-    if (PyModule_AddObject(module, "__guard", _PyObject_New(&PyXmlSec_PyModuleGuardType)) < 0) goto ON_FAIL;
-#endif
-
     PY_MOD_RETURN(module);
 ON_FAIL:
     PY_MOD_RETURN(NULL);

src/platform.h

@@ -35,14 +35,6 @@ typedef int Py_ssize_t;
 #define PY_SSIZE_T_MIN INT_MIN
 #endif
 
-#if PY_MAJOR_VERSION >= 3
-#define PY3K 1
-#else // PY3K
-
-#define PyBytes_AsStringAndSize PyString_AsStringAndSize
-
-#endif // PYTHON3
-
 static inline char* PyBytes_AsStringAndSize2(PyObject *obj, Py_ssize_t* length) {
     char* buffer = NULL;
     return ((PyBytes_AsStringAndSize(obj, &buffer, length) < 0) ? (char*)(0) : buffer);

src/template.c

@@ -918,7 +918,6 @@ static PyMethodDef PyXmlSec_TemplateMethods[] = {
     {NULL, NULL} /* sentinel */
 };
 
-#ifdef PY3K
 static PyModuleDef PyXmlSec_TemplateModule =
 {
     PyModuleDef_HEAD_INIT,
@@ -931,15 +930,9 @@ static PyModuleDef PyXmlSec_TemplateModule =
     NULL,                     /* m_clear */
     NULL,                     /* m_free */
 };
-#endif  // PY3K
 
 int PyXmlSec_TemplateModule_Init(PyObject* package) {
-#ifdef PY3K
     PyObject* template = PyModule_Create(&PyXmlSec_TemplateModule);
-#else
-    PyObject* template = Py_InitModule3(STRINGIFY(MODULE_NAME) ".template", PyXmlSec_TemplateMethods, PYXMLSEC_TEMPLATES_DOC);
-    Py_XINCREF(template);
-#endif
 
     if (!template) goto ON_FAIL;
     PYXMLSEC_DEBUGF("%p", template);

src/tree.c

@@ -230,7 +230,6 @@ static PyMethodDef PyXmlSec_TreeMethods[] = {
     {NULL, NULL} /* sentinel */
 };
 
-#ifdef PY3K
 static PyModuleDef PyXmlSec_TreeModule =
 {
     PyModuleDef_HEAD_INIT,
@@ -243,16 +242,10 @@ static PyModuleDef PyXmlSec_TreeModule =
     NULL,                     /* m_clear */
     NULL,                     /* m_free */
 };
-#endif  // PY3K
 
 
 int PyXmlSec_TreeModule_Init(PyObject* package) {
-#ifdef PY3K
     PyObject* tree = PyModule_Create(&PyXmlSec_TreeModule);
-#else
-    PyObject* tree = Py_InitModule3(STRINGIFY(MODULE_NAME) ".tree", PyXmlSec_TreeMethods, PYXMLSEC_TREE_DOC);
-    Py_XINCREF(tree);
-#endif
 
     if (!tree) goto ON_FAIL;