PR#3699: UTIL: Use alternative way for detecting PyErr_NewExceptionWithDoc - SSSD/sssd

SSSD / sssd

#3699 UTIL: Use alternative way for detecting PyErr_NewExceptionWithDoc

Closed 6 years ago by jhrozek. Opened 6 years ago by lslebodn.

SSSD/ lslebodn/sssd configure_python into master

CONFIGURE: drop unused check

Lukas Slebodnik • 6 years ago

c57f506

UTIL: Use alternative way for detecting PyErr_NewExceptionWithDoc

Lukas Slebodnik • 6 years ago

5b216fc

configure.ac

file modified

-2

		`@@ -329,7 +329,6 @@`
		`AM_PYTHON_CONFIG([python2])`
		`AM_CHECK_PYTHON_HEADERS([],`
		`AC_MSG_ERROR([Could not find python2 headers]))`
		`- AM_CHECK_PYTHON_COMPAT`

		`AC_SUBST([py2execdir], [$pyexecdir])`
		`AC_SUBST([python2dir], [$pythondir])`
		`@@ -356,7 +355,6 @@`
		`AM_PYTHON_CONFIG([python3])`
		`AM_CHECK_PYTHON_HEADERS([],`
		`AC_MSG_ERROR([Could not find python3 headers]))`
		`- AM_CHECK_PYTHON_COMPAT`

		`AC_SUBST([py3execdir], [$pyexecdir])`
		`AC_SUBST([python3dir], [$pythondir])`

src/external/python.m4

file modified

-17

		`@@ -39,23 +39,6 @@`
		`CPPFLAGS="$save_CPPFLAGS"`
		`])`

		`-`
		`- dnl Checks for a couple of functions we use that may not be defined`
		`- dnl in some older python (< 2.6) versions used e.g. on RHEL6`
		`- AC_DEFUN([AM_CHECK_PYTHON_COMPAT],`
		`- [`
		`- AC_REQUIRE([AM_CHECK_PYTHON_HEADERS])`
		`- save_CPPFLAGS="$CPPFLAGS"`
		`- save_LIBS="$LIBS"`
		`- CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"`
		`- LIBS="$LIBS $PYTHON_LIBS"`
		`-`
		`- AC_CHECK_FUNCS([PyErr_NewExceptionWithDoc])`
		`-`
		`- CPPFLAGS="$save_CPPFLAGS"`
		`- LIBS="$save_LIBS"`
		`- ])`
		`-`
		`dnl Clean variables after detection of python`
		`AC_DEFUN([SSS_CLEAN_PYTHON_VARIABLES],`
		`[`

src/util/sss_python.c

file modified

+1 -1

		`@@ -23,7 +23,7 @@`
		`PyObject *`
		`sss_exception_with_doc(char name, char doc, PyObject base, PyObject dict)`
		`{`
		`- #ifdef HAVE_PYERR_NEWEXCEPTIONWITHDOC`
		`+ #if PY_VERSION_HEX >= 0x02070000`
		`return PyErr_NewExceptionWithDoc(name, doc, base, dict);`
		`#else`
		`int result;`

lslebodn commented 6 years ago

Function PyErr_NewExceptionWithDoc was added in python 2.7.0
and we use fallback implementation for older versions of python.

Previously, we used detection of PyErr_NewExceptionWithDoc at configure
time; but it does not work well in case of python2.6 and python3.x

Resolves:
https://pagure.io/SSSD/sssd/issue/3656

lslebodn commented 6 years ago

@sbose, I know you preferred detection at configure time[1] but this version was much simpler and more lines are removed then added. And PY_VERSION_HEX is already used in sssd on other place

[1] https://pagure.io/SSSD/sssd/issue/3653#comment-497100