From 057fbf66c19c707a7d50d1d4d7a5a531325ea8a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Rapinat?= Date: Thu, 24 Apr 2014 11:41:44 +0200 Subject: [PATCH] 7258: incomplete commit; https://gramps-project.org/bugs/view.php?id=7258#c35856 --- gramps/gen/constfunc.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gramps/gen/constfunc.py b/gramps/gen/constfunc.py index 15b91ccd2..53fb0f8eb 100644 --- a/gramps/gen/constfunc.py +++ b/gramps/gen/constfunc.py @@ -62,7 +62,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): ''' @@ -203,7 +203,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)