Issue 4291, wrong path when cancel.

svn: r15976
This commit is contained in:
Peter Landgren 2010-10-13 08:46:58 +00:00
parent bd11ca4673
commit 8f1bbb6811

View File

@ -335,8 +335,8 @@ def get_unicode_path_from_file_chooser(path):
:rtype: unicode :rtype: unicode
:returns: The Unicode version of path. :returns: The Unicode version of path.
""" """
# Don't make unicode of unicode # make omly unicode of path of type 'str'
if isinstance(path, unicode): if not (isinstance(path, str)):
return path return path
if constfunc.win(): if constfunc.win():
@ -362,7 +362,8 @@ def get_unicode_path_from_env_var(path):
:rtype: unicode :rtype: unicode
:returns: The Unicode version of path. :returns: The Unicode version of path.
""" """
if isinstance(path, unicode): # make omly unicode of path of type 'str'
if not (isinstance(path, str)):
return path return path
if constfunc.win(): if constfunc.win():