From 5694cc5490235a9091fe3e2c5563471565e3da97 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Sun, 16 Nov 2014 23:56:37 +0000
Subject: [PATCH] py: Make stream seek correctly check for ioctl fn; add seek
for textio.
---
py/stream.c | 2 +-
stmhal/file.c | 1 +
tests/io/file_seek.py | 8 ++++++++
unix/file.c | 1 +
4 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/py/stream.c b/py/stream.c
index 1361d6c72..810e9b349 100644
--- a/py/stream.c
+++ b/py/stream.c
@@ -382,7 +382,7 @@ mp_obj_t mp_stream_unbuffered_iter(mp_obj_t self) {
STATIC mp_obj_t stream_seek(mp_uint_t n_args, const mp_obj_t *args) {
struct _mp_obj_base_t *o = (struct _mp_obj_base_t *)args[0];
- if (o->type->stream_p == NULL || o->type->stream_p->read == NULL) {
+ if (o->type->stream_p == NULL || o->type->stream_p->ioctl == NULL) {
// CPython: io.UnsupportedOperation, OSError subclass
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Operation not supported"));
}
diff --git a/stmhal/file.c b/stmhal/file.c
index 8e42bda57..c4f4dace0 100644
--- a/stmhal/file.c
+++ b/stmhal/file.c
@@ -260,6 +260,7 @@ const mp_obj_type_t mp_type_fileio = {
STATIC const mp_stream_p_t textio_stream_p = {
.read = file_obj_read,
.write = file_obj_write,
+ .ioctl = file_obj_ioctl,
.is_text = true,
};
diff --git a/tests/io/file_seek.py b/tests/io/file_seek.py
index 2ced3576d..922b16928 100644
--- a/tests/io/file_seek.py
+++ b/tests/io/file_seek.py
@@ -10,3 +10,11 @@ print(f.read(20))
print(f.seek(0, 0))
print(f.read(5))
+
+f.close()
+
+# test text mode
+f = open("io/data/file1", "rt")
+print(f.seek(6))
+print(f.read(5))
+f.close()
diff --git a/unix/file.c b/unix/file.c
index b2746e078..4a11d24bd 100644
--- a/unix/file.c
+++ b/unix/file.c
@@ -240,6 +240,7 @@ const mp_obj_type_t mp_type_fileio = {
STATIC const mp_stream_p_t textio_stream_p = {
.read = fdfile_read,
.write = fdfile_write,
+ .ioctl = fdfile_ioctl,
.is_text = true,
};
--
GitLab