Skip to content

Commit ba34092

Browse files
committed
apply copyrights and sre module rename
1 parent 002ea01 commit ba34092

File tree

11 files changed

+53
-18
lines changed

11 files changed

+53
-18
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/* Copyright (c) 2018, Oracle and/or its affiliates.
2+
* Copyright (C) 1996-2017 Python Software Foundation
3+
*
4+
* Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
5+
*/
16
#ifndef Py_ITEROBJECT_H
27
#define Py_ITEROBJECT_H
38
/* Iterators (the basic kind, over a sequence) */

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

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
/*
2-
* Copyright (c) 2017, 2018, Oracle and/or its affiliates.
2+
* Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
34
*
45
* The Universal Permissive License (UPL), Version 1.0
56
*
67
* Subject to the condition set forth below, permission is hereby granted to any
7-
* person obtaining a copy of this software, associated documentation and/or data
8-
* (collectively the "Software"), free of charge and under any and all copyright
9-
* rights in the Software, and any and all patent rights owned or freely
10-
* licensable by each licensor hereunder covering either (i) the unmodified
11-
* Software as contributed to or provided by such licensor, or (ii) the Larger
12-
* Works (as defined below), to deal in both
8+
* person obtaining a copy of this software, associated documentation and/or
9+
* data (collectively the "Software"), free of charge and under any and all
10+
* copyright rights in the Software, and any and all patent rights owned or
11+
* freely licensable by each licensor hereunder covering either (i) the
12+
* unmodified Software as contributed to or provided by such licensor, or (ii)
13+
* the Larger Works (as defined below), to deal in both
1314
*
1415
* (a) the Software, and
16+
*
1517
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
16-
* one is included with the Software (each a "Larger Work" to which the
17-
* Software is contributed by such licensors),
18+
* one is included with the Software each a "Larger Work" to which the Software
19+
* is contributed by such licensors),
1820
*
1921
* without restriction, including without limitation the rights to copy, create
2022
* derivative works of, display, perform, and distribute the Software and make,

graalpython/com.oracle.graal.python.cext/modules/_cpython_sre.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/* Copyright (c) 2018, Oracle and/or its affiliates.
2+
* Copyright (C) 1996-2017 Python Software Foundation
3+
*
4+
* Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
5+
*/
16
/*
27
* Secret Labs' Regular Expression Engine
38
*
@@ -51,7 +56,7 @@ static const char copyright[] =
5156

5257
/* name of this module, minus the leading underscore */
5358
#if !defined(SRE_MODULE)
54-
#define SRE_MODULE "sre"
59+
#define SRE_MODULE "cpython_sre"
5560
#endif
5661

5762
#define SRE_PY_MODULE "re"
@@ -2919,7 +2924,7 @@ static struct PyModuleDef sremodule = {
29192924
NULL
29202925
};
29212926

2922-
PyMODINIT_FUNC PyInit__sre(void)
2927+
PyMODINIT_FUNC PyInit__cpython_sre(void)
29232928
{
29242929
PyObject* m;
29252930
PyObject* d;

graalpython/com.oracle.graal.python.cext/modules/clinic/_sre.c.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/* Copyright (c) 2018, Oracle and/or its affiliates.
2+
* Copyright (C) 1996-2017 Python Software Foundation
3+
*
4+
* Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
5+
*/
16
/*[clinic input]
27
preserve
38
[clinic start generated code]*/

graalpython/com.oracle.graal.python.cext/modules/sre.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/* Copyright (c) 2018, Oracle and/or its affiliates.
2+
* Copyright (C) 1996-2017 Python Software Foundation
3+
*
4+
* Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
5+
*/
16
/*
27
* Secret Labs' Regular Expression Engine
38
*

graalpython/com.oracle.graal.python.cext/modules/sre_constants.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/* Copyright (c) 2018, Oracle and/or its affiliates.
2+
* Copyright (C) 1996-2017 Python Software Foundation
3+
*
4+
* Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
5+
*/
16
/*
27
* Secret Labs' Regular Expression Engine
38
*

graalpython/com.oracle.graal.python.cext/modules/sre_lib.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/* Copyright (c) 2018, Oracle and/or its affiliates.
2+
* Copyright (C) 1996-2017 Python Software Foundation
3+
*
4+
* Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
5+
*/
16
/*
27
* Secret Labs' Regular Expression Engine
38
*

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,6 @@ static void initialize_globals() {
148148
void *jerrormarker = UPCALL_CEXT_PTR("Py_ErrorHandler");
149149
force_to_native(jerrormarker);
150150
truffle_assign_managed(&marker_struct, jerrormarker);
151-
152-
// long constants
153-
_PyLong_Zero = PyLong_FromLong(0);
154-
_PyLong_One = PyLong_FromLong(1);
155151
}
156152

157153
static void initialize_bufferprocs() {

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@
4545

4646
PyTypeObject PyLong_Type = PY_TRUFFLE_TYPE("int", &PyType_Type, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_LONG_SUBCLASS, offsetof(PyLongObject, ob_digit));
4747

48-
PyObject *_PyLong_Zero = NULL;
49-
PyObject *_PyLong_One = NULL;
50-
5148
long PyLong_AsLong(PyObject *obj) {
5249
return UPCALL_CEXT_L("PyLong_AsPrimitive", native_to_java(obj), 1, sizeof(long), polyglot_from_string("long", SRC_CS));
5350
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/* Copyright (c) 2018, Oracle and/or its affiliates.
2+
* Copyright (C) 1996-2017 Python Software Foundation
3+
*
4+
* Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
5+
*/
16
/*
27
Unicode character type helpers.
38

0 commit comments

Comments
 (0)