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

Fix platforms, packages, and libraries updating behind proxy // Resolve #1061

Browse Source
This commit is contained in:
Ivan Kravets
2017-09-16 16:35:35 +03:00
parent aa1c7609d2
commit fc7f1c0728
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY.rst
View File

@ -11,6 +11,8 @@ PlatformIO 3.0
* Fixed "Super-Quick (Mac / Linux)" installer script * Fixed "Super-Quick (Mac / Linux)" installer script
(`issue #1017 <https://github.com/platformio/platformio-core/issues/1017>`_) (`issue #1017 <https://github.com/platformio/platformio-core/issues/1017>`_)
* Fixed issue with "IOError" in VSCode when processing a project * Fixed issue with "IOError" in VSCode when processing a project
* Fixed platforms, packages, and libraries updating behind proxy
(`issue #1061 <https://github.com/platformio/platformio-core/issues/1061>`_)
3.4.1 (2017-08-02) 3.4.1 (2017-08-02)
~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~

9
platformio/util.py
View File

@ -18,7 +18,6 @@ import json
import os import os
import platform import platform
import re import re
import socket
import stat import stat
import subprocess import subprocess
import sys import sys
@ -582,12 +581,10 @@ def get_api_result(url, params=None, data=None, auth=None, cache_valid=None):
"Please try later.") "Please try later.")
def internet_on(timeout=3): def internet_on():
socket.setdefaulttimeout(timeout) for url in ("http://dl.bintray.com", "http://dl.platformio.org"):
for host in ("dl.bintray.com", "dl.platformio.org"):
try: try:
socket.socket(socket.AF_INET, socket.SOCK_STREAM).connect((host, requests.get(url, timeout=3)
80))
return True return True
except: # pylint: disable=bare-except except: # pylint: disable=bare-except
pass pass