Skip to content

Commit d8edc07

Browse files
committed
Correcting license
1 parent a8cdf67 commit d8edc07

File tree

3 files changed

+8
-46
lines changed

3 files changed

+8
-46
lines changed

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

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,8 @@
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.
24-
# Qunaibit 02/05/2014
25-
# With Statement
4+
# Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
5+
266

277
import sys
288
import os

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

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,8 @@
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
5+
246

257
import unittest
268
import zlib

mx.graalpython/copyrights/overrides

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,8 @@ graalpython/com.oracle.graal.python.test/src/tests/test_string.py,python.copyrig
238238
graalpython/com.oracle.graal.python.test/src/tests/test_tuple.py,python.copyright
239239
graalpython/com.oracle.graal.python.test/src/tests/test_with-test-2.py,zippy.copyright
240240
graalpython/com.oracle.graal.python.test/src/tests/test_with.py,zippy.copyright
241-
graalpython/com.oracle.graal.python.test/src/tests/test_zipimport.py,zippy.copyright
242-
graalpython/com.oracle.graal.python.test/src/tests/test_zlib.py,zippy.copyright
241+
graalpython/com.oracle.graal.python.test/src/tests/test_zipimport.py,python.copyright
242+
graalpython/com.oracle.graal.python.test/src/tests/test_zlib.py,python.copyright
243243
graalpython/com.oracle.graal.python.test/src/tests/try-test.py,zippy.copyright
244244
graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java,zippy.copyright
245245
graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Builtin.java,zippy.copyright

0 commit comments

Comments
 (0)