Skip to content

Commit b6b80a9

Browse files
committed
Add assertion for PythonLanguage.MINOR_VERSION <= 10 to CSVModuleBuiltins.
Also update comments about compatability with CPython for clarity.
1 parent 75f635f commit b6b80a9

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def test_write_utf32_field_with_utf32_delimiter(self):
7575
expected + writer.dialect.lineterminator)
7676

7777
class TestDialectValidity(unittest.TestCase):
78-
# CPython supports empty quotechars and escapechars until 3.10.
78+
# CPython supports empty quotechars and escapechars until inclusive 3.10.
7979
def test_quoting(self):
8080
class MyDialect(csv.Dialect):
8181
delimiter = ";"

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848

4949
import java.util.List;
5050

51+
import com.oracle.graal.python.PythonLanguage;
5152
import com.oracle.graal.python.builtins.Builtin;
5253
import com.oracle.graal.python.builtins.CoreFunctions;
5354
import com.oracle.graal.python.builtins.Python3Core;
@@ -93,6 +94,11 @@
9394
@CoreFunctions(defineModule = "_csv")
9495
public final class CSVModuleBuiltins extends PythonBuiltins {
9596

97+
static {
98+
// See comment about Python 3.10 in #getChar() and graalpython/test/test_csv.py
99+
assert PythonLanguage.MINOR <= 10;
100+
}
101+
96102
static final String WRITE = "write";
97103
static final String NOT_SET = "NOT_SET";
98104
static final int NOT_SET_CODEPOINT = -1;
@@ -535,7 +541,7 @@ private String getChar(String name, Object valueObj, String defaultValue,
535541
throw raise(TypeError, ErrorMessages.MUST_BE_ONE_CHARACTER_STRING, name);
536542
}
537543

538-
// CPython supports empty quotechars and escapechars until 3.10.
544+
// CPython supports empty quotechars and escapechars until inclusive 3.10.
539545
if (charValue.length() == 0) {
540546
return NOT_SET;
541547
}

0 commit comments

Comments
 (0)