Fix some issues raised by pylance

Author: mohanson

pywasm/wasi.py

@@ -832,7 +832,7 @@ def fd_read(self, m: pywasm.core.Machine, args: typing.List[int]) -> typing.List
             elem_len = mems.get_u32(iovs_ptr + 4)
             data = [
                 lambda: os.read(file.host_fd, elem_len),
-                lambda: file.pipe.read(elem_len),
+                lambda: file.pipe.read(elem_len) if file.pipe else b'',
             ][self.help_pipe(args[0])]()
             if len(data) == 0:
                 break
@@ -965,7 +965,7 @@ def fd_write(self, m: pywasm.core.Machine, args: typing.List[int]) -> typing.Lis
             data.extend(elem)
         size = [
             lambda: os.write(file.host_fd, data),
-            lambda: file.pipe.write(data),
+            lambda: file.pipe.write(data) if file.pipe else 0,
         ][int(self.help_pipe(args[0]))]()
         mems.put_u32(args[3], size)
         return [self.ERRNO_SUCCESS]
@@ -1072,8 +1072,9 @@ def path_filestat_get(self, m: pywasm.core.Machine, args: typing.List[int]) -> t
         name = mems.get(args[2], args[3]).decode()
         if self.help_escp(file.wasm_name, name):
             return [self.ERRNO_PERM]
+        foll = flag & self.LOOKUPFLAGS_SYMLINK_FOLLOW != 0
         try:
-            info = os.stat(name, dir_fd=file.host_fd, follow_symlinks=flag & self.LOOKUPFLAGS_SYMLINK_FOLLOW)
+            info = os.stat(name, dir_fd=file.host_fd, follow_symlinks=foll)
         except FileNotFoundError:
             return [self.ERRNO_NOENT]
         mems.put_u64(args[4], 1)
@@ -1113,8 +1114,9 @@ def path_filestat_set_times(self, m: pywasm.core.Machine, args: typing.List[int]
             mtim = args[5]
         if args[6] & self.FSTFLAGS_MTIM_NOW:
             mtim = time.time_ns()
+        foll = flag & self.LOOKUPFLAGS_SYMLINK_FOLLOW != 0
         try:
-            os.utime(name, ns=(atim, mtim), dir_fd=file.host_fd, follow_symlinks=flag & self.LOOKUPFLAGS_SYMLINK_FOLLOW)
+            os.utime(name, ns=(atim, mtim), dir_fd=file.host_fd, follow_symlinks=foll)
         except FileNotFoundError:
             return [self.ERRNO_NOENT]
         return [self.ERRNO_SUCCESS]
@@ -1136,7 +1138,7 @@ def path_link(self, m: pywasm.core.Machine, args: typing.List[int]) -> typing.Li
             return [self.ERRNO_PERM]
         if self.help_escp(dest.wasm_name, dest_name):
             return [self.ERRNO_PERM]
-        foll = args[1] & self.LOOKUPFLAGS_SYMLINK_FOLLOW
+        foll = args[1] & self.LOOKUPFLAGS_SYMLINK_FOLLOW != 0
         try:
             os.link(stem_name, dest_name, src_dir_fd=stem.host_fd, dst_dir_fd=dest.host_fd, follow_symlinks=foll)
         except FileExistsError:
@@ -1489,6 +1491,7 @@ def sock_accept(self, m: pywasm.core.Machine, args: typing.List[int]) -> typing.
         wasm_fd = len(self.fd)
         self.fd.append(self.File(
             host_fd=host_fd,
+            host_flag=0,
             host_name=file.host_name,
             host_status=self.FILE_STATUS_OPENED,
             pipe=None,

test/spec.py

@@ -48,7 +48,7 @@ def valj(j: typing.Dict) -> pywasm.ValInst:
                     data = [valj({'type': 'f64', 'value': e}).into_u64() for e in j['value']]
                     return pywasm.ValInst.from_v128_u64(data)
                 case _:
-                    assert 0
+                    raise Exception('unreachable')
         case 'funcref':
             match j['value']:
                 case 'null':
@@ -62,7 +62,7 @@ def valj(j: typing.Dict) -> pywasm.ValInst:
                 case _:
                     return pywasm.ValInst.from_ref(pywasm.core.ValType.ref_extern(), int(j['value']))
         case _:
-            assert 0
+            raise Exception('unreachable')
 
 
 def vale(a: pywasm.ValInst, b: pywasm.ValInst) -> bool:
@@ -96,10 +96,10 @@ def vale(a: pywasm.ValInst, b: pywasm.ValInst) -> bool:
         return a.into_i64() == b.into_i64()
     if a.type == pywasm.core.ValType.ref_extern():
         return a.into_i64() == b.into_i64()
-    assert 0
+    raise Exception('unreachable')
 
 
-def host(runtime: pywasm.core.Runtime) -> typing.Dict[str, typing.Dict[str, pywasm.core.Extern]]:
+def host(runtime: pywasm.core.Runtime):
     # See https://github.com/WebAssembly/spec/blob/w3c-1.0/interpreter/host/spectest.ml
     runtime.imports['spectest'] = {
         'global_i32': runtime.allocate_global(
@@ -151,8 +151,8 @@ def host(runtime: pywasm.core.Runtime) -> typing.Dict[str, typing.Dict[str, pywa
 for desc in all_test:
     suit = json.loads(pathlib.Path(desc).read_text())['commands']
     runtime = pywasm.Runtime()
-    cmodule: pywasm.ModuleInst
-    lmodule: pywasm.ModuleInst
+    cmodule = pywasm.ModuleInst()
+    lmodule = pywasm.ModuleInst()
     mmodule = {}
     host(runtime)
     for elem in suit:
@@ -238,7 +238,7 @@ def host(runtime: pywasm.core.Runtime) -> typing.Dict[str, typing.Dict[str, pywa
                     case _:
                         assert 0
             case 'assert_uninstantiable':
-                name = pathlib.Path(desc).parent.joinpath(elem['filename'])
+                name = str(pathlib.Path(desc).parent.joinpath(elem['filename']))
                 try:
                     lmodule = runtime.instance_from_file(name)
                 except:
@@ -248,7 +248,7 @@ def host(runtime: pywasm.core.Runtime) -> typing.Dict[str, typing.Dict[str, pywa
                 else:
                     assert 0
             case 'assert_unlinkable':
-                name = pathlib.Path(desc).parent.joinpath(elem['filename'])
+                name = str(pathlib.Path(desc).parent.joinpath(elem['filename']))
                 try:
                     lmodule = runtime.instance_from_file(name)
                 except:
@@ -258,7 +258,7 @@ def host(runtime: pywasm.core.Runtime) -> typing.Dict[str, typing.Dict[str, pywa
                 else:
                     assert 0
             case 'module':
-                name = pathlib.Path(desc).parent.joinpath(elem['filename'])
+                name = str(pathlib.Path(desc).parent.joinpath(elem['filename']))
                 lmodule = runtime.instance_from_file(name)
                 if 'name' in elem:
                     mmodule[elem['name']] = lmodule