From 2564b9eb7822d94a4db1d620bac08d2008dcf5d7 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 30 May 2022 20:29:35 +0300 Subject: [PATCH] Move http module to the root --- platformio/builder/tools/piolib.py | 2 +- platformio/clients/account.py | 2 +- platformio/clients/registry.py | 6 +++--- platformio/commands/home/rpc/handlers/os.py | 2 +- platformio/commands/upgrade.py | 2 +- platformio/{clients => }/http.py | 0 platformio/maintenance.py | 8 ++++---- platformio/package/manager/_registry.py | 2 +- platformio/package/manager/platform.py | 2 +- platformio/package/manifest/parser.py | 2 +- platformio/package/manifest/schema.py | 2 +- tests/conftest.py | 2 +- tests/misc/test_misc.py | 3 +-- 13 files changed, 17 insertions(+), 18 deletions(-) rename platformio/{clients => }/http.py (100%) diff --git a/platformio/builder/tools/piolib.py b/platformio/builder/tools/piolib.py index c8388b13..104e8496 100644 --- a/platformio/builder/tools/piolib.py +++ b/platformio/builder/tools/piolib.py @@ -31,8 +31,8 @@ from SCons.Script import DefaultEnvironment # pylint: disable=import-error from platformio import exception, fs, util from platformio.builder.tools import platformio as piotool -from platformio.clients.http import HTTPClientError, InternetIsOffline from platformio.compat import IS_WINDOWS, hashlib_encode_data, string_types +from platformio.http import HTTPClientError, InternetIsOffline from platformio.package.exception import ( MissingPackageManifestError, UnknownPackageError, diff --git a/platformio/clients/account.py b/platformio/clients/account.py index 2afe6fbe..a2eb0c28 100644 --- a/platformio/clients/account.py +++ b/platformio/clients/account.py @@ -16,8 +16,8 @@ import os import time from platformio import __accounts_api__, app -from platformio.clients.http import HTTPClient, HTTPClientError from platformio.exception import PlatformioException +from platformio.http import HTTPClient, HTTPClientError class AccountError(PlatformioException): diff --git a/platformio/clients/registry.py b/platformio/clients/registry.py index 75bfd99b..1682f7b1 100644 --- a/platformio/clients/registry.py +++ b/platformio/clients/registry.py @@ -12,11 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. +# pylint: disable=too-many-arguments + from platformio import __registry_mirror_hosts__, fs from platformio.clients.account import AccountClient, AccountError -from platformio.clients.http import HTTPClient, HTTPClientError - -# pylint: disable=too-many-arguments +from platformio.http import HTTPClient, HTTPClientError class RegistryClient(HTTPClient): diff --git a/platformio/commands/home/rpc/handlers/os.py b/platformio/commands/home/rpc/handlers/os.py index 7342b669..c6ddcaa6 100644 --- a/platformio/commands/home/rpc/handlers/os.py +++ b/platformio/commands/home/rpc/handlers/os.py @@ -24,9 +24,9 @@ import click from platformio import __default_requests_timeout__, fs from platformio.cache import ContentCache -from platformio.clients.http import ensure_internet_on from platformio.commands.home import helpers from platformio.device.list import list_logical_devices +from platformio.http import ensure_internet_on class OSRPC: diff --git a/platformio/commands/upgrade.py b/platformio/commands/upgrade.py index 0cba9e74..7664732a 100644 --- a/platformio/commands/upgrade.py +++ b/platformio/commands/upgrade.py @@ -20,8 +20,8 @@ from zipfile import ZipFile import click from platformio import VERSION, __version__, app, exception -from platformio.clients.http import fetch_remote_content from platformio.compat import IS_WINDOWS +from platformio.http import fetch_remote_content from platformio.package.manager.core import update_core_packages from platformio.proc import exec_command, get_pythonexe_path from platformio.project.helpers import get_project_cache_dir diff --git a/platformio/clients/http.py b/platformio/http.py similarity index 100% rename from platformio/clients/http.py rename to platformio/http.py diff --git a/platformio/maintenance.py b/platformio/maintenance.py index 775de286..9a897d62 100644 --- a/platformio/maintenance.py +++ b/platformio/maintenance.py @@ -21,11 +21,11 @@ import semantic_version from platformio import __version__, app, exception, fs, telemetry from platformio.cache import cleanup_content_cache -from platformio.clients import http from platformio.commands import PlatformioCLI from platformio.commands.platform import platform_update as cmd_platform_update from platformio.commands.system.prune import calculate_unnecessary_system_data from platformio.commands.upgrade import get_latest_version +from platformio.http import HTTPClientError, InternetIsOffline, ensure_internet_on from platformio.package.manager.core import update_core_packages from platformio.package.manager.tool import ToolPackageManager from platformio.package.meta import PackageSpec @@ -51,8 +51,8 @@ def on_platformio_end(ctx, result): # pylint: disable=unused-argument check_platformio_upgrade() check_prune_system() except ( - http.HTTPClientError, - http.InternetIsOffline, + HTTPClientError, + InternetIsOffline, exception.GetLatestVersionError, ): click.secho( @@ -213,7 +213,7 @@ def check_platformio_upgrade(): if not last_checked_time: return - http.ensure_internet_on(raise_exception=True) + ensure_internet_on(raise_exception=True) # Update PlatformIO Core packages update_core_packages() diff --git a/platformio/package/manager/_registry.py b/platformio/package/manager/_registry.py index b45a17f2..de0464d2 100644 --- a/platformio/package/manager/_registry.py +++ b/platformio/package/manager/_registry.py @@ -20,8 +20,8 @@ import click from platformio import __registry_mirror_hosts__ from platformio.cache import ContentCache -from platformio.clients.http import HTTPClient from platformio.clients.registry import RegistryClient +from platformio.http import HTTPClient from platformio.package.exception import UnknownPackageError from platformio.package.meta import PackageSpec from platformio.package.version import cast_version_to_semver diff --git a/platformio/package/manager/platform.py b/platformio/package/manager/platform.py index 6d0cc040..41f7b41e 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.clients.http import HTTPClientError, InternetIsOffline +from platformio.http import HTTPClientError, InternetIsOffline from platformio.package.exception import UnknownPackageError from platformio.package.manager.base import BasePackageManager from platformio.package.manager.core import get_installed_core_packages diff --git a/platformio/package/manifest/parser.py b/platformio/package/manifest/parser.py index a5e0f837..8735bcff 100644 --- a/platformio/package/manifest/parser.py +++ b/platformio/package/manifest/parser.py @@ -21,8 +21,8 @@ import tarfile from urllib.parse import urlparse from platformio import util -from platformio.clients.http import fetch_remote_content from platformio.compat import get_object_members, string_types +from platformio.http import fetch_remote_content from platformio.package.exception import ManifestParserError, UnknownManifestError from platformio.project.helpers import is_platformio_project diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py index c8f69e0c..8258dfe8 100644 --- a/platformio/package/manifest/schema.py +++ b/platformio/package/manifest/schema.py @@ -22,7 +22,7 @@ import requests import semantic_version from marshmallow import Schema, ValidationError, fields, validate, validates -from platformio.clients.http import fetch_remote_content +from platformio.http import fetch_remote_content from platformio.package.exception import ManifestValidationError from platformio.util import memoized diff --git a/tests/conftest.py b/tests/conftest.py index 76b53dd8..b26aaf49 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -20,7 +20,7 @@ import time import pytest from click.testing import CliRunner -from platformio.clients import http +from platformio import http def pytest_configure(config): diff --git a/tests/misc/test_misc.py b/tests/misc/test_misc.py index 9b8fc5d4..5596b9a2 100644 --- a/tests/misc/test_misc.py +++ b/tests/misc/test_misc.py @@ -17,8 +17,7 @@ import pytest import requests -from platformio import __check_internet_hosts__, proc -from platformio.clients import http +from platformio import __check_internet_hosts__, http, proc from platformio.clients.registry import RegistryClient