Correcting tests and licenses.

ppisl · ppisl · commit 310036a4d2bd · 2018-06-29T11:17:24.000+02:00
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/test_builtin.py b/graalpython/com.oracle.graal.python.test/src/tests/test_builtin.py
@@ -24,4 +24,4 @@ def test_bin(self):
         # test of specializations
         self.assertEqual(bin(MyIndexable(False)), '0b0')
         self.assertEqual(bin(MyIndexable(True)), '0b1')
-        self.assertEqual(bin(MyIndexable(-(2**65))), '-0b1' + '0' * 65)
+        self.assertEqual(bin(MyIndexable(-(2**65))), '-0b1' + '0' * 65)
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/test_math.py b/graalpython/com.oracle.graal.python.test/src/tests/test_math.py
@@ -955,52 +955,53 @@ def test_factorial(self):
         self.assertRaises(ValueError, math.factorial, -11.1)
 
     def testGcd(self):
-        gcd = math.gcd
-        self.assertEqual(gcd(0, 0), 0)
-        self.assertEqual(gcd(1, 0), 1)
-        self.assertEqual(gcd(-1, 0), 1)
-        self.assertEqual(gcd(0, 1), 1)
-        self.assertEqual(gcd(0, -1), 1)
-        self.assertEqual(gcd(7, 1), 1)
-        self.assertEqual(gcd(7, -1), 1)
-        self.assertEqual(gcd(-23, 15), 1)
-        self.assertEqual(gcd(120, 84), 12)
-        self.assertEqual(gcd(84, -120), 12)
-        self.assertEqual(gcd(1216342683557601535506311712,
-                             436522681849110124616458784), 32)
-        c = 652560
-        x = 434610456570399902378880679233098819019853229470286994367836600566
-        y = 1064502245825115327754847244914921553977
-        a = x * c
-        b = y * c
-        self.assertEqual(gcd(a, b), c)
-        self.assertEqual(gcd(b, a), c)
-        self.assertEqual(gcd(-a, b), c)
-        self.assertEqual(gcd(b, -a), c)
-        self.assertEqual(gcd(a, -b), c)
-        self.assertEqual(gcd(-b, a), c)
-        self.assertEqual(gcd(-a, -b), c)
-        self.assertEqual(gcd(-b, -a), c)
-        c = 576559230871654959816130551884856912003141446781646602790216406874
-        a = x * c
-        b = y * c
-        self.assertEqual(gcd(a, b), c)
-        self.assertEqual(gcd(b, a), c)
-        self.assertEqual(gcd(-a, b), c)
-        self.assertEqual(gcd(b, -a), c)
-        self.assertEqual(gcd(a, -b), c)
-        self.assertEqual(gcd(-b, a), c)
-        self.assertEqual(gcd(-a, -b), c)
-        self.assertEqual(gcd(-b, -a), c)
-
-        self.assertRaises(TypeError, gcd, 120.0, 84)
-        self.assertRaises(TypeError, gcd, 120, 84.0)
-        self.assertEqual(gcd(MyIndexable(120), MyIndexable(84)), 12)
-
-        # test of specializations
-        self.assertRaises(TypeError, gcd, 120, MyIndexable(6.0))
-        self.assertRaises(TypeError, gcd, 'ahoj', 1)
-        self.assertEqual(gcd(MyIndexable(True), MyIndexable(84)), 1)
+        if (sys.version_info.major >= 3 and sys.version_info.minor >= 5):
+            gcd = math.gcd
+            self.assertEqual(gcd(0, 0), 0)
+            self.assertEqual(gcd(1, 0), 1)
+            self.assertEqual(gcd(-1, 0), 1)
+            self.assertEqual(gcd(0, 1), 1)
+            self.assertEqual(gcd(0, -1), 1)
+            self.assertEqual(gcd(7, 1), 1)
+            self.assertEqual(gcd(7, -1), 1)
+            self.assertEqual(gcd(-23, 15), 1)
+            self.assertEqual(gcd(120, 84), 12)
+            self.assertEqual(gcd(84, -120), 12)
+            self.assertEqual(gcd(1216342683557601535506311712,
+                                 436522681849110124616458784), 32)
+            c = 652560
+            x = 434610456570399902378880679233098819019853229470286994367836600566
+            y = 1064502245825115327754847244914921553977
+            a = x * c
+            b = y * c
+            self.assertEqual(gcd(a, b), c)
+            self.assertEqual(gcd(b, a), c)
+            self.assertEqual(gcd(-a, b), c)
+            self.assertEqual(gcd(b, -a), c)
+            self.assertEqual(gcd(a, -b), c)
+            self.assertEqual(gcd(-b, a), c)
+            self.assertEqual(gcd(-a, -b), c)
+            self.assertEqual(gcd(-b, -a), c)
+            c = 576559230871654959816130551884856912003141446781646602790216406874
+            a = x * c
+            b = y * c
+            self.assertEqual(gcd(a, b), c)
+            self.assertEqual(gcd(b, a), c)
+            self.assertEqual(gcd(-a, b), c)
+            self.assertEqual(gcd(b, -a), c)
+            self.assertEqual(gcd(a, -b), c)
+            self.assertEqual(gcd(-b, a), c)
+            self.assertEqual(gcd(-a, -b), c)
+            self.assertEqual(gcd(-b, -a), c)
+
+            self.assertRaises(TypeError, gcd, 120.0, 84)
+            self.assertRaises(TypeError, gcd, 120, 84.0)
+            self.assertEqual(gcd(MyIndexable(120), MyIndexable(84)), 12)
+
+            # test of specializations
+            self.assertRaises(TypeError, gcd, 120, MyIndexable(6.0))
+            self.assertRaises(TypeError, gcd, 'ahoj', 1)
+            self.assertEqual(gcd(MyIndexable(True), MyIndexable(84)), 1)
 
     def test_floor(self):
         class TestFloor:
@@ -1303,7 +1304,8 @@ def executeFnTest(self, values, fn, fnName):
                 self.assertTrue(math.isnan(result), "Test2 fail: {}({}) = {}, but was {}".format(fnName, value[0], expected, result))            
             else :
                 if result != expected:
-                    self.assertTrue(math.isclose(result, expected, rel_tol=1e-12), "Test3 fail: {}({}) = {}, but was {}".format(fnName, value[0], expected, result))
+                    if (sys.version_info.major >= 3 and sys.version_info.minor >= 5):
+                        self.assertTrue(math.isclose(result, expected, rel_tol=1e-14), "Test3 fail: {}({}) = {}, but was {}".format(fnName, value[0], expected, result))
 
     def test_erf(self):
         erfValues = [(0.0,  0.0), (-0.0, -0.0), (INF,  1.0), (NINF,  -1.0), (NAN, NAN),
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/util/GetDoubleNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/util/GetDoubleNode.java
@@ -1,27 +1,40 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
- * Copyright (c) 2014, Regents of the University of California
+ * Copyright (c) 2018, Oracle and/or its affiliates.
  *
- * All rights reserved.
+ * The Universal Permissive License (UPL), Version 1.0
  *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or data
+ * (collectively the "Software"), free of charge and under any and all copyright
+ * rights in the Software, and any and all patent rights owned or freely
+ * licensable by each licensor hereunder covering either (i) the unmodified
+ * Software as contributed to or provided by such licensor, or (ii) the Larger
+ * Works (as defined below), to deal in both
  *
- * 1. Redistributions of source code must retain the above copyright notice, this list of
- * conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of
- * conditions and the following disclaimer in the documentation and/or other materials provided
- * with the distribution.
+ * (a) the Software, and
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ *     one is included with the Software (each a "Larger Work" to which the
+ *     Software is contributed by such licensors),
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 package com.oracle.graal.python.nodes.util;
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/util/GetIntNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/util/GetIntNode.java
@@ -1,27 +1,40 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
- * Copyright (c) 2014, Regents of the University of California
+ * Copyright (c) 2018, Oracle and/or its affiliates.
  *
- * All rights reserved.
+ * The Universal Permissive License (UPL), Version 1.0
  *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or data
+ * (collectively the "Software"), free of charge and under any and all copyright
+ * rights in the Software, and any and all patent rights owned or freely
+ * licensable by each licensor hereunder covering either (i) the unmodified
+ * Software as contributed to or provided by such licensor, or (ii) the Larger
+ * Works (as defined below), to deal in both
  *
- * 1. Redistributions of source code must retain the above copyright notice, this list of
- * conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of
- * conditions and the following disclaimer in the documentation and/or other materials provided
- * with the distribution.
+ * (a) the Software, and
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ *     one is included with the Software (each a "Larger Work" to which the
+ *     Software is contributed by such licensors),
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 package com.oracle.graal.python.nodes.util;
 
