diff --git a/HISTORY.rst b/HISTORY.rst index 91206a86..95734b04 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -112,6 +112,11 @@ PlatformIO 3.0 + Support for `PIO Unified Debugger `__ +3.3.1 (2017-05-27) +~~~~~~~~~~~~~~~~~~ + +* Hotfix for recently updated Python Requests package (2.16.0) + 3.3.0 (2017-03-27) ~~~~~~~~~~~~~~~~~~ diff --git a/platformio/__init__.py b/platformio/__init__.py index afea18f8..190b6ec7 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -14,7 +14,7 @@ import sys -VERSION = (3, 4, "0b5") +VERSION = (3, 4, "0b6") __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio" diff --git a/platformio/__main__.py b/platformio/__main__.py index da14d0dc..3a87a6be 100644 --- a/platformio/__main__.py +++ b/platformio/__main__.py @@ -89,11 +89,10 @@ def main(): # https://urllib3.readthedocs.org # /en/latest/security.html#insecureplatformwarning try: - requests.packages.urllib3.disable_warnings() - except AttributeError: - raise exception.PlatformioException( - "Invalid installation of Python `requests` package`. See " - "< https://github.com/platformio/platformio-core/issues/252 >") + import urllib3 + urllib3.disable_warnings() + except (AttributeError, ImportError): + pass # handle PLATFORMIO_FORCE_COLOR if str(os.getenv("PLATFORMIO_FORCE_COLOR", "")).lower() == "true":