Revision: 4131
Author: jussi.ao.malinen
Date: Fri Sep 24 05:21:28 2010
Log: unicode normalization for list dir results. This should fix problems
with OSX nfc-nfd -normalization.
http://code.google.com/p/robotframework/source/detail?r=4131
Modified:
/trunk/src/robot/libraries/OperatingSystem.py
=======================================
--- /trunk/src/robot/libraries/OperatingSystem.py Thu Sep 23 09:41:30 2010
+++ /trunk/src/robot/libraries/OperatingSystem.py Fri Sep 24 05:21:28 2010
@@ -1133,10 +1133,9 @@
self._link("Listing contents of directory '%s'.", path)
if not os.path.isdir(path):
raise RuntimeError("Directory '%s' does not exist" % path)
- items = os.listdir(path)
+ items = sorted(unic(item) for item in os.listdir(path))
if pattern:
items = [ i for i in items if fnmatch.fnmatchcase(i, pattern) ]
- items.sort()
if deprecated_absolute is not None:
self._warn("Signature of 'List Directory' keywords has
changed. "
"Please update how 'absolute' argumemt is given.")
