Skip to content

Commit ba4ea13

Browse files
committed
[fix] readdir: Fix type error when bytes is returned
1 parent f1c50e8 commit ba4ea13

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

mfusepy.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1506,7 +1506,8 @@ def _readdir(self, path: Optional[bytes], buf, filler, offset: int, fip) -> int:
15061506
if isinstance(item, bytes):
15071507
name, st, offset = item, None, 0
15081508
else:
1509-
name, attrs, offset = item
1509+
name_str, attrs, offset = item
1510+
name = name_str.encode(self.encoding)
15101511
if attrs:
15111512
st = c_stat()
15121513
# ONLY THE MODE IS USED BY FUSE! The caller may skip everything else.
@@ -1516,10 +1517,10 @@ def _readdir(self, path: Optional[bytes], buf, filler, offset: int, fip) -> int:
15161517
st = None
15171518

15181519
if fuse_version_major == 2:
1519-
if filler(buf, name.encode(self.encoding), st, offset) != 0: # type: ignore
1520+
if filler(buf, name, st, offset) != 0: # type: ignore
15201521
break
15211522
elif fuse_version_major == 3:
1522-
if filler(buf, name.encode(self.encoding), st, offset, 0) != 0:
1523+
if filler(buf, name, st, offset, 0) != 0:
15231524
break
15241525

15251526
return 0

0 commit comments

Comments
 (0)