Merge 6cc3d8023350163e72b83d49981ad2c4b08d39b4 into d62b1b4eecdac0e824265f123b5ee18fc808e3e0

src/modules/os.c

@@ -136,7 +136,6 @@ static bool io_FileIO__exit__(int argc, py_Ref argv) {
 
 static bool io_FileIO_read(int argc, py_Ref argv) {
     io_FileIO* ud = py_touserdata(py_arg(0));
-    if(ud->file == NULL) return ValueError("I/O operation on closed file");
     bool is_binary = ud->mode[strlen(ud->mode) - 1] == 'b';
     int size;
     if(argc == 1) {
@@ -147,37 +146,24 @@ static bool io_FileIO_read(int argc, py_Ref argv) {
     } else if(argc == 2) {
         PY_CHECK_ARG_TYPE(1, tp_int);
         size = py_toint(py_arg(1));
-        if (size < 0) {
-            long current = ftell(ud->file);
-            fseek(ud->file, 0, SEEK_END);
-            size = ftell(ud->file);
-            fseek(ud->file, current, SEEK_SET);
-        }
     } else {
         return TypeError("read() takes at most 2 arguments (%d given)", argc);
     }
     if(is_binary) {
         void* dst = py_newbytes(py_retval(), size);
-        if(size > 0) {
-            int actual_size = fread(dst, 1, size, ud->file);
-            py_bytes_resize(py_retval(), actual_size);
-        }
+        int actual_size = fread(dst, 1, size, ud->file);
+        py_bytes_resize(py_retval(), actual_size);
     } else {
-        if(size > 0) {
-            void* dst = PK_MALLOC(size);
-            int actual_size = fread(dst, 1, size, ud->file);
-            py_newstrv(py_retval(), (c11_sv){dst, actual_size});
-            PK_FREE(dst);
-        } else {
-            py_newstr(py_retval(), "");
-        }
+        void* dst = PK_MALLOC(size);
+        int actual_size = fread(dst, 1, size, ud->file);
+        py_newstrv(py_retval(), (c11_sv){dst, actual_size});
+        PK_FREE(dst);
     }
     return true;
 }
 
 static bool io_FileIO_tell(int argc, py_Ref argv) {
     io_FileIO* ud = py_touserdata(py_arg(0));
-    if(ud->file == NULL) return ValueError("I/O operation on closed file");
     py_newint(py_retval(), ftell(ud->file));
     return true;
 }
@@ -187,7 +173,6 @@ static bool io_FileIO_seek(int argc, py_Ref argv) {
     PY_CHECK_ARG_TYPE(1, tp_int);
     PY_CHECK_ARG_TYPE(2, tp_int);
     io_FileIO* ud = py_touserdata(py_arg(0));
-    if(ud->file == NULL) return ValueError("I/O operation on closed file");
     long cookie = py_toint(py_arg(1));
     int whence = py_toint(py_arg(2));
     py_newint(py_retval(), fseek(ud->file, cookie, whence));
@@ -208,7 +193,6 @@ static bool io_FileIO_close(int argc, py_Ref argv) {
 static bool io_FileIO_write(int argc, py_Ref argv) {
     PY_CHECK_ARGC(2);
     io_FileIO* ud = py_touserdata(py_arg(0));
-    if(ud->file == NULL) return ValueError("I/O operation on closed file");
     size_t written_size;
     if(ud->mode[strlen(ud->mode) - 1] == 'b') {
         PY_CHECK_ARG_TYPE(1, tp_bytes);
@@ -227,7 +211,6 @@ static bool io_FileIO_write(int argc, py_Ref argv) {
 static bool io_FileIO_flush(int argc, py_Ref argv) {
     PY_CHECK_ARGC(1);
     io_FileIO* ud = py_touserdata(py_arg(0));
-    if(ud->file == NULL) return ValueError("I/O operation on closed file");
     fflush(ud->file);
     py_newnone(py_retval());
     return true;

tests/792_file.py

@@ -38,7 +38,7 @@ with open('123.txt', 'rt') as f:
     assert f.read() == ''
     f.seek(3, io.SEEK_SET)
     assert f.tell() == 3
-    assert f.read(-1) == '456'
+    assert f.read() == '456'
     assert f.tell() == 6
 
 with open('123.txt', 'a') as f: