diff --git a/platformio/builder/tools/piolib.py b/platformio/builder/tools/piolib.py index 8e1bec15..159dec60 100644 --- a/platformio/builder/tools/piolib.py +++ b/platformio/builder/tools/piolib.py @@ -29,7 +29,7 @@ from SCons.Script import DefaultEnvironment # pylint: disable=import-error from platformio import exception, fs from platformio.builder.tools import piobuild from platformio.compat import IS_WINDOWS, hashlib_encode_data, string_types -from platformio.http import HTTPClientError, InternetIsOffline +from platformio.http import HTTPClientError, InternetConnectionError from platformio.package.exception import ( MissingPackageManifestError, UnknownPackageError, @@ -982,7 +982,11 @@ class ProjectAsLibBuilder(LibBuilderBase): try: lm.install(spec) did_install = True - except (HTTPClientError, UnknownPackageError, InternetIsOffline) as exc: + except ( + HTTPClientError, + UnknownPackageError, + InternetConnectionError, + ) as exc: click.secho("Warning! %s" % exc, fg="yellow") # reset cache diff --git a/platformio/package/manager/platform.py b/platformio/package/manager/platform.py index e5e948ba..6dbd480c 100644 --- a/platformio/package/manager/platform.py +++ b/platformio/package/manager/platform.py @@ -15,7 +15,7 @@ import os from platformio import util -from platformio.http import HTTPClientError, InternetIsOffline +from platformio.http import HTTPClientError, InternetConnectionError from platformio.package.exception import UnknownPackageError from platformio.package.manager.base import BasePackageManager from platformio.package.manager.core import get_installed_core_packages @@ -128,7 +128,7 @@ class PlatformPackageManager(BasePackageManager): # pylint: disable=too-many-an key = "%s:%s" % (board["platform"], board["id"]) if key not in know_boards: boards.append(board) - except (HTTPClientError, InternetIsOffline): + except (HTTPClientError, InternetConnectionError): pass return sorted(boards, key=lambda b: b["name"]) diff --git a/tests/misc/test_misc.py b/tests/misc/test_misc.py index 52a6cac4..349e9c79 100644 --- a/tests/misc/test_misc.py +++ b/tests/misc/test_misc.py @@ -35,7 +35,7 @@ def test_ping_internet_ips(): def test_api_internet_offline(without_internet, isolated_pio_core): regclient = RegistryClient() - with pytest.raises(http.InternetIsOffline): + with pytest.raises(http.InternetConnectionError): regclient.fetch_json_data("get", "/v2/stats")