[GR-34606] Fixes for jinja2

PullRequest: graalpython/2112

Author: msimacek

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -621,7 +621,7 @@ protected void launch(Builder contextBuilder) {
             }
             consoleHandler.setContext(context);
 
-            if (commandString != null || inputFile != null) {
+            if (commandString != null || inputFile != null || !stdinIsInteractive) {
                 try {
                     evalNonInteractive(context, consoleHandler);
                     rc = 0;
@@ -722,8 +722,7 @@ private void evalNonInteractive(Context context, ConsoleHandler consoleHandler)
         if (commandString != null) {
             src = Source.newBuilder(getLanguageId(), commandString, "<string>").build();
         } else {
-            assert inputFile != null;
-            // the path is passed through a context option
+            // the path is passed through a context option, may be empty when running from stdin
             src = Source.newBuilder(getLanguageId(), "__graalpython__.run_path()", "<internal>").internal(true).build();
         }
         context.eval(src);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/GraalPythonModuleBuiltins.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, 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
@@ -50,6 +50,7 @@
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
 
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
@@ -246,7 +247,7 @@ PNone run() {
             PythonContext context = getContext();
             String inputFilePath = context.getOption(PythonOptions.InputFilePath);
             PythonModule sysModule = context.getSysModule();
-            boolean needsMainImporter = getImporter(sysModule, inputFilePath);
+            boolean needsMainImporter = !inputFilePath.isEmpty() && getImporter(sysModule, inputFilePath);
             if (needsMainImporter) {
                 Object sysPath = sysModule.getAttribute("path");
                 PyObjectCallMethodObjArgs.getUncached().execute(null, sysPath, "insert", 0, inputFilePath);
@@ -264,11 +265,19 @@ PNone run() {
             return PNone.NONE;
         }
 
-        // Equivalent of CPython's pymain_run_file
+        // Equivalent of CPython's pymain_run_file and pymain_run_stdin
         private void runFile(PythonContext context, String inputFilePath) {
             Source source;
             try {
-                source = Source.newBuilder(PythonLanguage.ID, context.getPublicTruffleFileRelaxed(inputFilePath)).mimeType(PythonLanguage.MIME_TYPE).build();
+                Source.SourceBuilder builder;
+                if (inputFilePath.isEmpty()) {
+                    // Reading from stdin
+                    builder = Source.newBuilder(PythonLanguage.ID, new InputStreamReader(context.getStandardIn()), "<stdin>");
+                } else {
+                    TruffleFile file = context.getPublicTruffleFileRelaxed(inputFilePath);
+                    builder = Source.newBuilder(PythonLanguage.ID, file);
+                }
+                source = builder.mimeType(PythonLanguage.MIME_TYPE).build();
                 // TODO we should handle non-IO errors better
             } catch (IOException e) {
                 ErrorAndMessagePair error = OSErrorEnum.fromException(e);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, 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
@@ -362,40 +362,14 @@ public static boolean isIdentifier(String value) {
             return false;
         }
         int c = value.codePointAt(pos);
-        int type = Character.getType(c);
-        if (c != '_') {
-            // Unicode XID_Start
-            switch (type) {
-                case Character.UPPERCASE_LETTER:
-                case Character.LOWERCASE_LETTER:
-                case Character.TITLECASE_LETTER:
-                case Character.MODIFIER_LETTER:
-                case Character.OTHER_LETTER:
-                case Character.LETTER_NUMBER:
-                    break;
-                default:
-                    return false;
-            }
+        if (c != '_' && !UCharacter.hasBinaryProperty(c, UProperty.XID_START)) {
+            return false;
         }
         pos += Character.charCount(c);
         while (pos < value.length()) {
             c = value.codePointAt(pos);
-            type = Character.getType(c);
-            // Unicode XID_Continue
-            switch (type) {
-                case Character.UPPERCASE_LETTER:
-                case Character.LOWERCASE_LETTER:
-                case Character.TITLECASE_LETTER:
-                case Character.MODIFIER_LETTER:
-                case Character.OTHER_LETTER:
-                case Character.LETTER_NUMBER:
-                case Character.NON_SPACING_MARK:
-                case Character.COMBINING_SPACING_MARK:
-                case Character.DECIMAL_DIGIT_NUMBER:
-                case Character.CONNECTOR_PUNCTUATION:
-                    break;
-                default:
-                    return false;
+            if (!UCharacter.hasBinaryProperty(c, UProperty.XID_CONTINUE)) {
+                return false;
             }
             pos += Character.charCount(c);
         }

graalpython/lib-graalpython/_weakref.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2022, 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
@@ -49,9 +49,9 @@ def _proxy_get(proxy):
 
 
 class ProxyType(object):
-    def __init__(self, other):
+    def __init__(self, other, callback=None):
         import weakref
-        object.__setattr__(self, "_weakref", weakref.ref(other))
+        object.__setattr__(self, "_weakref", weakref.ref(other, callback))
 
     def __getattribute__(self, key):
         return getattr(_proxy_get(self), key)

graalpython/lib-graalpython/patches/MarkupSafe/sdist/MarkupSafe.patch

@@ -0,0 +1,25 @@
+From b1c948a07cfe2ffbb5e0954f0ee87dddd78e63ab Mon Sep 17 00:00:00 2001
+From: Michael Simacek <michael.simacek@oracle.com>
+Date: Tue, 18 Jan 2022 15:54:16 +0100
+Subject: [PATCH] Adapt for GraalPython
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index c6ee5bf..b398be9 100644
+--- a/setup.py
++++ b/setup.py
+@@ -52,7 +52,7 @@ def show_message(*lines):
+     print("=" * 74)
+ 
+ 
+-supports_speedups = platform.python_implementation() not in {"PyPy", "Jython"}
++supports_speedups = platform.python_implementation() not in {"PyPy", "Jython", "GraalVM"}
+ 
+ if os.environ.get("CIBUILDWHEEL", "0") == "1" and supports_speedups:
+     run_setup(True)
+-- 
+2.31.1
+

mx.graalpython/mx_graalpython.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2021, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
 # Copyright (c) 2013, Regents of the University of California
 #
 # All rights reserved.
@@ -1300,7 +1300,7 @@ def _python_checkpatchfiles():
             content = listfile.read()
         patchfile_pattern = re.compile(r"lib-graalpython/patches/([^/]+)/(sdist|whl)/.*\.patch")
         checked = set()
-        allowed_licenses = ["MIT", "BSD", "MIT license", "PSF"]
+        allowed_licenses = ["MIT", "BSD", "BSD-3-Clause", "MIT license", "PSF"]
         for line in content.split("\n"):
             match = patchfile_pattern.search(line)
             if match: