Fix copyright year.

fangerer · fangerer · commit 2b53fdc3042e · 2019-01-10T14:09:21.000+01:00
diff --git a/graalpython/com.oracle.graal.python.cext/src/capi.c b/graalpython/com.oracle.graal.python.cext/src/capi.c
@@ -44,6 +44,7 @@ void *PY_TRUFFLE_CEXT;
 void *PY_BUILTIN;
 void *Py_NoValue;
 
+
 PyObject*(*PY_TRUFFLE_LANDING)(void *rcv, void* name, ...);
 PyObject*(*PY_TRUFFLE_LANDING_L)(void *rcv, void* name, ...);
 PyObject*(*PY_TRUFFLE_LANDING_D)(void *rcv, void* name, ...);
@@ -53,6 +54,7 @@ uint64_t (*PY_TRUFFLE_CEXT_LANDING_L)(void* name, ...);
 double (*PY_TRUFFLE_CEXT_LANDING_D)(void* name, ...);
 void* (*PY_TRUFFLE_CEXT_LANDING_PTR)(void* name, ...);
 
+
 cache_t cache;
 
 __attribute__((constructor (__COUNTER__)))
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/test_re.py b/graalpython/com.oracle.graal.python.test/src/tests/test_re.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2018, Oracle and/or its affiliates.
+# Copyright (c) 2019, Oracle and/or its affiliates.
 # Copyright (C) 1996-2017 Python Software Foundation
 #
 # Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CExtNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CExtNodes.java
@@ -1259,7 +1259,7 @@ long run(double value) {
 
         @Specialization
         long run(PInt value) {
-            // TODO(fa) longValueExact ?
+            // TODO(fa) should we use longValueExact ?
             return value.longValue();
         }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonObjectNativeWrapperMR.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonObjectNativeWrapperMR.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2019, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/ObjectBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/ObjectBuiltins.java
@@ -38,12 +38,14 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__EQ__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__FORMAT__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__GETATTRIBUTE__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__GETATTR__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__GET__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__HASH__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__INIT__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__LEN__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__NE__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__REPR__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__SETATTR__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__SET__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__STR__;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.AttributeError;
@@ -68,7 +70,6 @@
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.nodes.PGuards;
-import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.attributes.LookupAttributeInMRONode;
 import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
 import com.oracle.graal.python.nodes.attributes.WriteAttributeToObjectNode;
@@ -455,7 +456,7 @@ private LazyPythonClass getDataClass(Object descr) {
         }
     }
 
-    @Builtin(name = SpecialMethodNames.__GETATTR__, fixedNumOfPositionalArgs = 2)
+    @Builtin(name = __GETATTR__, fixedNumOfPositionalArgs = 2)
     @GenerateNodeFactory
     public abstract static class GetattrNode extends PythonBinaryBuiltinNode {
         @Specialization
@@ -464,7 +465,7 @@ Object getattr(Object object, Object key) {
         }
     }
 
-    @Builtin(name = SpecialMethodNames.__SETATTR__, fixedNumOfPositionalArgs = 3)
+    @Builtin(name = __SETATTR__, fixedNumOfPositionalArgs = 3)
     @GenerateNodeFactory
     public abstract static class SetattrNode extends PythonTernaryBuiltinNode {
         @Specialization
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/slice/PSlice.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/slice/PSlice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/SpecialMethodNames.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/SpecialMethodNames.java
@@ -41,6 +41,7 @@
 package com.oracle.graal.python.nodes;
 
 public abstract class SpecialMethodNames {
+
     public static final String __NEW__ = "__new__";
     public static final String __ALLOC__ = "__alloc__";
     public static final String __INIT__ = "__init__";
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/GetAttributeNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/GetAttributeNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/PythonCallNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/PythonCallNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
  * Copyright (c) 2014, Regents of the University of California
  *
  * All rights reserved.
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupAndCallBinaryNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupAndCallBinaryNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
diff --git a/graalpython/lib-graalpython/_socket.py b/graalpython/lib-graalpython/_socket.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
diff --git a/graalpython/lib-graalpython/modules/ginstall.py b/graalpython/lib-graalpython/modules/ginstall.py
@@ -53,34 +53,6 @@ def system(cmd, msg=""):
         xit(msg, status=status)
 
 
-def install_from_url(url, patch=None):
-    name = url[url.rfind("/")+1:]
-    tempdir = tempfile.mkdtemp()
-
-    # honor env var 'HTTP_PROXY' and 'HTTPS_PROXY'
-    env = os.environ
-    curl_opts = []
-    if url.startswith("http://") and "HTTP_PROXY" in env:
-        curl_opts += ["--proxy", env["HTTP_PROXY"]]
-    elif url.startswith("https://") and "HTTPS_PROXY" in env:
-        curl_opts += ["--proxy", env["HTTPS_PROXY"]]
-
-    system("curl %s -o %s/%s %s" % (" ".join(curl_opts), tempdir, name, url))
-    if name.endswith(".tar.gz"):
-        system("tar xzf %s/%s -C %s" % (tempdir, name, tempdir))
-        bare_name = name[:-len(".tar.gz")]
-    elif name.endswith(".zip"):
-        system("unzip -u %s/%s -d %s" % (tempdir, name, tempdir))
-        bare_name = name[:-len(".zip")]
-        
-    if patch:
-        with open("%s/%s.patch" % (tempdir, bare_name), "w") as f:
-            f.write(patch)
-        system("patch -d %s/%s/ -p1 < %s/%s.patch" % ((tempdir, bare_name)*2))
-    
-    system("cd %s/%s; %s setup.py install --user" % (tempdir, bare_name, sys.executable))
-
-
 def known_packages():
     def PyYAML():
         install_from_pypi("PyYAML==3.13")
@@ -97,25 +69,13 @@ def setuptools():
     def setuptools_scm():
         install_from_url("https://files.pythonhosted.org/packages/70/bc/f34b06274c1260c5e4842f789fb933a09b89f23549f282b36a15bdf63614/setuptools_scm-1.15.0rc1.tar.gz")
 
-    def setuptools():
-        install_from_pypi("setuptools")
-        try:
-            import setuptools_scm as st_scm
-        except ImportError:
-            setuptools_scm()
-
     def numpy():
         try:
             import setuptools as st
         except ImportError:
             print("Installing required dependency: setuptools")
             setuptools()
 
-        url = "https://files.pythonhosted.org/packages/b0/2b/497c2bb7c660b2606d4a96e2035e92554429e139c6c71cdff67af66b58d2/numpy-1.14.3.zip"
-        tempdir = tempfile.mkdtemp()
-        system("curl -o %s/numpy-1.14.3.zip %s" % (tempdir, url))
-        system("unzip -u %s/numpy-1.14.3.zip -d %s" % (tempdir, tempdir))
-
         patch = """
 diff --git a/setup.py 2018-02-28 17:03:26.000000000 +0100
 index e450a66..ed538b4 100644
@@ -348,10 +308,24 @@ def get_lapack_lite_sources(ext, build_dir):
 2.14.1
 
 """
-        with open("%s/numpy.patch" % tempdir, "w") as f:
-            f.write(patch)
-        system("patch -d %s/numpy-1.14.3/ -p1 < %s/numpy.patch" % (tempdir, tempdir))
-        system("cd %s/numpy-1.14.3; %s setup.py install --user" % (tempdir, sys.executable))
+        install_from_url("https://files.pythonhosted.org/packages/b0/2b/497c2bb7c660b2606d4a96e2035e92554429e139c6c71cdff67af66b58d2/numpy-1.14.3.zip", patch=patch)
+
+
+    def dateutil():
+        try:
+            import setuptools_scm as st_scm
+        except ImportError:
+            print("Installing required dependency: setuptools_scm")
+            setuptools_scm()
+        install_from_url("https://files.pythonhosted.org/packages/0e/01/68747933e8d12263d41ce08119620d9a7e5eb72c876a3442257f74490da0/python-dateutil-2.7.5.tar.gz")
+
+
+    def pytz():
+        install_from_url("https://files.pythonhosted.org/packages/cd/71/ae99fc3df1b1c5267d37ef2c51b7d79c44ba8a5e37b48e3ca93b4d74d98b/pytz-2018.7.tar.gz")
+
+
+    def six():
+        install_from_url("https://files.pythonhosted.org/packages/dd/bf/4138e7bfb757de47d1f4b6994648ec67a51efe58fa907c1e11e350cddfca/six-1.12.0.tar.gz")
 
 
     def pandas():
@@ -365,17 +339,20 @@ def pandas():
         try: 
             import pytz as _dummy_pytz
         except ImportError:
-            install_from_url("https://files.pythonhosted.org/packages/cd/71/ae99fc3df1b1c5267d37ef2c51b7d79c44ba8a5e37b48e3ca93b4d74d98b/pytz-2018.7.tar.gz")
+            print("Installing required dependency: pytz")
+            pytz()
 
         try: 
             import six as _dummy_six
         except ImportError:
-            install_from_url("https://files.pythonhosted.org/packages/dd/bf/4138e7bfb757de47d1f4b6994648ec67a51efe58fa907c1e11e350cddfca/six-1.12.0.tar.gz")
+            print("Installing required dependency: six")
+            six()
 
         try: 
             import dateutil as __dummy_dateutil
         except ImportError:
-            install_from_url("https://files.pythonhosted.org/packages/0e/01/68747933e8d12263d41ce08119620d9a7e5eb72c876a3442257f74490da0/python-dateutil-2.7.5.tar.gz")
+            print("Installing required dependency: dateutil")
+            dateutil()
 
         # download pandas-0.20.3
         patch = """diff --git a/pandas/_libs/src/period_helper.c b/pandas/_libs/src/period_helper.c
@@ -418,6 +395,34 @@ def xit(msg, status=-1):
     exit(-1)
 
 
+def install_from_url(url, patch=None):
+    name = url[url.rfind("/")+1:]
+    tempdir = tempfile.mkdtemp()
+
+    # honor env var 'HTTP_PROXY' and 'HTTPS_PROXY'
+    env = os.environ
+    curl_opts = []
+    if url.startswith("http://") and "HTTP_PROXY" in env:
+        curl_opts += ["--proxy", env["HTTP_PROXY"]]
+    elif url.startswith("https://") and "HTTPS_PROXY" in env:
+        curl_opts += ["--proxy", env["HTTPS_PROXY"]]
+
+    system("curl %s -o %s/%s %s" % (" ".join(curl_opts), tempdir, name, url))
+    if name.endswith(".tar.gz"):
+        system("tar xzf %s/%s -C %s" % (tempdir, name, tempdir))
+        bare_name = name[:-len(".tar.gz")]
+    elif name.endswith(".zip"):
+        system("unzip -u %s/%s -d %s" % (tempdir, name, tempdir))
+        bare_name = name[:-len(".zip")]
+        
+    if patch:
+        with open("%s/%s.patch" % (tempdir, bare_name), "w") as f:
+            f.write(patch)
+        system("patch -d %s/%s/ -p1 < %s/%s.patch" % ((tempdir, bare_name)*2))
+    
+    system("cd %s/%s; %s setup.py install --user" % (tempdir, bare_name, sys.executable))
+
+
 def install_from_pypi(package, extra_opts=[]):
     if "==" in package:
         package, _, version = package.rpartition("==")
diff --git a/graalpython/lib-graalpython/python_cext.py b/graalpython/lib-graalpython/python_cext.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Copyright (c) 2018, Oracle and/or its affiliates.`
	`1`	`+# Copyright (c) 2019, Oracle and/or its affiliates.`
`2`	`2`	`# Copyright (C) 1996-2017 Python Software Foundation`
`3`	`3`	`#`
`4`	`4`	`# Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.`
	`2`	`+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates.`
`3`	`3`	`* Copyright (c) 2013, Regents of the University of California`
`4`	`4`	`*`
`5`	`5`	`* All rights reserved.`
Original file line number	Diff line number	Diff line change
`@@ -1259,7 +1259,7 @@ long run(double value) {`
`1259`	`1259`
`1260`	`1260`	`@Specialization`
`1261`	`1261`	`long run(PInt value) {`
`1262`		`- // TODO(fa) longValueExact ?`
	`1262`	`+ // TODO(fa) should we use longValueExact ?`
`1263`	`1263`	`return value.longValue();`
`1264`	`1264`	`}`
`1265`	`1265`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* The Universal Permissive License (UPL), Version 1.0`