Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issue 4291, wrong path when cancel.

Browse Source 
svn: r15975
This commit is contained in:
Peter Landgren
2010-10-13 08:45:23 +00:00
parent af788956aa
commit d3993f57ff
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Utils.py
View File

@ -333,12 +333,12 @@ 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():
# in windows filechooser returns officially utf-8, not filesystemencoding # in windows filechooser returns officially utf-8, not filesystemencoding
try: try:
return unicode(path) return unicode(path)
except: except:
@ -360,7 +360,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():