From 9f5488b2d1493d14dfec7eb5ac35991ef4401217 Mon Sep 17 00:00:00 2001 From: david-sarah Date: Wed, 16 Jun 2010 18:55:37 -0700 Subject: [PATCH] stringutils.py: don't NFC-normalize the output of listdir_unicode. --- src/allmydata/util/stringutils.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/allmydata/util/stringutils.py b/src/allmydata/util/stringutils.py index 890100e0..5d1a6920 100644 --- a/src/allmydata/util/stringutils.py +++ b/src/allmydata/util/stringutils.py @@ -211,15 +211,9 @@ def listdir_unicode(path): # On other platforms (ie. Unix systems), the byte-level API is used if is_unicode_platform: - dirlist = os.listdir(path) + return os.listdir(path) else: - dirlist = listdir_unicode_fallback(path) - - # Normalize the resulting unicode filenames - # - # This prevents different OSes from generating non-equal unicode strings for - # the same filename representation - return [unicodedata.normalize('NFC', fname) for fname in dirlist] + return listdir_unicode_fallback(path) def open_unicode(path, mode): """ -- 2.45.2