diff options
| author | Lukas Slebodnik <lslebodn@redhat.com> | 2015-02-09 19:30:39 +0100 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2015-02-25 08:38:25 +0100 |
| commit | a63b368a025a61edf41a3d5ce34f325b03295cf6 (patch) | |
| tree | bf3d21670409ec34b91e2f71dd363959ffd8ddd0 | |
| parent | 887edd6b7c53fde44eb9f9060e09db5cd981ba37 (diff) | |
| download | sssd-a63b368a025a61edf41a3d5ce34f325b03295cf6.tar.gz sssd-a63b368a025a61edf41a3d5ce34f325b03295cf6.tar.xz sssd-a63b368a025a61edf41a3d5ce34f325b03295cf6.zip | |
UTIL: Remove python wrapper sss_python_set_check
The macro PySet_Check is defined 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 | 2 | ||||
| -rw-r--r-- | src/util/sss_python.c | 10 | ||||
| -rw-r--r-- | src/util/sss_python.h | 3 |
4 files changed, 2 insertions, 15 deletions
diff --git a/src/external/python.m4 b/src/external/python.m4 index e3812a504..e93f85009 100644 --- a/src/external/python.m4 +++ b/src/external/python.m4 @@ -63,7 +63,7 @@ AC_DEFUN([AM_CHECK_PYTHON_COMPAT], LIBS="$LIBS $PYTHON_LIBS" AC_CHECK_FUNCS([PyErr_NewExceptionWithDoc]) - AC_CHECK_DECLS([PySet_Check, PyModule_AddIntMacro, PyUnicode_FromString], [], [], [[#include <Python.h>]]) + AC_CHECK_DECLS([PyModule_AddIntMacro, PyUnicode_FromString], [], [], [[#include <Python.h>]]) CPPFLAGS="$save_CPPFLAGS" LIBS="$save_LIBS" diff --git a/src/python/pyhbac.c b/src/python/pyhbac.c index 71e3ea68f..05845be86 100644 --- a/src/python/pyhbac.c +++ b/src/python/pyhbac.c @@ -452,7 +452,7 @@ hbac_rule_element_set_category(HbacRuleElement *self, CHECK_ATTRIBUTE_DELETE(category, "category"); - if (!sss_python_set_check(category)) { + if (!PySet_Check(category)) { PyErr_Format(PyExc_TypeError, "The category must be a set type\n"); return -1; } diff --git a/src/util/sss_python.c b/src/util/sss_python.c index 56850782a..ba78bf968 100644 --- a/src/util/sss_python.c +++ b/src/util/sss_python.c @@ -21,16 +21,6 @@ #include "src/util/sss_python.h" #include "config.h" -bool -sss_python_set_check(PyObject *set) -{ -#if HAVE_DECL_PYSET_CHECK - return PySet_Check(set); -#else - return PyObject_TypeCheck(set, &PySet_Type); -#endif -} - PyObject * sss_python_unicode_from_string(const char *u) { diff --git a/src/util/sss_python.h b/src/util/sss_python.h index 1ff13c4ef..56c25ebb7 100644 --- a/src/util/sss_python.h +++ b/src/util/sss_python.h @@ -25,9 +25,6 @@ #define PYNUMBER_ASLONG(what) PyInt_AsLong(what) #endif -/* Wrappers providing the subset of C API for python's set objects we use */ -bool sss_python_set_check(PyObject *set); - /* Unicode compatibility */ PyObject *sss_python_unicode_from_string(const char *u); |