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

7258: incomplete commit; https://gramps-project.org/bugs/view.php?id=7258#c35856

Browse Source
This commit is contained in:
Jérôme Rapinat 2014-04-24 11:37:34 +02:00
parent b4de594aab
commit 8e5224708c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps/gen/constfunc.py
View File

@ -64,7 +64,7 @@ else:
UNITYPE = str
cuni = conv_to_unicode_direct
def conv_to_unicode(x, y='utf8'):
return x if x is None or isinstance(x, UNITYPE) else cuni(x, y)
return x if x is None or isinstance(x, UNITYPE) else cuni(x, y) if y else cuni(x)
def uni_to_gui(x):
'''
@ -205,7 +205,7 @@ def get_curr_dir():
an arbitrary unicode character in a path. This function uses the
native GetCurrentDirectory function to return a unicode cwd.
'''
if not sys.version_info[0] < 3 and win():
if not (sys.version_info[0] < 3 and win()):
return os.getcwd()
n = ctypes.windll.kernel32.GetCurrentDirectoryW(0, None)