Merge branch 'python-import' into tim/py-src-import2

Author: timfel

graalpython/com.oracle.graal.python.cext/include/abstract.h

@@ -1,8 +1,3 @@
-/* Copyright (c) 2018, Oracle and/or its affiliates.
- * Copyright (C) 1996-2017 Python Software Foundation
- *
- * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
- */
 /* Boolean object interface */
 
 #ifndef Py_BOOLOBJECT_H

graalpython/com.oracle.graal.python.cext/include/boolobject.h

@@ -1,8 +1,3 @@
-/* Copyright (c) 2018, Oracle and/or its affiliates.
- * Copyright (C) 1996-2017 Python Software Foundation
- *
- * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
- */
 /* ByteArray object interface */
 
 #ifndef Py_BYTEARRAYOBJECT_H

graalpython/com.oracle.graal.python.cext/include/bytearrayobject.h

@@ -1,8 +1,3 @@
-/* Copyright (c) 2018, Oracle and/or its affiliates.
- * Copyright (C) 1996-2017 Python Software Foundation
- *
- * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
- */
 
 /* Bytes (String) object interface */
 
@@ -36,7 +31,7 @@ functions should be applied to nil objects.
 typedef struct {
     PyObject_VAR_HEAD
     Py_hash_t ob_shash;
-    char *ob_sval;
+    char ob_sval[1];
 
     /* Invariants:
      *     ob_sval contains space for 'ob_size+1' elements.

graalpython/com.oracle.graal.python.cext/include/bytesobject.h

@@ -1,8 +1,3 @@
-/* Copyright (c) 2018, Oracle and/or its affiliates.
- * Copyright (C) 1996-2017 Python Software Foundation
- *
- * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
- */
 #ifndef Py_CEVAL_H
 #define Py_CEVAL_H
 #ifdef __cplusplus

graalpython/com.oracle.graal.python.cext/include/ceval.h

@@ -1,8 +1,3 @@
-/* Copyright (c) 2018, Oracle and/or its affiliates.
- * Copyright (C) 1996-2017 Python Software Foundation
- *
- * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
- */
 /* Former class object interface -- now only bound methods are here  */
 
 /* Revealing some structures (not for general use) */
@@ -35,13 +30,13 @@ PyAPI_FUNC(PyObject *) PyMethod_Self(PyObject *);
 #define PyMethod_GET_FUNCTION(meth) \
         (((PyMethodObject *)meth) -> im_func)
 #define PyMethod_GET_SELF(meth) \
-        (((PyMethodObject *)meth) -> im_self)
+	(((PyMethodObject *)meth) -> im_self)
 
 PyAPI_FUNC(int) PyMethod_ClearFreeList(void);
 
 typedef struct {
-    PyObject_HEAD
-    PyObject *func;
+	PyObject_HEAD
+	PyObject *func;
 } PyInstanceMethodObject;
 
 PyAPI_DATA(PyTypeObject) PyInstanceMethod_Type;

graalpython/com.oracle.graal.python.cext/include/classobject.h

@@ -1,9 +1,3 @@
-/* Copyright (c) 2018, Oracle and/or its affiliates.
- * Copyright (C) 1996-2017 Python Software Foundation
- *
- * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
- */
-
 /* Definitions for bytecode */
 
 #ifndef Py_LIMITED_API

graalpython/com.oracle.graal.python.cext/include/code.h

@@ -1,9 +1,3 @@
-/* Copyright (c) 2018, Oracle and/or its affiliates.
- * Copyright (C) 1996-2017 Python Software Foundation
- *
- * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
- */
-
 #ifndef Py_CODECREGISTRY_H
 #define Py_CODECREGISTRY_H
 #ifdef __cplusplus

graalpython/com.oracle.graal.python.cext/include/codecs.h

@@ -1,9 +1,3 @@
-/* Copyright (c) 2018, Oracle and/or its affiliates.
- * Copyright (C) 1996-2017 Python Software Foundation
- *
- * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
- */
-
 #ifndef Py_COMPILE_H
 #define Py_COMPILE_H
 
@@ -17,23 +11,6 @@ extern "C" {
 /* Public interface */
 struct _node; /* Declare the existence of this type */
 PyAPI_FUNC(PyCodeObject *) PyNode_Compile(struct _node *, const char *);
-/* XXX (ncoghlan): Unprefixed type name in a public API! */
-
-#define PyCF_MASK (CO_FUTURE_DIVISION | CO_FUTURE_ABSOLUTE_IMPORT | \
-                   CO_FUTURE_WITH_STATEMENT | CO_FUTURE_PRINT_FUNCTION | \
-                   CO_FUTURE_UNICODE_LITERALS | CO_FUTURE_BARRY_AS_BDFL | \
-                   CO_FUTURE_GENERATOR_STOP)
-#define PyCF_MASK_OBSOLETE (CO_NESTED)
-#define PyCF_SOURCE_IS_UTF8  0x0100
-#define PyCF_DONT_IMPLY_DEDENT 0x0200
-#define PyCF_ONLY_AST 0x0400
-#define PyCF_IGNORE_COOKIE 0x0800
-
-#ifndef Py_LIMITED_API
-typedef struct {
-    int cf_flags;  /* bitmask of CO_xxx flags relevant to future */
-} PyCompilerFlags;
-#endif
 
 /* Future feature support */
 
@@ -81,8 +58,6 @@ PyAPI_FUNC(PyObject*) _Py_Mangle(PyObject *p, PyObject *name);
 #define PY_INVALID_STACK_EFFECT INT_MAX
 PyAPI_FUNC(int) PyCompile_OpcodeStackEffect(int opcode, int oparg);
 
-PyAPI_FUNC(int) _PyAST_Optimize(struct _mod *, PyArena *arena);
-
 #ifdef __cplusplus
 }
 #endif

graalpython/com.oracle.graal.python.cext/include/compile.h

@@ -1,8 +1,3 @@
-/* Copyright (c) 2018, Oracle and/or its affiliates.
- * Copyright (C) 1996-2017 Python Software Foundation
- *
- * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
- */
 /* Complex number structure */
 
 #ifndef Py_COMPLEXOBJECT_H