[GR-36132] Fix failing panda tests after CSV intrinsification.

PullRequest: graalpython/2105

Author: phoeinx

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

@@ -1,4 +1,4 @@
-# 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
@@ -41,7 +41,7 @@
 import csv
 from tempfile import TemporaryFile
 
-class CsvTest(unittest.TestCase):
+class TestUnicodeCharacters(unittest.TestCase):
     def test_read_utf_32_delimiter(self):
         test_data = ['a\U0001F642b']
         reader = csv.reader(test_data, delimiter="\U0001F642")
@@ -74,6 +74,32 @@ def test_write_utf32_field_with_utf32_delimiter(self):
             self.assertEqual(fileobj.read(),
                              expected + writer.dialect.lineterminator)
 
+class TestDialectValidity(unittest.TestCase):
+    # CPython supports empty quotechars and escapechars until inclusive 3.10.
+    def test_quoting(self):
+        class MyDialect(csv.Dialect):
+            delimiter = ";"
+            escapechar = '\\'
+            doublequote = False
+            skipinitialspace = True
+            lineterminator = '\r\n'
+            quoting = csv.QUOTE_NONE
+            quotechar = ""
+        d = MyDialect()
+        self.assertEqual(d.quotechar, "")
+
+    def test_escapechar(self):
+        class MyDialect(csv.Dialect):
+            delimiter = ";"
+            doublequote = False
+            skipinitialspace = True
+            lineterminator = '\r\n'
+            quoting = csv.QUOTE_NONE
+            escapechar = ""
+        d = MyDialect()
+        self.assertEqual(d.escapechar, "")
+
+
 
 
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/csv/CSVModuleBuiltins.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 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
@@ -48,6 +48,7 @@
 
 import java.util.List;
 
+import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.Python3Core;
@@ -93,6 +94,11 @@
 @CoreFunctions(defineModule = "_csv")
 public final class CSVModuleBuiltins extends PythonBuiltins {
 
+    static {
+        // See comment about Python 3.10 in #getChar() and graalpython/test/test_csv.py
+        assert PythonLanguage.MINOR <= 10;
+    }
+
     static final String WRITE = "write";
     static final String NOT_SET = "NOT_SET";
     static final int NOT_SET_CODEPOINT = -1;
@@ -531,10 +537,15 @@ private String getChar(String name, Object valueObj, String defaultValue,
                 throw raise(TypeError, ErrorMessages.S_MUST_BE_STRING_NOT_S, name, getType.execute(valueObj));
             }
 
-            if (charValue.length() != 1 && charValue.codePointCount(0, charValue.length()) != 1) {
+            if (charValue.length() > 1 && charValue.codePointCount(0, charValue.length()) > 1) {
                 throw raise(TypeError, ErrorMessages.MUST_BE_ONE_CHARACTER_STRING, name);
             }
 
+            // CPython supports empty quotechars and escapechars until inclusive 3.10.
+            if (charValue.length() == 0) {
+                return NOT_SET;
+            }
+
             return charValue;
         }
 
@@ -592,7 +603,7 @@ private QuoteStyle getQuotingValue(VirtualFrame frame, String name, Object value
             }
 
             if (!pyLongCheckExactNode.execute(valueObj)) {
-                throw raise(TypeError, ErrorMessages.MUST_BE_INTEGER, name);
+                throw raise(TypeError, ErrorMessages.MUST_BE_INTEGER_QUOTED_ATTR, name);
             }
 
             int value = pyLongAsIntNode.execute(frame, valueObj);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ErrorMessages.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 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
@@ -449,6 +449,7 @@ public abstract class ErrorMessages {
     public static final String MUST_BE_BYTE_STRING_LEGTH1_NOT_P = "must be a byte string of length 1, not %p";
     public static final String MUST_BE_EITHER_OR = "%s: '%s' must be either %s or %s";
     public static final String MUST_BE_INTEGER = "%s must be an integer";
+    public static final String MUST_BE_INTEGER_QUOTED_ATTR = "\"%s\" must be an integer";
     public static final String MUST_BE_INTEGER_NOT_P = "%s must be an integer, not %p";
     public static final String MUST_BE_NON_NEGATIVE = "%s must be non-negative";
     public static final String MUST_BE_NON_NEGATIVE_INTEGER = "%s must be non-negative integer";