Mercurial > piecrust2
view piecrust/osutil.py @ 546:6ef89b31ddda 2.0.0b3
internal: Fix a severe bug with the file-system wrappers on OSX.
`os.walk` is expected to support modifying its return values `dirnames` and
`filenames` so that you can filter out items that need to be iterated upon.
I was previously returning a different list in the wrappers, which means
filtering was completely broken.
author | Ludovic Chabant <ludovic@chabant.com> |
---|---|
date | Sat, 01 Aug 2015 08:09:53 -0700 |
parents | 6f1f45fb7790 |
children | a4ac464a45b3 |
line wrap: on
line source
import os import sys import glob as _system_glob import unicodedata walk = os.walk listdir = os.listdir glob = _system_glob.glob if sys.platform == 'darwin': def _walk(top, **kwargs): for dirpath, dirnames, filenames in os.walk(top, **kwargs): dirpath = _from_osx_fs(dirpath) dirnames[:] = list(map(_from_osx_fs, dirnames)) filenames[:] = list(map(_from_osx_fs, filenames)) yield dirpath, dirnames, filenames def _listdir(path='.'): for name in os.listdir(path): name = _from_osx_fs(name) yield name def _glob(pathname): pathname = _to_osx_fs(pathname) matches = _system_glob.glob(pathname) return list(map(_from_osx_fs, matches)) def _from_osx_fs(s): return unicodedata.normalize('NFC', s) def _to_osx_fs(s): return unicodedata.ucd_3_2_0.normalize('NFD', s) global walk, listdir, glob walk = _walk listdir = _listdir glob = _glob