Move http module to the root

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,

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):

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
+from platformio.http import HTTPClient, HTTPClientError
-
-# pylint: disable=too-many-arguments
 
 
 class RegistryClient(HTTPClient):

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:

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

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,
+        HTTPClientError,
-        http.InternetIsOffline,
+        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()

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

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

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
 

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
 

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):

tests/misc/test_misc.py

@@ -17,8 +17,7 @@
 import pytest
 import requests
 
-from platformio import __check_internet_hosts__, proc
+from platformio import __check_internet_hosts__, http, proc
-from platformio.clients import http
 from platformio.clients.registry import RegistryClient