From b39dcb11ee61a0ba83ab1d7404ab6e74849228cd Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 21 Mar 2016 18:50:45 +0200 Subject: [PATCH] Peter test for Unicode and home_dir --- platformio/util.py | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/platformio/util.py b/platformio/util.py index 2bff98ce..8af2e859 100644 --- a/platformio/util.py +++ b/platformio/util.py @@ -23,7 +23,6 @@ from glob import glob from os.path import (abspath, basename, dirname, expanduser, isdir, isfile, join, splitdrive) from platform import system, uname -from tempfile import TemporaryFile from threading import Thread from platformio import __apiip__, __apiurl__, __version__, exception @@ -162,17 +161,14 @@ def get_home_dir(): join(expanduser("~"), ".platformio") ) - if not isdir(home_dir): + if "windows" in get_systype(): try: - home_dir.encode("utf8") # test ASCII - os.makedirs(home_dir) - f = TemporaryFile(dir=home_dir) - f.close() - except (OSError, UnicodeDecodeError, WindowsError): - if "windows" in get_systype(): - home_dir = splitdrive(home_dir)[0] + "\.platformio" - if not isdir(home_dir): - os.makedirs(home_dir) + home_dir.encode("utf8") + except UnicodeDecodeError: + home_dir = splitdrive(home_dir)[0] + "\.platformio" + + if not isdir(home_dir): + os.makedirs(home_dir) assert isdir(home_dir) return home_dir