Revision: 2941
Author: pekka.klarck
Date: Mon Apr 12 07:53:16 2010
Log: make sure os.listdir is called with a unicode object
http://code.google.com/p/robotframework/source/detail?r=2941
Modified:
/trunk/src/robot/parsing/model.py
=======================================
--- /trunk/src/robot/parsing/model.py Mon Apr 12 06:42:06 2010
+++ /trunk/src/robot/parsing/model.py Mon Apr 12 07:53:16 2010
@@ -150,9 +150,11 @@
return files, initfile
def _list_dir(self, path):
- names = os.listdir(path)
+ # Want to make sure path is Unicode because then os.listdir also
+ # returns entries as Unicode...
+ names = os.listdir(utils.unic(path))
+ # ... except on Jython: http://bugs.jython.org/issue1593
if utils.is_jython:
- # http://bugs.jython.org/issue1593
from java.lang import String
names = [ utils.unic(String(n)) for n in names ]
return sorted(names, key=unicode.lower)
