fix style

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContextFunctions.java

@@ -1472,7 +1472,8 @@ Object execute(Object[] arguments,
                 } catch (OverflowException | InteropException ex) {
                     throw CompilerDirectives.shouldNotReachHere(ex);
                 }
-                // TODO: TruffleString - when we have ISO-8859-1, we can just force the encoding and short-circuit the error reading etc
+                // TODO: TruffleString - when we have ISO-8859-1, we can just force the encoding and
+                // short-circuit the error reading etc
                 String errors = castToJavaStringNode.execute(callHPyFunction.call(context, GraalHPyNativeSymbol.POLYGLOT_FROM_STRING, arguments[3], "ascii"));
                 CodingErrorAction errorAction = CodecsModuleBuiltins.convertCodingErrorAction(errors);
                 String result = decode(errorAction, bytes);

mx.graalpython/mx_graalpython.py

@@ -1365,7 +1365,10 @@ def _python_checkpatchfiles():
             content = listfile.read()
         patchfile_pattern = re.compile(r"lib-graalpython/patches/([^/]+)/(sdist|whl)/.*\.patch")
         checked = set()
-        allowed_licenses = ["MIT", "BSD", "BSD-3-Clause", "BSD 3-Clause License", "BSD or Apache License, Version 2.0", "MIT license", "PSF"]
+        allowed_licenses = [
+            "MIT", "BSD", "BSD-3-Clause", "BSD 3-Clause License", "BSD or Apache License, Version 2.0",
+            "MIT license", "PSF", "BSD-3-Clause OR Apache-2.0"
+        ]
         for line in content.split("\n"):
             match = patchfile_pattern.search(line)
             if match: