Add the csv module

and let file.next() raise a StopException when on the end
To make the csv module work on files.

Makefile

@@ -292,7 +292,7 @@ STDLIB_OBJS := stdlib.bc.o stdlib.stripped.bc.o
 STDLIB_RELEASE_OBJS := stdlib.release.bc.o
 ASM_SRCS := $(wildcard src/runtime/*.S)
 
-STDMODULE_SRCS := errnomodule.c shamodule.c sha256module.c sha512module.c _math.c mathmodule.c md5.c md5module.c _randommodule.c _sre.c operator.c binascii.c pwdmodule.c posixmodule.c _struct.c datetimemodule.c _functoolsmodule.c _collectionsmodule.c itertoolsmodule.c resource.c signalmodule.c selectmodule.c fcntlmodule.c timemodule.c arraymodule.c zlibmodule.c _codecsmodule.c socketmodule.c unicodedata.c _weakref.c cStringIO.c _io/bufferedio.c _io/bytesio.c _io/fileio.c _io/iobase.c _io/_iomodule.c _io/stringio.c _io/textio.c zipimport.c $(EXTRA_STDMODULE_SRCS)
+STDMODULE_SRCS := errnomodule.c shamodule.c sha256module.c sha512module.c _math.c mathmodule.c md5.c md5module.c _randommodule.c _sre.c operator.c binascii.c pwdmodule.c posixmodule.c _struct.c datetimemodule.c _functoolsmodule.c _collectionsmodule.c itertoolsmodule.c resource.c signalmodule.c selectmodule.c fcntlmodule.c timemodule.c arraymodule.c zlibmodule.c _codecsmodule.c socketmodule.c unicodedata.c _weakref.c cStringIO.c _io/bufferedio.c _io/bytesio.c _io/fileio.c _io/iobase.c _io/_iomodule.c _io/stringio.c _io/textio.c zipimport.c _csv.c $(EXTRA_STDMODULE_SRCS)
 STDOBJECT_SRCS := structseq.c capsule.c stringobject.c exceptions.c unicodeobject.c unicodectype.c bytearrayobject.c bytes_methods.c weakrefobject.c memoryobject.c iterobject.c $(EXTRA_STDOBJECT_SRCS)
 STDPYTHON_SRCS := pyctype.c getargs.c formatter_string.c pystrtod.c dtoa.c formatter_unicode.c structmember.c marshal.c $(EXTRA_STDPYTHON_SRCS)
 FROM_CPYTHON_SRCS := $(addprefix from_cpython/Modules/,$(STDMODULE_SRCS)) $(addprefix from_cpython/Objects/,$(STDOBJECT_SRCS)) $(addprefix from_cpython/Python/,$(STDPYTHON_SRCS))

from_cpython/CMakeLists.txt

@@ -15,7 +15,7 @@ endforeach(STDLIB_FILE)
 add_custom_target(copy_stdlib ALL DEPENDS ${STDLIB_TARGETS})
 
 # compile specified files in from_cpython/Modules
-file(GLOB_RECURSE STDMODULE_SRCS Modules errnomodule.c shamodule.c sha256module.c sha512module.c _math.c mathmodule.c md5.c md5module.c _randommodule.c _sre.c operator.c binascii.c pwdmodule.c posixmodule.c _struct.c datetimemodule.c _functoolsmodule.c _collectionsmodule.c itertoolsmodule.c resource.c signalmodule.c selectmodule.c fcntlmodule.c timemodule.c arraymodule.c zlibmodule.c _codecsmodule.c socketmodule.c unicodedata.c _weakref.c cStringIO.c bufferedio.c bytesio.c fileio.c iobase.c _iomodule.c stringio.c textio.c zipimport.c)
+file(GLOB_RECURSE STDMODULE_SRCS Modules errnomodule.c shamodule.c sha256module.c sha512module.c _math.c mathmodule.c md5.c md5module.c _randommodule.c _sre.c operator.c binascii.c pwdmodule.c posixmodule.c _struct.c datetimemodule.c _functoolsmodule.c _collectionsmodule.c itertoolsmodule.c resource.c signalmodule.c selectmodule.c fcntlmodule.c timemodule.c arraymodule.c zlibmodule.c _codecsmodule.c socketmodule.c unicodedata.c _weakref.c cStringIO.c bufferedio.c bytesio.c fileio.c iobase.c _iomodule.c stringio.c textio.c zipimport.c _csv.c)
 
 # compile specified files in from_cpython/Objects
 file(GLOB_RECURSE STDOBJECT_SRCS Objects structseq.c capsule.c stringobject.c exceptions.c unicodeobject.c unicodectype.c bytearrayobject.c bytes_methods.c weakrefobject.c memoryobject.c iterobject.c)

from_cpython/Lib/StringIO.py

@@ -39,7 +39,9 @@ def _complain_ifclosed(closed):
     if closed:
         raise ValueError, "I/O operation on closed file"
 
-class StringIO:
+# Pyston change: make this a new style class, looks like we don't support iterating otherwise
+# class StringIO:
+class StringIO(object):
     """class StringIO([buffer])
 
     When a StringIO object is created, it can be initialized to an existing

from_cpython/Lib/csv.py

@@ -69,8 +69,9 @@ class excel_tab(excel):
     delimiter = '\t'
 register_dialect("excel-tab", excel_tab)
 
-
-class DictReader:
+# Pyston change: make this a new style class, looks like we don't support iterating otherwise
+# class DictReader:
+class DictReader(object):
     def __init__(self, f, fieldnames=None, restkey=None, restval=None,
                  dialect="excel", *args, **kwds):
         self._fieldnames = fieldnames   # list of keys for the dict

src/runtime/file.cpp

@@ -801,7 +801,11 @@ error:
 }
 
 Box* fileIterNext(BoxedFile* s) {
-    return fileReadline1(s);
+    Box* rtn = fileReadline1(s);
+    assert(!rtn || rtn->cls == str_cls);
+    if (!rtn || ((BoxedString*)rtn)->s.empty())
+        raiseExcHelper(StopIteration, "");
+    return rtn;
 }
 
 bool fileEof(BoxedFile* self) {

src/runtime/types.cpp

@@ -71,6 +71,7 @@ extern "C" void init_weakref();
 extern "C" void initcStringIO();
 extern "C" void init_io();
 extern "C" void initzipimport();
+extern "C" void init_csv();
 
 namespace pyston {
 
@@ -1517,6 +1518,7 @@ void setupRuntime() {
     setupImport();
     setupPyston();
 
+    PyType_Ready(&PyByteArrayIter_Type);
     PyType_Ready(&PyCapsule_Type);
     PyType_Ready(&PyCallIter_Type);
 
@@ -1551,6 +1553,7 @@ void setupRuntime() {
     initcStringIO();
     init_io();
     initzipimport();
+    init_csv();
 
     // some additional setup to ensure weakrefs participate in our GC
     BoxedClass* weakref_ref_cls = &_PyWeakref_RefType;

test/tests/csv_test.py

+import csv
+import StringIO
+
+csvfile = StringIO.StringIO()
+
+fieldnames = ['first_name', 'last_name']
+writer = csv.DictWriter(csvfile, fieldnames=fieldnames)
+writer.writeheader()
+writer.writerow({'first_name': 'Baked', 'last_name': 'Beans'})
+writer.writerow({'first_name': 'Lovely', 'last_name': 'Spam'})
+writer.writerow({'first_name': 'Wonderful', 'last_name': 'Spam'})
+
+csvfile.seek(0)
+print csvfile.getvalue()
+reader = csv.DictReader(csvfile)
+for row in reader:
+    print row['first_name'], row['last_name']