From 4980d3e4bb3cb0ba4d12630d8ec5257066cb2687 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Tue, 30 Jan 2018 15:25:17 +0200
Subject: [PATCH] Bump version to 3.5.2a6

---
 platformio/__init__.py              | 2 +-
 platformio/builder/tools/piomisc.py | 3 +--
 tests/conftest.py                   | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/platformio/__init__.py b/platformio/__init__.py
index 27e31b8b..28d771e9 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -14,7 +14,7 @@
 
 import sys
 
-VERSION = (3, 5, "2a5")
+VERSION = (3, 5, "2a6")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/platformio/builder/tools/piomisc.py b/platformio/builder/tools/piomisc.py
index 2c61c1db..7c08237f 100644
--- a/platformio/builder/tools/piomisc.py
+++ b/platformio/builder/tools/piomisc.py
@@ -15,7 +15,6 @@
 from __future__ import absolute_import
 
 import atexit
-import io
 import re
 import sys
 from os import environ, remove, walk
@@ -85,7 +84,7 @@ class InoToCPPConverter(object):
 
     def _gcc_preprocess(self, contents, out_file):
         tmp_path = mkstemp()[1]
-        with io.open(tmp_path, mode="w", encoding="utf-8") as fp:
+        with open(tmp_path, "w") as fp:
             fp.write(contents)
         self.env.Execute(
             self.env.VerboseAction(
diff --git a/tests/conftest.py b/tests/conftest.py
index 5b8103c9..02d16069 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -24,8 +24,8 @@ from platformio import util
 def validate_cliresult():
 
     def decorator(result):
-        assert result.exit_code == 0
-        assert not result.exception
+        assert result.exit_code == 0, result.output
+        assert not result.exception, result.output
 
     return decorator