3 files changed, 11 insertions, 0 deletions
diff --git a/py/qstrdefs.h b/py/qstrdefs.h
index 0f066e3249..ea107f5f47 100644
--- a/py/qstrdefs.h
+++ b/py/qstrdefs.h
@@ -525,6 +525,7 @@ Q(readinto)
 Q(readline)
 Q(readlines)
 Q(seek)
+Q(tell)
 Q(FileIO)
 Q(TextIOWrapper)
 Q(StringIO)
diff --git a/py/stream.c b/py/stream.c
index 258f916e08..ba672ce2c5 100644
--- a/py/stream.c
+++ b/py/stream.c
@@ -26,6 +26,7 @@
  */
 
 #include <string.h>
+#include <unistd.h>
 
 #include "py/nlr.h"
 #include "py/objstr.h"
@@ -400,6 +401,14 @@ STATIC mp_obj_t stream_seek(mp_uint_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_seek_obj, 2, 3, stream_seek);
 
+STATIC mp_obj_t stream_tell(mp_obj_t self) {
+    mp_obj_t offset = MP_OBJ_NEW_SMALL_INT(0);
+    mp_obj_t whence = MP_OBJ_NEW_SMALL_INT(SEEK_CUR);
+    const mp_obj_t args[3] = {self, offset, whence};
+    return stream_seek(3, args);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(mp_stream_tell_obj, stream_tell);
+
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_read_obj, 1, 2, stream_read);
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_readinto_obj, 2, 3, stream_readinto);
 MP_DEFINE_CONST_FUN_OBJ_1(mp_stream_readall_obj, stream_readall);
diff --git a/py/stream.h b/py/stream.h
index f9c77aac6e..f9ba3387a9 100644
--- a/py/stream.h
+++ b/py/stream.h
@@ -35,6 +35,7 @@ MP_DECLARE_CONST_FUN_OBJ(mp_stream_unbuffered_readline_obj);
 MP_DECLARE_CONST_FUN_OBJ(mp_stream_unbuffered_readlines_obj);
 MP_DECLARE_CONST_FUN_OBJ(mp_stream_write_obj);
 MP_DECLARE_CONST_FUN_OBJ(mp_stream_seek_obj);
+MP_DECLARE_CONST_FUN_OBJ(mp_stream_tell_obj);
 
 // Iterator which uses mp_stream_unbuffered_readline_obj
 mp_obj_t mp_stream_unbuffered_iter(mp_obj_t self);