TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

all: Replace all uses of umodule in Python code.

Browse Source 
Applies to drivers/examples/extmod/port-modules/tools.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
This commit is contained in:
Jim Mussared
2022-08-19 22:58:37 +10:00
parent 9d7eac0713
commit 5fd042e7d1
29 changed files with 99 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tools/pyboard.py
View File

@@ -509,14 +509,14 @@ class Pyboard:
def fs_exists(self, src):
try:
self.exec_("import uos\nuos.stat(%s)" % (("'%s'" % src) if src else ""))
self.exec_("import os\nos.stat(%s)" % (("'%s'" % src) if src else ""))
return True
except PyboardError:
return False
def fs_ls(self, src):
cmd = (
"import uos\nfor f in uos.ilistdir(%s):\n"
"import os\nfor f in os.ilistdir(%s):\n"
" print('{:12} {}{}'.format(f[3]if len(f)>3 else 0,f[0],'/'if f[1]&0x4000 else ''))"
% (("'%s'" % src) if src else "")
)
@@ -528,7 +528,7 @@ class Pyboard:
def repr_consumer(b):
buf.extend(b.replace(b"\x04", b""))
cmd = "import uos\nfor f in uos.ilistdir(%s):\n" " print(repr(f), end=',')" % (
cmd = "import os\nfor f in os.ilistdir(%s):\n" " print(repr(f), end=',')" % (
("'%s'" % src) if src else ""
)
try:
@@ -545,8 +545,8 @@ class Pyboard:
def fs_stat(self, src):
try:
self.exec_("import uos")
return os.stat_result(self.eval("uos.stat(%s)" % (("'%s'" % src)), parse=True))
self.exec_("import os")
return os.stat_result(self.eval("os.stat(%s)" % (("'%s'" % src)), parse=True))
except PyboardError as e:
raise e.convert(src)
@@ -639,13 +639,13 @@ class Pyboard:
self.exec_("f.close()")
def fs_mkdir(self, dir):
self.exec_("import uos\nuos.mkdir('%s')" % dir)
self.exec_("import os\nos.mkdir('%s')" % dir)
def fs_rmdir(self, dir):
self.exec_("import uos\nuos.rmdir('%s')" % dir)
self.exec_("import os\nos.rmdir('%s')" % dir)
def fs_rm(self, src):
self.exec_("import uos\nuos.remove('%s')" % src)
self.exec_("import os\nos.remove('%s')" % src)
def fs_touch(self, src):
self.exec_("f=open('%s','a')\nf.close()" % src)
@@ -737,9 +737,9 @@ def filesystem_command(pyb, args, progress_callback=None, verbose=False):
_injected_import_hook_code = """\
import uos, uio
import os, io
class _FS:
class File(uio.IOBase):
class File(io.IOBase):
def __init__(self):
self.off = 0
def ioctl(self, request, arg):
@@ -756,10 +756,10 @@ class _FS:
raise OSError(-2) # ENOENT
def open(self, path, mode):
return self.File()
uos.mount(_FS(), '/_')
uos.chdir('/_')
os.mount(_FS(), '/_')
os.chdir('/_')
from _injected import *
uos.umount('/_')
os.umount('/_')
del _injected_buf, _FS
"""