diff options
| author | Lukas Slebodnik <lslebodn@redhat.com> | 2015-02-09 19:23:44 +0100 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2015-02-25 08:38:23 +0100 |
| commit | 887edd6b7c53fde44eb9f9060e09db5cd981ba37 (patch) | |
| tree | 783438c1b813dc04d0dda77182345fd324c46a3c | |
| parent | 9eabaad5e0f3f20a6bcec0629342584c244a79bc (diff) | |
| download | sssd-887edd6b7c53fde44eb9f9060e09db5cd981ba37.tar.gz sssd-887edd6b7c53fde44eb9f9060e09db5cd981ba37.tar.xz sssd-887edd6b7c53fde44eb9f9060e09db5cd981ba37.zip | |
UTIL: Remove python wrapper sss_python_set_add
The function PySet_Add is available in python >= 2.6
Reviewed-by: Stephen Gallagher <sgallagh@redhat.com>
| -rw-r--r-- | src/external/python.m4 | 2 | ||||
| -rw-r--r-- | src/python/pyhbac.c | 4 | ||||
| -rw-r--r-- | src/util/sss_python.c | 17 | ||||
| -rw-r--r-- | src/util/sss_python.h | 1 |
4 files changed, 3 insertions, 21 deletions
diff --git a/src/external/python.m4 b/src/external/python.m4 index 440d2f977..e3812a504 100644 --- a/src/external/python.m4 +++ b/src/external/python.m4 @@ -62,7 +62,7 @@ AC_DEFUN([AM_CHECK_PYTHON_COMPAT], CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" LIBS="$LIBS $PYTHON_LIBS" - AC_CHECK_FUNCS([PySet_Add PyErr_NewExceptionWithDoc]) + AC_CHECK_FUNCS([PyErr_NewExceptionWithDoc]) AC_CHECK_DECLS([PySet_Check, PyModule_AddIntMacro, PyUnicode_FromString], [], [], [[#include <Python.h>]]) CPPFLAGS="$save_CPPFLAGS" diff --git a/src/python/pyhbac.c b/src/python/pyhbac.c index 3385cc441..71e3ea68f 100644 --- a/src/python/pyhbac.c +++ b/src/python/pyhbac.c @@ -388,7 +388,7 @@ HbacRuleElement_init(HbacRuleElement *self, PyObject *args, PyObject *kwargs) return -1; } - if (sss_python_set_add(self->category, tmp) != 0) { + if (PySet_Add(self->category, tmp) != 0) { Py_DECREF(tmp); return -1; } @@ -962,7 +962,7 @@ py_hbac_rule_validate(HbacRuleObject *self, PyObject *args) goto fail; } - if (sss_python_set_add(py_missing, py_attr) != 0) { + if (PySet_Add(py_missing, py_attr) != 0) { /* If the set-add succeeded, it would steal the reference */ Py_DECREF(py_attr); goto fail; diff --git a/src/util/sss_python.c b/src/util/sss_python.c index dad2a46d8..56850782a 100644 --- a/src/util/sss_python.c +++ b/src/util/sss_python.c @@ -21,23 +21,6 @@ #include "src/util/sss_python.h" #include "config.h" -int -sss_python_set_add(PyObject *set, PyObject *key) -{ -#ifdef HAVE_PYSET_ADD - return PySet_Add(set, key); -#else - PyObject *pyret; - int ret; - - pyret = PyObject_CallMethod(set, sss_py_const_p(char, "add"), - sss_py_const_p(char, "O"), key); - ret = (pyret == NULL) ? -1 : 0; - Py_XDECREF(pyret); - return ret; -#endif -} - bool sss_python_set_check(PyObject *set) { diff --git a/src/util/sss_python.h b/src/util/sss_python.h index 6851a64e8..1ff13c4ef 100644 --- a/src/util/sss_python.h +++ b/src/util/sss_python.h @@ -26,7 +26,6 @@ #endif /* Wrappers providing the subset of C API for python's set objects we use */ -int sss_python_set_add(PyObject *set, PyObject *key); bool sss_python_set_check(PyObject *set); /* Unicode compatibility */ |