Skip to content

Commit 4831f66

Browse files
committed
Correcting license
1 parent ba33acf commit 4831f66

File tree

3 files changed

+4
-23
lines changed

3 files changed

+4
-23
lines changed

graalpython/com.oracle.graal.python.test/src/tests/test_exception.py

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,7 @@
11
# Copyright (c) 2018, Oracle and/or its affiliates.
2-
# Copyright (c) 2013, Regents of the University of California
2+
# Copyright (C) 1996-2017 Python Software Foundation
33
#
4-
# All rights reserved.
5-
#
6-
# Redistribution and use in source and binary forms, with or without modification, are
7-
# permitted provided that the following conditions are met:
8-
#
9-
# 1. Redistributions of source code must retain the above copyright notice, this list of
10-
# conditions and the following disclaimer.
11-
# 2. Redistributions in binary form must reproduce the above copyright notice, this list of
12-
# conditions and the following disclaimer in the documentation and/or other materials provided
13-
# with the distribution.
14-
#
15-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
16-
# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
17-
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
18-
# COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19-
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
20-
# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
21-
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
22-
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
23-
# OF THE POSSIBILITY OF SUCH DAMAGE.
4+
# Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
245

256
import unittest
267
import sys

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/BaseExceptionBuiltins.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public Object setTraceback(PBaseException self, PTraceback tb) {
202202
}
203203

204204
@Fallback
205-
public Object setTraceback(@SuppressWarnings("unused") Object self, @SuppressWarnings("unused") Object tb) {
205+
public Object setTraceback(@SuppressWarnings("unused") Object self, @SuppressWarnings("unused") Object tb) {
206206
throw raise(PythonErrorType.TypeError, "__traceback__ must be a traceback or None");
207207
}
208208
}

mx.graalpython/copyrights/overrides

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ graalpython/com.oracle.graal.python.test/src/tests/test_compare.py,python.copyri
199199
graalpython/com.oracle.graal.python.test/src/tests/test_enumerate.py,python.copyright
200200
graalpython/com.oracle.graal.python.test/src/tests/test_euler11.py,benchmarks.copyright
201201
graalpython/com.oracle.graal.python.test/src/tests/test_euler31.py,benchmarks.copyright
202-
graalpython/com.oracle.graal.python.test/src/tests/test_exception.py,zippy.copyright
202+
graalpython/com.oracle.graal.python.test/src/tests/test_exception.py,python.copyright
203203
graalpython/com.oracle.graal.python.test/src/tests/test_generator-accumulator.py,zippy.copyright
204204
graalpython/com.oracle.graal.python.test/src/tests/test_generator-continue.py,zippy.copyright
205205
graalpython/com.oracle.graal.python.test/src/tests/test_generator-expression-next.py,zippy.copyright

0 commit comments

Comments
 (0)