feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

* Hotfix for recently updated Python Requests package (2.16.0)

Browse Source
This commit is contained in:
Ivan Kravets
2017-05-27 12:55:46 +03:00
parent df226df87d
commit 49b2e7303e
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
HISTORY.rst
View File

@ -4,6 +4,11 @@ Release Notes
PlatformIO 3.0 PlatformIO 3.0
-------------- --------------
3.3.1 (2017-05-27)
~~~~~~~~~~~~~~~~~~
* Hotfix for recently updated Python Requests package (2.16.0)
3.3.0 (2017-03-27) 3.3.0 (2017-03-27)
~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~

9
platformio/__main__.py
View File

@ -89,11 +89,10 @@ def main():
# https://urllib3.readthedocs.org # https://urllib3.readthedocs.org
# /en/latest/security.html#insecureplatformwarning # /en/latest/security.html#insecureplatformwarning
try: try:
requests.packages.urllib3.disable_warnings() import urllib3
except AttributeError: urllib3.disable_warnings()
raise exception.PlatformioException( except (AttributeError, ImportError):
"Invalid installation of Python `requests` package`. See " pass
"< https://github.com/platformio/platformio-core/issues/252 >")
# handle PLATFORMIO_FORCE_COLOR # handle PLATFORMIO_FORCE_COLOR
if str(getenv("PLATFORMIO_FORCE_COLOR", "")).lower() == "true": if str(getenv("PLATFORMIO_FORCE_COLOR", "")).lower() == "true":