From 0b1a944eb97851ae56d089e071f7c2d100452840 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Wed, 30 Apr 2014 07:33:00 -0700 Subject: [PATCH] 7646: [Unit test] typo on 'gramps.gen.utils.file.py' Replace the call with ensuring that dirname is unicode; since TMP_DIR is guaranteed to be, os.path.join() willl return a unicode so further conversion is unnecessary. (cherry picked from commit 4327f6952bd6bd3481335c2d4f8543b86dafbf11) --- gramps/gen/utils/file.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gramps/gen/utils/file.py b/gramps/gen/utils/file.py index 9b9dd7b2c..fd5cef367 100644 --- a/gramps/gen/utils/file.py +++ b/gramps/gen/utils/file.py @@ -95,11 +95,10 @@ def get_empty_tempdir(dirname): or for inadequate permissions to delete dir/files or create dir(s) """ - dirpath = os.path.join(TEMP_DIR,dirname) + dirpath = os.path.join(TEMP_DIR,cuni(dirname)) if os.path.isdir(dirpath): shutil.rmtree(dirpath) os.makedirs(dirpath) - dirpath = get_unicode_path_from_env_var(dirpath) return dirpath def rm_tempdir(path):