Skip to content

Commit 1bccec5

Browse files
committed
[fix] readdir: Fix type error when bytes is returned
1 parent 0d0013b commit 1bccec5

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
@@ -1507,7 +1507,8 @@ def _readdir(self, path: Optional[bytes], buf, filler, offset: int, fip) -> int:
15071507
if isinstance(item, bytes):
15081508
name, st, offset = item, None, 0
15091509
else:
1510-
name, attrs, offset = item
1510+
name_str, attrs, offset = item
1511+
name = name_str.encode(self.encoding)
15111512
if attrs:
15121513
st = c_stat()
15131514
# ONLY THE MODE IS USED BY FUSE! The caller may skip everything else.
@@ -1517,10 +1518,10 @@ def _readdir(self, path: Optional[bytes], buf, filler, offset: int, fip) -> int:
15171518
st = None
15181519

15191520
if fuse_version_major == 2:
1520-
if filler(buf, name.encode(self.encoding), st, offset) != 0: # type: ignore
1521+
if filler(buf, name, st, offset) != 0: # type: ignore
15211522
break
15221523
elif fuse_version_major == 3:
1523-
if filler(buf, name.encode(self.encoding), st, offset, 0) != 0:
1524+
if filler(buf, name, st, offset, 0) != 0:
15241525
break
15251526

15261527
return 0

0 commit comments

Comments
 (0)