Fix copyright regexes to capture current year(s)

Author: msimacek

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

@@ -372,7 +372,7 @@ def g2():
             return [42]
         self.assertEqual(list(g1()), ["g2"])
 
-
+    @unittest.skipIf(sys.version_info.minor < 7, "Requires Python 3.7+")
     def test_generator_return_value(self):
         """
         Test generator return value
@@ -419,7 +419,7 @@ def g2(v = None):
             "Yielded g2 spam",
             "Yielded g2 more spam",
             "Finishing g2",
-            "g2 returned StopIteration(3,)",
+            "g2 returned StopIteration(3)",
             "Yielded g1 eggs",
             "Finishing g1",
         ])
@@ -666,6 +666,7 @@ class LunchError(Exception):
             "Finishing g1",
         ])
 
+    @unittest.skipIf(sys.version_info.minor < 7, "Requires Python 3.7+")
     def test_next_and_return_with_value(self):
         """
         Test next and return with value
@@ -697,17 +698,18 @@ def g(r):
             "g starting",
             "f resuming g",
             "g returning 1",
-            "f caught StopIteration(1,)",
+            "f caught StopIteration(1)",
             "g starting",
             "f resuming g",
             "g returning (2,)",
-            "f caught StopIteration((2,),)",
+            "f caught StopIteration((2,))",
             "g starting",
             "f resuming g",
-            "g returning StopIteration(3,)",
-            "f caught StopIteration(StopIteration(3,),)",
+            "g returning StopIteration(3)",
+            "f caught StopIteration(StopIteration(3))",
         ])
 
+    @unittest.skipIf(sys.version_info.minor < 7, "Requires Python 3.7+")
     def test_send_and_return_with_value(self):
         """
         Test send and return with value
@@ -742,17 +744,17 @@ def g(r):
             "f sending spam to g",
             "g received 'spam'",
             "g returning 1",
-            'f caught StopIteration(1,)',
+            'f caught StopIteration(1)',
             'g starting',
             'f sending spam to g',
             "g received 'spam'",
             'g returning (2,)',
-            'f caught StopIteration((2,),)',
+            'f caught StopIteration((2,))',
             'g starting',
             'f sending spam to g',
             "g received 'spam'",
-            'g returning StopIteration(3,)',
-            'f caught StopIteration(StopIteration(3,),)'
+            'g returning StopIteration(3)',
+            'f caught StopIteration(StopIteration(3))'
         ])
 
     # def test_catching_exception_from_subgen_and_returning(self):

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

@@ -29,7 +29,6 @@
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__CONTEXT__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__TRACEBACK__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__INIT__;
-import static com.oracle.graal.python.nodes.SpecialMethodNames.__REPR__;
 
 import java.util.IllegalFormatException;
 import java.util.List;
@@ -48,7 +47,6 @@
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
-import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.nodes.object.GetLazyClassNode;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
 import com.oracle.graal.python.runtime.formatting.ErrorMessageFormatter;
@@ -80,17 +78,6 @@ Object init(PBaseException self, Object[] args) {
         }
     }
 
-    @Builtin(name = __REPR__, minNumOfPositionalArgs = 1)
-    @GenerateNodeFactory
-    public abstract static class ReprNode extends PythonUnaryBuiltinNode {
-        @Specialization
-        @TruffleBoundary
-        public Object repr(PBaseException self,
-                        @Cached("create()") GetLazyClassNode getClassNode) {
-            return self.getFormattedMessage(getClassNode);
-        }
-    }
-
     @Builtin(name = "args", minNumOfPositionalArgs = 1, maxNumOfPositionalArgs = 2, isGetter = true, isSetter = true)
     @GenerateNodeFactory
     public abstract static class ArgsNode extends PythonBuiltinNode {

graalpython/lib-graalpython/base_exception.py

@@ -37,6 +37,18 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+
+def __repr__(self):
+    if self.args:
+        if len(self.args) == 1:
+            return "%s(%r)" % (type(self).__name__, self.args[0])
+        return "%s%r" % (type(self).__name__, self.args)
+    return "%s()" % type(self).__name__
+
+
+BaseException.__repr__ = __repr__
+
+
 def __str__(self):
     if self.args:
         if len(self.args) == 1:

graalpython/lib-graalpython/exceptions.py

@@ -96,12 +96,7 @@ def StopIteration__value__set(self, arg):
     self.__value__ = arg
 
 
-def StopIteration__repr__(self):
-    return "StopIteration%s" % repr(self.args)
-
-
 StopIteration.value = property(fget=StopIteration__value__get, fset=StopIteration__value__set)
-StopIteration.__repr__ = StopIteration__repr__
 
 # These errors are just an alias of OSError (i.e. 'EnvironmentError is OSError == True')
 EnvironmentError = OSError

mx.graalpython/copyrights/benchmarks.copyright.hash.regex

@@ -1,6 +1,6 @@
 (?:#!/usr/bin/env python\n)?(?:# coding=.*)?# Copyright 2008-2010 Isaac Gouy
 # Copyright \(c\) (?:20[0-9][0-9], )*201[0-9], Regents of the University of California
-# Copyright \(c\) (?:20[0-9][0-9], )*(20[0-9][0-9]), Oracle and/or its affiliates.
+# Copyright \(c\) (20[0-9][0-9], )*(20[0-9][0-9]), Oracle and/or its affiliates.
 # All rights reserved.
 #
 # Revised BSD license

mx.graalpython/copyrights/jython.copyright.star.regex

@@ -1,5 +1,5 @@
 /\*
- \* Copyright \(c\) (?:20[0-9][0-9], )*(20[0-9][0-9]), Oracle and/or its affiliates.
+ \* Copyright \(c\) (20[0-9][0-9], )*(20[0-9][0-9]), Oracle and/or its affiliates.
  \* Copyright \(c\) -?2016 Jython Developers
  \*
  \* Licensed under PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2

mx.graalpython/copyrights/oracle.copyright.regex.hash

@@ -1,4 +1,4 @@
-# Copyright \(c\) (?:20[0-9][0-9], )*(20[0-9][0-9]), Oracle and\/or its affiliates\. All rights reserved\.\s*
+# Copyright \(c\) (20[0-9][0-9], )*(20[0-9][0-9]), Oracle and\/or its affiliates\. All rights reserved\.\s*
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER\.\s*
 #\s*
 # The Universal Permissive License \(UPL\), Version 1\.0\s*

mx.graalpython/copyrights/pypy-image-demo.copyright.hash.regex

@@ -1,4 +1,4 @@
-# Copyright \(c\) (?:20[0-9][0-9], )*(20[0-9][0-9]), Oracle and/or its affiliates.
+# Copyright \(c\) (20[0-9][0-9], )*(20[0-9][0-9]), Oracle and/or its affiliates.
 # Copyright \(c\) 2013, Pablo Mouzo
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

mx.graalpython/copyrights/pypy.copyright.hash.regex

@@ -1,4 +1,4 @@
-(?:# coding=utf-8\n)?# Copyright \(c\) (?:20[0-9][0-9], )*(20[0-9][0-9]), Oracle and/or its affiliates.
+(?:# coding=utf-8\n)?# Copyright \(c\) (20[0-9][0-9], )*(20[0-9][0-9]), Oracle and/or its affiliates.
 # Copyright \(c\) 2017, The PyPy Project
 #
 #     The MIT License

mx.graalpython/copyrights/python.copyright.hash.regex

@@ -1,4 +1,4 @@
-# Copyright \(c\) (?:20[0-9][0-9], )*(20[0-9][0-9]), Oracle and/or its affiliates.
+# Copyright \(c\) (20[0-9][0-9], )*(20[0-9][0-9]), Oracle and/or its affiliates.
 # Copyright \(C\) 1996-2017 Python Software Foundation
 #
 # Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2

mx.graalpython/copyrights/python.copyright.star.regex

@@ -1,4 +1,4 @@
-/\* Copyright \(c\) (?:20[0-9][0-9], )*(20[0-9][0-9]), Oracle and/or its affiliates.
+/\* Copyright \(c\) (20[0-9][0-9], )*(20[0-9][0-9]), Oracle and/or its affiliates.
  \* Copyright \(C\) 1996-2017 Python Software Foundation
  \*
  \* Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2

mx.graalpython/copyrights/zippy.copyright.hash.regex

@@ -1,4 +1,4 @@
-# Copyright \(c\) (?:20[0-9][0-9], )*(20[0-9][0-9]), Oracle and/or its affiliates.
+# Copyright \(c\) (20[0-9][0-9], )*(20[0-9][0-9]), Oracle and/or its affiliates.
 # Copyright \(c\) (?:20[0-9][0-9], )*201[0-9], Regents of the University of California
 #
 # All rights reserved.

mx.graalpython/copyrights/zippy.copyright.star.regex

@@ -1,5 +1,5 @@
 /\*
- \* Copyright \(c\) (?:20[0-9][0-9], )*(20[0-9][0-9]), Oracle and/or its affiliates.
+ \* Copyright \(c\) (20[0-9][0-9], )*(20[0-9][0-9]), Oracle and/or its affiliates.
  \* Copyright \(c\) 20[0-9][0-9], Regents of the University of California
  \*
  \* All rights reserved.