# HG changeset patch # User Matt Harbison # Date 1667948719 18000 # Node ID d122c8fda5a084ef040b96ed69cc947161333519 # Parent 4092db99541a84b305c72e20b3c94ea3fe3a4765 cffi: fix a bytes vs str issue on macOS when listing directories This code hasn't been touched in recent years, and the other implementation return bytes for the filename, so I assume this is a holdover from the py2 days. I was unable to test it on mac though, because the `_osutil` import failed. diff -r 4092db99541a -r d122c8fda5a0 mercurial/cffi/osutil.py --- a/mercurial/cffi/osutil.py Wed Nov 02 12:54:12 2022 -0400 +++ b/mercurial/cffi/osutil.py Tue Nov 08 18:05:19 2022 -0500 @@ -57,7 +57,7 @@ ofs = cur.name_info.attr_dataoffset str_lgt = cur.name_info.attr_length base_ofs = ffi.offsetof(b'val_attrs_t', b'name_info') - name = str( + name = bytes( ffi.buffer( ffi.cast(b"char*", cur) + base_ofs + ofs, str_lgt - 1 )