From: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Date: Sun, 6 Dec 2020 08:37:53 +0000 (+0000)
Subject: Provide support for python3 interface
X-Git-Tag: archive/raspbian/2.4.4-7+rpi1^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8868838c67da88dbb0540eb25a16308ca32219c8;p=mathgl.git

Provide support for python3 interface

Forwarded: not-needed
Last-Update: 2019-12-08


Gbp-Pq: Name python3.patch
---

diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt
index da245d2..4ce1e68 100644
--- a/lang/CMakeLists.txt
+++ b/lang/CMakeLists.txt
@@ -18,17 +18,17 @@ endif(NOT SWIG_FOUND)
 INCLUDE(${SWIG_USE_FILE})
 
 if(enable-python)
-	set(Python_ADDITIONAL_VERSIONS 2.7)
-	FIND_PACKAGE(PythonInterp)
+	set(Python_ADDITIONAL_VERSIONS ${PY3VERSION_DOTTED})
+	FIND_PACKAGE(PythonInterp ${PY3VERSION_DOTTED} REQUIRED)
 	if(NOT PYTHONINTERP_FOUND)
 		message(SEND_ERROR "Couldn't find python interpreter.")
 	endif(NOT PYTHONINTERP_FOUND)
-	FIND_PACKAGE(PythonLibs)
+	FIND_PACKAGE(PythonLibs ${PY3VERSION_DOTTED} REQUIRED)
 	if(NOT PYTHONLIBS_FOUND)
 		message(SEND_ERROR "Couldn't find python development libraries.")
 	endif(NOT PYTHONLIBS_FOUND)
 	execute_process(
-		COMMAND ${PYTHON_EXECUTABLE} -c "import numpy; print numpy.get_include()"
+		COMMAND ${PYTHON_EXECUTABLE} -c "import numpy; print (numpy.get_include())"
 		OUTPUT_VARIABLE NUMPY_INCLUDE_PATH
 		RESULT_VARIABLE NUMPY_ERR
 		OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -39,11 +39,11 @@ if(enable-python)
 
 	include_directories(${PYTHON_INCLUDE_DIR}  ${NUMPY_INCLUDE_PATH})
 	execute_process(
-		COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(prefix='${CMAKE_INSTALL_PREFIX}')"
+		COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib(prefix='${CMAKE_INSTALL_PREFIX}'))"
 		OUTPUT_VARIABLE MGL_PYTHON_SITE_PACKAGES
 		OUTPUT_STRIP_TRAILING_WHITESPACE)
 	set(SWIG_MODULE_mathgl_EXTRA_DEPS numpy.i ${src_imp_dep})
-	if(${CMAKE_VERSION} VERSION_LESS "3.8.0") 
+	if(${CMAKE_VERSION} VERSION_LESS "3.8.0")
 		SWIG_ADD_MODULE(mathgl python mathgl.i)
 	else(${CMAKE_VERSION} VERSION_LESS "3.8.0")
 		SWIG_ADD_LIBRARY(mathgl LANGUAGE python SOURCES mathgl.i)
@@ -58,7 +58,7 @@ if(enable-python)
 	)
 	add_custom_target(mgl_python_module ALL DEPENDS _mathgl mathgl.pyc)
 
-	install(FILES ${MathGL2_BINARY_DIR}/lang/mathgl.py ${MathGL2_BINARY_DIR}/lang/mathgl.pyc DESTINATION ${MGL_PYTHON_SITE_PACKAGES})
+	install(FILES ${MathGL2_BINARY_DIR}/lang/mathgl.py ${MathGL2_BINARY_DIR}/lang/__pycache__/mathgl.cpython-${PY3VERSION_NODOT}.pyc DESTINATION ${MGL_PYTHON_SITE_PACKAGES}/__pycache__)
 	install (TARGETS _mathgl LIBRARY DESTINATION ${MGL_PYTHON_SITE_PACKAGES})
 	set(mgl_clean_files ${mgl_clean_files} mathgl.py)
 endif(enable-python)
diff --git a/lang/numpy.i b/lang/numpy.i
index 25d1f1a..441356e 100644
--- a/lang/numpy.i
+++ b/lang/numpy.i
@@ -107,11 +107,9 @@
     if (PyDict_Check(    py_obj)) return "dict"        ;
     if (PyList_Check(    py_obj)) return "list"        ;
     if (PyTuple_Check(   py_obj)) return "tuple"       ;
-    if (PyFile_Check(    py_obj)) return "file"        ;
     if (PyModule_Check(  py_obj)) return "module"      ;
-    if (PyInstance_Check(py_obj)) return "instance"    ;
 
-    return "unknow type";
+    return "unknown type";
   }
 
   /* Given a NumPy typecode, return a string describing the type.