Issue 4291, wrong path when cancel.
svn: r15976
This commit is contained in:
parent
bd11ca4673
commit
8f1bbb6811
@ -335,8 +335,8 @@ def get_unicode_path_from_file_chooser(path):
|
||||
:rtype: unicode
|
||||
:returns: The Unicode version of path.
|
||||
"""
|
||||
# Don't make unicode of unicode
|
||||
if isinstance(path, unicode):
|
||||
# make omly unicode of path of type 'str'
|
||||
if not (isinstance(path, str)):
|
||||
return path
|
||||
|
||||
if constfunc.win():
|
||||
@ -362,7 +362,8 @@ def get_unicode_path_from_env_var(path):
|
||||
:rtype: unicode
|
||||
: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
|
||||
|
||||
if constfunc.win():
|
||||
|
Loading…
Reference in New Issue
Block a user