Browse Source

Don't re-encode by filesystem encoding

pull/3252/head
Ruud 11 years ago
parent
commit
d5e19db5e6
  1. 4
      libs/scandir/scandir.py

4
libs/scandir/scandir.py

@ -365,7 +365,7 @@ elif sys.platform.startswith(('linux', 'darwin')) or 'bsd' in sys.platform:
"""Like os.listdir(), but yield DirEntry objects instead of returning """Like os.listdir(), but yield DirEntry objects instead of returning
a list of names. a list of names.
""" """
dir_p = opendir(path.encode(file_system_encoding)) dir_p = opendir(path)
if not dir_p: if not dir_p:
raise posix_error(path) raise posix_error(path)
try: try:
@ -376,7 +376,7 @@ elif sys.platform.startswith(('linux', 'darwin')) or 'bsd' in sys.platform:
raise posix_error(path) raise posix_error(path)
if not result: if not result:
break break
name = entry.d_name.decode(file_system_encoding) name = entry.d_name
if name not in ('.', '..'): if name not in ('.', '..'):
yield PosixDirEntry(path, name, entry.d_type) yield PosixDirEntry(path, name, entry.d_type)
finally: finally:

Loading…
Cancel
Save