[GR-23285] Make test_csv pass.

PullRequest: graalpython/1680

Author: tomasstupka

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

@@ -485,3 +485,37 @@ def iterate_and_update(it):
 
     s = {1, 2}
     assert_raises(RuntimeError, iterate_and_update, s)
+
+# copied and modified test_collections.py#test_issue_4920
+# the original will always fail on graalpython due to different set order
+def test_MutableSet_pop():
+    class MySet(MutableSet):
+        __slots__=['__s']
+        def __init__(self,items=None):
+            if items is None:
+                items=[]
+            self.__s=set(items)
+        def __contains__(self,v):
+            return v in self.__s
+        def __iter__(self):
+            return iter(self.__s)
+        def __len__(self):
+            return len(self.__s)
+        def add(self,v):
+            result=v not in self.__s
+            self.__s.add(v)
+            return result
+        def discard(self,v):
+            result=v in self.__s
+            self.__s.discard(v)
+            return result
+        def __repr__(self):
+            return "MySet(%s)" % repr(list(self))
+    l = [5,43]
+    s = MySet(l)
+    v1 = s.pop()
+    assert v1 in l
+    v2 = s.pop()
+    assert v2 in l
+    assert v1 != v2
+    assert len(s) == 0

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_csv.txt

@@ -1,4 +1,5 @@
 *graalpython.lib-python.3.test.test_csv.KeyOrderingTest.test_ordered_dict_reader
+*graalpython.lib-python.3.test.test_csv.KeyOrderingTest.test_ordering_for_the_dict_reader_and_writer
 *graalpython.lib-python.3.test.test_csv.MiscTestCase.test__all__
 *graalpython.lib-python.3.test.test_csv.TestArrayWrites.test_char_write
 *graalpython.lib-python.3.test.test_csv.TestArrayWrites.test_double_write
@@ -40,7 +41,10 @@
 *graalpython.lib-python.3.test.test_csv.TestDialectRegistry.test_space_dialect
 *graalpython.lib-python.3.test.test_csv.TestDialectUnix.test_simple_reader
 *graalpython.lib-python.3.test.test_csv.TestDialectUnix.test_simple_writer
+*graalpython.lib-python.3.test.test_csv.TestDialectValidity.test_delimiter
 *graalpython.lib-python.3.test.test_csv.TestDialectValidity.test_invalid_chars
+*graalpython.lib-python.3.test.test_csv.TestDialectValidity.test_lineterminator
+*graalpython.lib-python.3.test.test_csv.TestDialectValidity.test_quoting
 *graalpython.lib-python.3.test.test_csv.TestDictFields.test_read_dict_fieldnames_chain
 *graalpython.lib-python.3.test.test_csv.TestDictFields.test_read_dict_fieldnames_from_file
 *graalpython.lib-python.3.test.test_csv.TestDictFields.test_read_dict_fields
@@ -53,9 +57,12 @@
 *graalpython.lib-python.3.test.test_csv.TestDictFields.test_read_short
 *graalpython.lib-python.3.test.test_csv.TestDictFields.test_read_with_blanks
 *graalpython.lib-python.3.test.test_csv.TestDictFields.test_typo_in_extrasaction_raises_error
+*graalpython.lib-python.3.test.test_csv.TestDictFields.test_write_field_not_in_field_names_ignore
 *graalpython.lib-python.3.test.test_csv.TestDictFields.test_write_field_not_in_field_names_raise
 *graalpython.lib-python.3.test.test_csv.TestDictFields.test_write_fields_not_in_fieldnames
+*graalpython.lib-python.3.test.test_csv.TestDictFields.test_write_multiple_dict_rows
 *graalpython.lib-python.3.test.test_csv.TestDictFields.test_write_no_fields
+*graalpython.lib-python.3.test.test_csv.TestDictFields.test_write_simple_dict
 *graalpython.lib-python.3.test.test_csv.TestEscapedExcel.test_escape_fieldsep
 *graalpython.lib-python.3.test.test_csv.TestEscapedExcel.test_read_escape_fieldsep
 *graalpython.lib-python.3.test.test_csv.TestLeaks.test_create_read
@@ -72,9 +79,11 @@
 *graalpython.lib-python.3.test.test_csv.TestSniffer.test_sniff
 *graalpython.lib-python.3.test.test_csv.TestUnicode.test_unicode_read
 *graalpython.lib-python.3.test.test_csv.TestUnicode.test_unicode_write
+*graalpython.lib-python.3.test.test_csv.Test_Csv.test_read_bigfield
 *graalpython.lib-python.3.test.test_csv.Test_Csv.test_read_eol
 *graalpython.lib-python.3.test.test_csv.Test_Csv.test_read_escape
 *graalpython.lib-python.3.test.test_csv.Test_Csv.test_read_linenum
+*graalpython.lib-python.3.test.test_csv.Test_Csv.test_read_oddinputs
 *graalpython.lib-python.3.test.test_csv.Test_Csv.test_read_quoting
 *graalpython.lib-python.3.test.test_csv.Test_Csv.test_reader_arg_valid
 *graalpython.lib-python.3.test.test_csv.Test_Csv.test_reader_attrs
@@ -84,6 +93,7 @@
 *graalpython.lib-python.3.test.test_csv.Test_Csv.test_write_arg_valid
 *graalpython.lib-python.3.test.test_csv.Test_Csv.test_write_bigfield
 *graalpython.lib-python.3.test.test_csv.Test_Csv.test_write_escape
+*graalpython.lib-python.3.test.test_csv.Test_Csv.test_write_iterable
 *graalpython.lib-python.3.test.test_csv.Test_Csv.test_write_quoting
 *graalpython.lib-python.3.test.test_csv.Test_Csv.test_writer_arg_valid
 *graalpython.lib-python.3.test.test_csv.Test_Csv.test_writer_attrs

graalpython/lib-python/3/_csv.py

@@ -120,13 +120,15 @@ def __new__(cls, dialect = None, **kwargs):
         def set_char(x):
             if x is None:
                 return None
-            if isinstance(x, str) and len(x) <= 1:
+            if not isinstance(x, str):
+                raise TypeError('"%s" must be string, not %s' % (name, type(x).__name__))
+            if len(x) == 1:
                 return x
-            raise TypeError("%r must be a 1-character string" % (name,))
+            raise TypeError('"%s" must be a 1-character string' % (name,))
         def set_str(x):
             if isinstance(x, str):
                 return x
-            raise TypeError("%r must be a string" % (name,))
+            raise TypeError('"%s" must be a string' % (name))
         def set_quoting(x):
             if x in range(4):
                 return x
@@ -257,8 +259,7 @@ def __next__(self):
                 raise
 
             self.line_num += 1
-
-            if '\0' in line:
+            if isinstance(line, str) and '\0' in line or isinstance(line, bytes) and line.index(0) >=0:
                 raise Error("line contains NULL byte")
             pos = 0
             while pos < len(line):
@@ -504,16 +505,20 @@ def _join_append(self, field, quoted, quote_empty):
 
 
     def writerow(self, row):
+        if row is None:
+            raise Error
+        
         dialect = self.dialect
-        try:
-            rowlen = len(row)
-        except TypeError:
-            raise Error("sequence expected")
 
         # join all fields in internal buffer
         self._join_reset()
 
+        fields = []
         for field in row:
+            fields.append(field)
+            
+        rowlen = len(fields)    
+        for field in fields:
             quoted = False
             if dialect.quoting == QUOTE_NONNUMERIC:
                 try:
@@ -526,6 +531,8 @@ def writerow(self, row):
                 quoted = True
 
             if field is None:
+                if dialect.quoting == QUOTE_NONE:
+                    raise Error
                 value = ""
             elif isinstance(field, float):
                 value = repr(field)
@@ -589,7 +596,7 @@ def field_size_limit(limit=undefined):
     old_limit = _field_limit
 
     if limit is not undefined:
-        if not isinstance(limit, (int, long)):
+        if not isinstance(limit, int):
             raise TypeError("int expected, got %s" %
                             (limit.__class__.__name__,))
         _field_limit = limit

graalpython/lib-python/3/test/test_collections.py

@@ -1400,6 +1400,7 @@ def test_issue_5647(self):
         s &= WithSet('cdef')            # This used to fail
         self.assertEqual(set(s), set('cd'))
 
+    @support.impl_detail("relies on element order in a set", graalvm=False)
     def test_issue_4920(self):
         # MutableSet.pop() method did not work
         class MySet(MutableSet):