use python2 binary in build process

Author: aisk

CMakeLists.txt

@@ -82,7 +82,7 @@ endif()
 if(ENABLE_SELF_HOST)
   set(PYTHON_EXE "pyston")
 else()
-  find_program(PYTHON_EXE python)
+  set(PYTHON_EXE "python2")
 endif()
 
 # initial clang flags (set here so they're used when building llvm)

from_cpython/Include/pymath.h

@@ -118,7 +118,11 @@ PyAPI_FUNC(void) _Py_set_387controlword(unsigned short) PYSTON_NOEXCEPT;
  */
 #ifndef Py_IS_INFINITY
 #  if defined HAVE_DECL_ISINF && HAVE_DECL_ISINF == 1
-#    define Py_IS_INFINITY(X) isinf(X)
+#    ifdef __cplusplus
+#      define Py_IS_INFINITY(X) std::isinf(X)
+#    else
+#      define Py_IS_INFINITY(X) isinf(X)
+#    endif
 #  else
 #    define Py_IS_INFINITY(X) ((X) &&                                   \
                                (Py_FORCE_DOUBLE(X)*0.5 == Py_FORCE_DOUBLE(X)))

from_cpython/Modules/_ssl.c

@@ -314,8 +314,8 @@ newPySSLObject(PySocketSockObject *Sock, char *key_file, char *cert_file,
     PySSL_BEGIN_ALLOW_THREADS
     if (proto_version == PY_SSL_VERSION_TLS1)
         self->ctx = SSL_CTX_new(TLSv1_method()); /* Set up context */
-    else if (proto_version == PY_SSL_VERSION_SSL3)
-        self->ctx = SSL_CTX_new(SSLv3_method()); /* Set up context */
+    // else if (proto_version == PY_SSL_VERSION_SSL3)
+    //     self->ctx = SSL_CTX_new(SSLv3_method()); /* Set up context */
 #ifndef OPENSSL_NO_SSL2
     else if (proto_version == PY_SSL_VERSION_SSL2)
         self->ctx = SSL_CTX_new(SSLv2_method()); /* Set up context */
@@ -1819,8 +1819,8 @@ init_ssl(void)
     PyModule_AddIntConstant(m, "PROTOCOL_SSLv2",
                             PY_SSL_VERSION_SSL2);
 #endif
-    PyModule_AddIntConstant(m, "PROTOCOL_SSLv3",
-                            PY_SSL_VERSION_SSL3);
+    // PyModule_AddIntConstant(m, "PROTOCOL_SSLv3",
+    //                         PY_SSL_VERSION_SSL3);
     PyModule_AddIntConstant(m, "PROTOCOL_SSLv23",
                             PY_SSL_VERSION_SSL23);
     PyModule_AddIntConstant(m, "PROTOCOL_TLSv1",

from_cpython/setup.py

@@ -64,6 +64,16 @@ def ctypes_ext():
     if platform.linux_distribution()[0] == "Fedora":
         ffi_lib = "ffi"
 
+    # Hack: platform.linux_distribution()[0] is '' on python2 on arch
+    # this change only works with libffi-3.2.1
+    try:
+        with open('/etc/issue') as f:
+            if f.read().startswith('Arch Linux'):
+                ffi_lib = "ffi"
+                ffi_inc = ["/usr/lib/libffi-3.2.1/include"]
+    except Exception:
+        pass
+
     ext.include_dirs.extend(ffi_inc)
     ext.libraries.append(ffi_lib)
 

src/runtime/long.cpp

@@ -361,7 +361,7 @@ extern "C" double PyLong_AsDouble(PyObject* vv) noexcept {
     mpfr_init_set_z(result, l->n, MPFR_RNDN);
 
     double result_f = mpfr_get_d(result, MPFR_RNDN);
-    if (isinf(result_f)) {
+    if (std::isinf(result_f)) {
         PyErr_SetString(PyExc_OverflowError, "long int too large to convert to float");
         return -1;
     }
@@ -415,11 +415,11 @@ extern "C" PyAPI_FUNC(PyObject*) _PyLong_Format(PyObject* aa, int base, int addL
 }
 
 extern "C" PyObject* PyLong_FromDouble(double v) noexcept {
-    if (isnan(v)) {
+    if (std::isnan(v)) {
         PyErr_SetString(PyExc_ValueError, "cannot convert float NaN to integer");
         return NULL;
     }
-    if (isinf(v)) {
+    if (std::isinf(v)) {
         PyErr_SetString(PyExc_OverflowError, "cannot convert float infinity to integer");
         return NULL;
     }
@@ -1403,7 +1403,7 @@ Box* longTrueDiv(BoxedLong* v1, Box* _v2) {
 
     double result_f = mpfr_get_d(result, MPFR_RNDN);
 
-    if (isinf(result_f)) {
+    if (std::isinf(result_f)) {
         raiseExcHelper(OverflowError, "integer division result too large for a float");
     }
     return boxFloat(result_f);
@@ -1431,7 +1431,7 @@ Box* longRTrueDiv(BoxedLong* v1, Box* _v2) {
     mpfr_div(result, lhs_f, rhs_f, MPFR_RNDN);
 
     double result_f = mpfr_get_d(result, MPFR_RNDZ);
-    if (isinf(result_f)) {
+    if (std::isinf(result_f)) {
         raiseExcHelper(OverflowError, "integer division result too large for a float");
     }
     return boxFloat(result_f);

test/test_extension/CMakeLists.txt

@@ -1,5 +1,5 @@
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/build/lib.linux-x86_64-2.7/basic_test.so
-                   COMMAND python setup.py build --build-lib ${CMAKE_CURRENT_BINARY_DIR}/build/lib.linux-x86_64-2.7
+                   COMMAND python2 setup.py build --build-lib ${CMAKE_CURRENT_BINARY_DIR}/build/lib.linux-x86_64-2.7
                    DEPENDS basic_test.c descr_test.c slots_test.c
                    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 

tools/tester.py

@@ -100,7 +100,7 @@ def get_expected_output(fn):
     env = dict(os.environ)
     env["PYTHONPATH"] = EXTMODULE_DIR
     env["PYTHONIOENCODING"] = PYTHONIOENCODING
-    p = subprocess.Popen(["python", "-Wignore", fn], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=open("/dev/null"), preexec_fn=set_ulimits, env=env)
+    p = subprocess.Popen(["python2", "-Wignore", fn], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=open("/dev/null"), preexec_fn=set_ulimits, env=env)
     out, err = p.communicate()
     code = p.wait()