diff --git a/platformio/builder/scripts/frameworks/arduino.py b/platformio/builder/scripts/frameworks/arduino.py
index 198846fd..c8449797 100644
--- a/platformio/builder/scripts/frameworks/arduino.py
+++ b/platformio/builder/scripts/frameworks/arduino.py
@@ -253,8 +253,7 @@ envsafe = env.Clone()
 
 if BOARD_BUILDOPTS.get("core", None) == "teensy3":
     libs.append("arm_cortex%sl_math" % (
-        "M4" if BOARD_BUILDOPTS.get("cpu") == "cortex-m4" else "M0")
-    )
+        "M4" if BOARD_BUILDOPTS.get("cpu") == "cortex-m4" else "M0"))
 
 
 libs.append(envsafe.BuildLibrary(
diff --git a/platformio/builder/scripts/frameworks/mbed.py b/platformio/builder/scripts/frameworks/mbed.py
index c80dc5a8..fb9c2f81 100644
--- a/platformio/builder/scripts/frameworks/mbed.py
+++ b/platformio/builder/scripts/frameworks/mbed.py
@@ -196,27 +196,27 @@ def get_build_flags(data):
     return flags
 
 
-def _mbed_whole_archive_hook(libs):
-    if (not isinstance(libs, list) or
+def _mbed_whole_archive_hook(libs_):
+    if (not isinstance(libs_, list) or
             env.get("BOARD_OPTIONS", {}).get("platform") != "ststm32"):
-        return libs
+        return libs_
 
     _dynlibs = []
     _stlibs = []
-    for l in libs:
-        if isinstance(l, basestring):
-            _stlibs.append(l)
+    for l_ in libs_:
+        if isinstance(l_, basestring):
+            _stlibs.append(l_)
         else:
-            _dynlibs.append(l)
+            _dynlibs.append(l_)
 
-    libs = []
+    libs_ = []
     if _dynlibs:
-        libs.append("-Wl,-whole-archive")
-        libs.extend(_dynlibs)
-        libs.append("-Wl,-no-whole-archive")
-    libs.extend(_stlibs)
+        libs_.append("-Wl,-whole-archive")
+        libs_.extend(_dynlibs)
+        libs_.append("-Wl,-no-whole-archive")
+    libs_.extend(_stlibs)
 
-    return libs
+    return libs_
 
 
 board_type = env.subst("$BOARD")
diff --git a/platformio/commands/upgrade.py b/platformio/commands/upgrade.py
index f8b48950..894e8182 100644
--- a/platformio/commands/upgrade.py
+++ b/platformio/commands/upgrade.py
@@ -94,9 +94,6 @@ WARNING! Don't use `sudo` for the rest PlatformIO commands.
             else:
                 raise exception.UpgradeError(
                     "\n".join([str(cmd), r['out'], r['err']]))
-        finally:
-            if r:
-                r.close()
 
 
 def get_latest_version():
diff --git a/platformio/util.py b/platformio/util.py
index 579f44b8..6dc1bd5e 100644
--- a/platformio/util.py
+++ b/platformio/util.py
@@ -125,8 +125,8 @@ def singleton(cls):
 
 
 def load_json(file_path):
-        with open(file_path, "r") as f:
-            return json.load(f)
+    with open(file_path, "r") as f:
+        return json.load(f)
 
 
 def get_systype():
@@ -170,7 +170,7 @@ def get_home_dir():
         try:
             home_dir.encode("utf8")
         except UnicodeDecodeError:
-            home_dir = splitdrive(home_dir)[0] + "\.platformio"
+            home_dir = splitdrive(home_dir)[0] + "\\.platformio"
 
     if not isdir(home_dir):
         os.makedirs(home_dir)