pyconfig is ours, _cpython_sre was _sre in CPython

timfel · timfel · commit a17f4425b2e6 · 2018-07-20T09:54:07.000+02:00
diff --git a/mx.graalpython/copyrights/overrides b/mx.graalpython/copyrights/overrides
@@ -107,7 +107,6 @@ graalpython/com.oracle.graal.python.cext/include/patchlevel.h,python.copyright
 graalpython/com.oracle.graal.python.cext/include/polyglot.h,no.copyright
 graalpython/com.oracle.graal.python.cext/include/pyarena.h,python.copyright
 graalpython/com.oracle.graal.python.cext/include/pycapsule.h,python.copyright
-graalpython/com.oracle.graal.python.cext/include/pyconfig.h,python.copyright
 graalpython/com.oracle.graal.python.cext/include/pyctype.h,python.copyright
 graalpython/com.oracle.graal.python.cext/include/pydebug.h,python.copyright
 graalpython/com.oracle.graal.python.cext/include/pyerrors.h,python.copyright
diff --git a/mx.graalpython/mx_graalpython.py b/mx.graalpython/mx_graalpython.py
@@ -759,6 +759,7 @@ def import_python_sources(args):
     # mappings for files that are renamed
     mapping = {
         "_memoryview.c": "memoryobject.c",
+        "_cpython_sre.c": "_sre.c",
     }
     parser = ArgumentParser(prog='mx python-src-import')
     parser.add_argument('--cpython', action='store', help='Path to CPython sources', required=True)

Original file line number	Diff line number	Diff line change
`@@ -759,6 +759,7 @@ def import_python_sources(args):`
`759`	`759`	`# mappings for files that are renamed`
`760`	`760`	`mapping = {`
`761`	`761`	`"_memoryview.c": "memoryobject.c",`
	`762`	`+ "_cpython_sre.c": "_sre.c",`
`762`	`763`	`}`
`763`	`764`	`parser = ArgumentParser(prog='mx python-src-import')`
`764`	`765`	`parser.add_argument('--cpython', action='store', help='Path to CPython sources', required=True)`