Merge branch 'master' into feature/GR-28392_ssl

Author: msimacek

CHANGELOG.md

@@ -7,6 +7,19 @@ language runtime. The main focus is on user-observable behavior of the engine.
 
 * Added SSL/TLS support (the `ssl` module)
 
+## Version 21.1.0
+
+* Added subclassing of Java classes in JVM mode
+* Use native posix functions in the GraalPython Launcher
+* Support iterating over Python objects from Java and other languages as well as iterating over foreign objects in Python
+* Support catching foreign exceptions in catch-all except clauses
+
+## Version 21.1.0
+
+* Support catching exceptions from other languages or Java with catch-all except blocks
+* Support iterating over iterables from other languages, as well as allow other languages to iterate over Python iterables and iterators
+* Support isinstance and issubclass with instances and classes of other languages
+
 ## Version 21.0.0
 
 * Implement name mangling for private attributes

THIRD_PARTY_LICENSE.txt

@@ -3200,3 +3200,177 @@ 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.
+
+
+XY (liblzma)
+
+https://git.tukaani.org/?p=xz.git;a=blob;f=COPYING  
+   1 
+   2 XZ Utils Licensing
+   3 ==================
+   4 
+   5     Different licenses apply to different files in this package. Here
+   6     is a rough summary of which licenses apply to which parts of this
+   7     package (but check the individual files to be sure!):
+   8 
+   9       - liblzma is in the public domain.
+  10 
+  11       - xz, xzdec, and lzmadec command line tools are in the public
+  12         domain unless GNU getopt_long had to be compiled and linked
+  13         in from the lib directory. The getopt_long code is under
+  14         GNU LGPLv2.1+.
+  15 
+  16       - The scripts to grep, diff, and view compressed files have been
+  17         adapted from gzip. These scripts and their documentation are
+  18         under GNU GPLv2+.
+  19 
+  20       - All the documentation in the doc directory and most of the
+  21         XZ Utils specific documentation files in other directories
+  22         are in the public domain.
+  23 
+  24       - Translated messages are in the public domain.
+  25 
+  26       - The build system contains public domain files, and files that
+  27         are under GNU GPLv2+ or GNU GPLv3+. None of these files end up
+  28         in the binaries being built.
+  29 
+  30       - Test files and test code in the tests directory, and debugging
+  31         utilities in the debug directory are in the public domain.
+  32 
+  33       - The extra directory may contain public domain files, and files
+  34         that are under various free software licenses.
+  35 
+  36     You can do whatever you want with the files that have been put into
+  37     the public domain. If you find public domain legally problematic,
+  38     take the previous sentence as a license grant. If you still find
+  39     the lack of copyright legally problematic, you have too many
+  40     lawyers.
+  41 
+  42     As usual, this software is provided "as is", without any warranty.
+  43 
+  44     If you copy significant amounts of public domain code from XZ Utils
+  45     into your project, acknowledging this somewhere in your software is
+  46     polite (especially if it is proprietary, non-free software), but
+  47     naturally it is not legally required. Here is an example of a good
+  48     notice to put into "about box" or into documentation:
+  49 
+  50         This software includes code from XZ Utils <https://tukaani.org/xz/>.
+  51 
+  52     The following license texts are included in the following files:
+  53       - COPYING.LGPLv2.1: GNU Lesser General Public License version 2.1
+  54       - COPYING.GPLv2: GNU General Public License version 2
+  55       - COPYING.GPLv3: GNU General Public License version 3
+  56 
+  57     Note that the toolchain (compiler, linker etc.) may add some code
+  58     pieces that are copyrighted. Thus, it is possible that e.g. liblzma
+  59     binary wouldn't actually be in the public domain in its entirety
+  60     even though it contains no copyrighted code from the XZ Utils source
+  61     package.
+  62 
+  63     If you have questions, don't hesitate to ask the author(s) for more
+  64     information.
+  65 
+
+ === AUTHORS file ===
+Authors of XZ Utils
+===================
+    XZ Utils is developed and maintained by Lasse Collin
+    <[email protected]>.
+    Major parts of liblzma are based on code written by Igor Pavlov,
+    specifically the LZMA SDK <http://7-zip.org/sdk.html>. Without
+    this code, XZ Utils wouldn't exist.
+    The SHA-256 implementation in liblzma is based on the code found from
+    7-Zip <http://7-zip.org/>, which has a modified version of the SHA-256
+    code found from Crypto++ <http://www.cryptopp.com/>. The SHA-256 code
+    in Crypto++ was written by Kevin Springle and Wei Dai.
+    Some scripts have been adapted from gzip. The original versions
+    were written by Jean-loup Gailly, Charles Levert, and Paul Eggert.
+    Andrew Dudman helped adapting the scripts and their man pages for
+    XZ Utils.
+    The GNU Autotools-based build system contains files from many authors,
+    which I'm not trying to list here.
+    Several people have contributed fixes or reported bugs. Most of them
+    are mentioned in the file THANKS.
+
+======================================================
+Many source files in root have this
+###############################################################################
+#
+# Author: Lasse Collin
+#
+# This file has been put into the public domain.
+# You can do whatever you want with this file.
+#
+###############################################################################
+
+=== Files in liblzma have ====
+/**
+   2  * \file        api/lzma.h
+   3  * \brief       The public API of liblzma data compression library
+   4  *
+   5  * liblzma is a public domain general-purpose data compression library with
+   6  * a zlib-like API. The native file format is .xz, but also the old .lzma
+   7  * format and raw (no headers) streams are supported. Multiple compression
+   8  * algorithms (filters) are supported. Currently LZMA2 is the primary filter.
+   9  *
+  10  * liblzma is part of XZ Utils <http://tukaani.org/xz/>. XZ Utils includes
+  11  * a gzip-like command line tool named xz and some other tools. XZ Utils
+  12  * is developed and maintained by Lasse Collin.
+  13  *
+  14  * Major parts of liblzma are based on Igor Pavlov's public domain LZMA SDK
+  15  * <http://7-zip.org/sdk.html>.
+  16  *
+  17  * The SHA-256 implementation is based on the public domain code found from
+  18  * 7-Zip <http://7-zip.org/>, which has a modified version of the public
+  19  * domain SHA-256 code found from Crypto++ <http://www.cryptopp.com/>.
+  20  * The SHA-256 code in Crypto++ was written by Kevin Springle and Wei Dai.
+  21  */
+  22 
+  23 /*
+  24  * Author: Lasse Collin
+  25  *
+  26  * This file has been put into the public domain.
+  27  * You can do whatever you want with this file.
+  28  */
+  29 
+  =======
+  
+  //  Authors:    Igor Pavlov
+   7 //              Lasse Collin
+   8 //
+   9 //  This file has been put into the public domain.
+  10 //  You can do whatever you want with this file.
+  
+  === lzmainfo, xz, xzdec sources ===
+   1 ///////////////////////////////////////////////////////////////////////////////
+   2 //
+   3 /// \file       lzmainfo.c
+   4 /// \brief      lzmainfo tool for compatibility with LZMA Utils
+   5 //
+   6 //  Author:     Lasse Collin
+   7 //
+   8 //  This file has been put into the public domain.
+   9 //  You can do whatever you want with this file.
+  10 //
+  11 ///////////////////////////////////////////////////////////////////////////////
+  12 
+  
+==== common sources =====
+     //  Authors:    Lasse Collin
+  38 //              Joachim Henke
+  39 //
+  40 //  This file has been put into the public domain.
+  41 //  You can do whatever you want with this file.
+  42 //
+  43 ///////////////////////////////////////////////////////////////////////////////
+==== scripts sources ====
+   2 .\" Authors: Andrew Dudman
+   3 .\"          Lasse Collin
+   4 .\"
+   5 .\" This file has been put into the public domain.
+   6 .\" You can do whatever you want with this file.
+   7 .\"
+   8 .\" (Note that this file is not based on gzip's zless.1.)
+   =
+
+Oracle GraalPython uses only the "public domain" source files that belong to liblzma.

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "69d605b7f6f27a86c9e0e8e6c0991a61dbf09d3f" }
+{ "overlay": "170e550ee492b57eddde3fbe3e2334bcf3ff5d5f" }

graalpython/com.oracle.graal.python.annotations/src/com/oracle/graal/python/annotations/ArgumentClinic.java

@@ -66,8 +66,9 @@
 
     /**
      * The string should contain valid Java constant value expression, for example, {@code true}, or
-     * {@code \"some string\"}. You may have to update the annotation processor to include import of
-     * necessary packages or use fully qualified names.
+     * {@code \"some string\"}. Another supported value is an identifier of a static field inside
+     * the annotated class. For anything else, you may have to update the annotation processor to
+     * include import of necessary packages or use fully qualified names.
      */
     String defaultValue() default "";
 
@@ -122,10 +123,21 @@ enum ClinicConversion {
          */
         Int,
         /**
-         * Corresponds to CPython's {@code Py_ssize_t} converter. Supports {@link #defaultValue()},
-         * and {@link #useDefaultForNone()}.
+         * Corresponds to CPython's {@code long} converter ("L"/"l" for old style conversions).
+         * Supports {@link #defaultValue()}, and {@link #useDefaultForNone()}.
+         */
+        Long,
+        /**
+         * Corresponds to CPython's {@code Py_ssize_t} converter, except that it converts the result
+         * into Java integer. Supports {@link #defaultValue()}, and {@link #useDefaultForNone()}.
          */
         Index,
+        /**
+         * Roughly corresponds to CPython's legacy "n" converter: calls the __index__ and then
+         * converts it to Java long. Supports {@link #defaultValue()}, and
+         * {@link #useDefaultForNone()}.
+         */
+        LongIndex,
         /**
          * Corresponds to CPython's {@code slice_index} converter. Supports {@link #defaultValue()},
          * and {@link #useDefaultForNone()}.