Allow to compile with python 2.7 and with EPD python version.

Author: nouiz

plearn/python/PythonIncludes.h

@@ -73,7 +73,23 @@
 #  error "Symbols PL_USE_NUMARRAY and PL_USE_NUMPY are mutually exclusive; they should not both be defined"
 #endif
 
-#if PL_PYTHON_VERSION >= 260
+#if PL_PYTHON_VERSION >= 270
+
+#include <python2.7/Python.h>
+#include <python2.7/compile.h>  // define PyCodeObject
+#include <python2.7/eval.h>     // for accessing PyEval_EvalCode: not included by default
+#ifdef PL_USE_NUMARRAY
+#  include <python2.7/numarray/libnumarray.h>
+#else
+#  ifdef PL_USE_NUMPY
+#    pragma GCC system_header //suppress all warnings/errors for numpy
+#    include <libnumarray.h>
+#  else
+#    error "should use either NumPy (preferred) or NUMARRAY (deprecated)"
+#  endif //def PL_USE_NUMPY
+#endif //def PL_USE_NUMARRAY
+
+#elif PL_PYTHON_VERSION >= 260
 
 #include <python2.6/Python.h>
 #include <python2.6/compile.h>  // define PyCodeObject

pymake.config.model

@@ -267,7 +267,7 @@ options_choices = [
   [ 'double', 'float' ],
 
   # [ 'throwerrors', 'exiterrors' ],
-  [ 'autopython', 'python23', 'python24', 'python25', 'python26','nopython' ],
+  [ 'autopython', 'python23', 'python24', 'python25', 'python26','python27', 'nopython' ],
 
   [ 'blas', 'noblas' ],
   [ 'defblas', 'nolibblas', 'p3blas', 'p4blas', 'athlonblas', 'pentiumblas',
@@ -413,6 +413,10 @@ if not 'nopython' in optionargs:
             getpyver = toolkit.command_output('python%s -V' % python_version)
             if len(getpyver) == 1:
                 tokens = getpyver[0].split()
+                if len(tokens) > 3 and tokens[2]=="--" and tokens[3] == 'EPD':
+                    # This is a EPD installation of python
+                    # Version are like Python 2.7.2 -- EPD 7.1-2 (64-bit)
+                    tokens = tokens[:2]
                 if len(tokens) == 2:
                     foundver = tokens[1]
                     tokens = foundver.split('.')
@@ -809,6 +813,9 @@ pymakeOption( name = 'python25',
 pymakeOption( name = 'python26',
               description = 'the installed version of python is 2.6.X',
               cpp_definitions = ['PL_PYTHON_VERSION=260'] )
+pymakeOption( name = 'python27',
+              description = 'the installed version of python is 2.7.X',
+              cpp_definitions = ['PL_PYTHON_VERSION=270'] )
 pymakeOption( name = 'nopython',
               description = 'compile w/o python')