Python 3 updates (#13)

* removed future imports

* updated python-config

config/defaults/config.LINUX_GFORTRAN_OPENMPI.mk

@@ -41,5 +41,5 @@ PETSC_LINKER_FLAGS=${PETSC_LIB}
 
 # Define potentially different python, python-config and f2py executables:
 PYTHON = python
-PYTHON-CONFIG = python-config
+PYTHON-CONFIG = python3-config # use python-config for python 2
 F2PY = f2py

config/defaults/config.LINUX_INTEL_OPENMPI.mk

@@ -40,5 +40,5 @@ PETSC_LINKER_FLAGS=${PETSC_LIB}
 
 # Define potentially different python, python-config and f2py executables:
 PYTHON = python
-PYTHON-CONFIG = python-config
+PYTHON-CONFIG = python3-config # use python-config for python 2
 F2PY = f2py

python/pyHyp.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-from __future__ import division
 """
 pyHyp
 

src/python/f2py/Makefile

@@ -33,7 +33,7 @@ all:
 	 @echo "#------------------------------------------------------#"
 
 # Generate Numpy inlude directory
-	$(eval NUMPY_INCLUDES = $(shell $(PYTHON) -c 'from __future__ import print_function; import numpy; print(numpy.get_include())'))
+	$(eval NUMPY_INCLUDES = $(shell $(PYTHON) -c 'import numpy; print(numpy.get_include())'))
 	 @echo "#------------------------------------------------------#"
 	 @echo Numpy Include Directory: $(NUMPY_INCLUDES)
 	 @echo "#------------------------------------------------------#"

src/python/f2py/get_f2py.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 #------------- VERY IMPORTANT ------------ 
 
 # This script is necessary since f2py INSISTS on priting crap out when

src/python/f2py/importTest.py

@@ -1,5 +1,4 @@
 #! /usr/bin/env python
-from __future__ import print_function
 import sys
 
 name = 'hyp'