[GR-13347] Update to PyPy 6.0.0 and merge CPython 3.6.5 again

PullRequest: graalpython/361

Author: timfel

graalpython/com.oracle.graal.python.cext/src/complexobject.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2018, Oracle and/or its affiliates.
+/* Copyright (c) 2018, 2019, Oracle and/or its affiliates.
  * Copyright (C) 1996-2017 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -7,7 +7,6 @@
 
 PyTypeObject PyComplex_Type = PY_TRUFFLE_TYPE("complex", &PyType_Type, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, sizeof(PyComplexObject));
 
-static Py_complex c_1 = {1., 0.};
 static Py_complex c_error = {-1., 0.};
 
 UPCALL_ID(PyComplex_AsCComplex);
@@ -22,6 +21,21 @@ Py_complex PyComplex_AsCComplex(PyObject *op) {
 	return c_error;
 }
 
+// Below is taken from CPython
+
+/* Complex object implementation */
+
+/* Borrows heavily from floatobject.c */
+
+/* Submitted by Jim Hugunin */
+
+#include "Python.h"
+#include "structmember.h"
+
+/* elementary operations on complex numbers */
+
+static Py_complex c_1 = {1., 0.};
+
 Py_complex
 _Py_c_sum(Py_complex a, Py_complex b)
 {

graalpython/com.oracle.graal.python.cext/src/floatobject.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2018, Oracle and/or its affiliates.
+/* Copyright (c) 2018, 2019, Oracle and/or its affiliates.
  * Copyright (C) 1996-2017 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -38,6 +38,19 @@ PyObject* float_subtype_new(PyTypeObject *type, double x) {
     return newobj;
 }
 
+// Below taken from CPython
+
+/*----------------------------------------------------------------------------
+ * _PyFloat_{Pack,Unpack}{2,4,8}.  See floatobject.h.
+ * To match the NPY_HALF_ROUND_TIES_TO_EVEN behavior in:
+ * https://github.com/numpy/numpy/blob/master/numpy/core/src/npymath/halffloat.c
+ * We use:
+ *       bits = (unsigned short)f;    Note the truncation
+ *       if ((f - bits > 0.5) || (f - bits == 0.5 && bits % 2)) {
+ *           bits++;
+ *       }
+ */
+
 int
 _PyFloat_Pack2(double x, unsigned char *p, int le)
 {

graalpython/lib-python/3/site-packages/README.txt

@@ -0,0 +1,2 @@
+This directory exists so that 3rd party packages can be installed
+here.  Read the source for site.py for more details.

mx.graalpython/mx_graalpython.py

@@ -667,7 +667,9 @@ def import_python_sources(args):
     mapping = {
         "_memoryview.c": "memoryobject.c",
         "_cpython_sre.c": "_sre.c",
+        "_cpython_unicodedata.c": "unicodedata.c",
     }
+
     parser = ArgumentParser(prog='mx python-src-import')
     parser.add_argument('--cpython', action='store', help='Path to CPython sources', required=True)
     parser.add_argument('--pypy', action='store', help='Path to PyPy sources', required=True)
@@ -722,9 +724,11 @@ def import_python_sources(args):
     """.format(mapping)
     raw_input("Got it?")
 
-    files = []
+    cpy_files = []
+    pypy_files = []
     with open(os.path.join(os.path.dirname(__file__), "copyrights", "overrides")) as f:
-        files = [line.split(",")[0] for line in f.read().split("\n") if len(line.split(",")) > 1 and line.split(",")[1] == "python.copyright"]
+        cpy_files = [line.split(",")[0] for line in f.read().split("\n") if len(line.split(",")) > 1 and line.split(",")[1] == "python.copyright"]
+        pypy_files = [line.split(",")[0] for line in f.read().split("\n") if len(line.split(",")) > 1 and line.split(",")[1] == "pypy.copyright"]
 
     # move to orphaned branch with sources
     if SUITE.vc.isDirty(SUITE.dir):
@@ -734,7 +738,28 @@ def import_python_sources(args):
     SUITE.vc.git_command(SUITE.dir, ["clean", "-fdx"])
     shutil.rmtree("graalpython")
 
-    for inlined_file in files:
+    for inlined_file in pypy_files:
+        original_file = None
+        name = os.path.basename(inlined_file)
+        name = mapping.get(name, name)
+        if inlined_file.endswith(".py"):
+            # these files don't need to be updated, they inline some unittest code only
+            if name.startswith("test_") or name.endswith("_tests.py"):
+                original_file = inlined_file
+            else:
+                for root, dirs, files in os.walk(pypy_sources):
+                    if os.path.basename(name) in files:
+                        original_file = os.path.join(root, name)
+                        try:
+                            os.makedirs(os.path.dirname(inlined_file))
+                        except:
+                            pass
+                        shutil.copy(original_file, inlined_file)
+                        break
+        if original_file is None:
+            mx.warn("Could not update %s - original file not found" % inlined_file)
+
+    for inlined_file in cpy_files:
         # C files are mostly just copied
         original_file = None
         name = os.path.basename(inlined_file)
@@ -757,8 +782,7 @@ def import_python_sources(args):
             mx.warn("Could not update %s - original file not found" % inlined_file)
 
     # re-copy lib-python
-    libdir = os.path.join(SUITE.dir, "graalpython/lib-python/3")
-    shutil.copytree(os.path.join(pypy_sources, "lib-python", "3"), libdir)
+    shutil.copytree(os.path.join(python_sources, "Lib"), _get_stdlib_home())
 
     # commit and check back
     SUITE.vc.git_command(SUITE.dir, ["add", "."])