platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-30 10:07:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename "InternetIsOffline" exception to "InternetConnectionError"

Browse Source
This commit is contained in:
Ivan Kravets
2023-01-27 20:49:59 +02:00
parent 61ba8afee6
commit 8835a03cd9
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
platformio/builder/tools/piolib.py
View File

@ -29,7 +29,7 @@ from SCons.Script import DefaultEnvironment # pylint: disable=import-error
from platformio import exception, fs from platformio import exception, fs
from platformio.builder.tools import piobuild from platformio.builder.tools import piobuild
from platformio.compat import IS_WINDOWS, hashlib_encode_data, string_types 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 ( from platformio.package.exception import (
MissingPackageManifestError, MissingPackageManifestError,
UnknownPackageError, UnknownPackageError,
@ -982,7 +982,11 @@ class ProjectAsLibBuilder(LibBuilderBase):
try: try:
lm.install(spec) lm.install(spec)
did_install = True did_install = True
except (HTTPClientError, UnknownPackageError, InternetIsOffline) as exc: except (
HTTPClientError,
UnknownPackageError,
InternetConnectionError,
) as exc:
click.secho("Warning! %s" % exc, fg="yellow") click.secho("Warning! %s" % exc, fg="yellow")
# reset cache # reset cache

4
platformio/package/manager/platform.py
View File

@ -15,7 +15,7 @@
import os import os
from platformio import util 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.exception import UnknownPackageError
from platformio.package.manager.base import BasePackageManager from platformio.package.manager.base import BasePackageManager
from platformio.package.manager.core import get_installed_core_packages 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"]) key = "%s:%s" % (board["platform"], board["id"])
if key not in know_boards: if key not in know_boards:
boards.append(board) boards.append(board)
except (HTTPClientError, InternetIsOffline): except (HTTPClientError, InternetConnectionError):
pass pass
return sorted(boards, key=lambda b: b["name"]) return sorted(boards, key=lambda b: b["name"])

2
tests/misc/test_misc.py
View File

@ -35,7 +35,7 @@ def test_ping_internet_ips():
def test_api_internet_offline(without_internet, isolated_pio_core): def test_api_internet_offline(without_internet, isolated_pio_core):
regclient = RegistryClient() regclient = RegistryClient()
with pytest.raises(http.InternetIsOffline): with pytest.raises(http.InternetConnectionError):
regclient.fetch_json_data("get", "/v2/stats") regclient.fetch_json_data("get", "/v2/stats")