diff --git a/platformio/commands/home/command.py b/platformio/commands/home.py similarity index 86% rename from platformio/commands/home/command.py rename to platformio/commands/home.py index f3c748a9..38b371bb 100644 --- a/platformio/commands/home/command.py +++ b/platformio/commands/home.py @@ -44,14 +44,14 @@ def cli(port, host, no_open): from twisted.web import server # pylint: enable=import-error - from platformio.commands.home.rpc.handlers.app import AppRPC - from platformio.commands.home.rpc.handlers.ide import IDERPC - from platformio.commands.home.rpc.handlers.misc import MiscRPC - from platformio.commands.home.rpc.handlers.os import OSRPC - from platformio.commands.home.rpc.handlers.piocore import PIOCoreRPC - from platformio.commands.home.rpc.handlers.project import ProjectRPC - from platformio.commands.home.rpc.server import JSONRPCServerFactory - from platformio.commands.home.web import WebRoot + from platformio.home.rpc.handlers.app import AppRPC + from platformio.home.rpc.handlers.ide import IDERPC + from platformio.home.rpc.handlers.misc import MiscRPC + from platformio.home.rpc.handlers.os import OSRPC + from platformio.home.rpc.handlers.piocore import PIOCoreRPC + from platformio.home.rpc.handlers.project import ProjectRPC + from platformio.home.rpc.server import JSONRPCServerFactory + from platformio.home.web import WebRoot factory = JSONRPCServerFactory() factory.addHandler(AppRPC(), namespace="app") diff --git a/platformio/commands/home/rpc/__init__.py b/platformio/home/__init__.py similarity index 100% rename from platformio/commands/home/rpc/__init__.py rename to platformio/home/__init__.py diff --git a/platformio/commands/home/helpers.py b/platformio/home/helpers.py similarity index 100% rename from platformio/commands/home/helpers.py rename to platformio/home/helpers.py diff --git a/platformio/commands/home/rpc/handlers/__init__.py b/platformio/home/rpc/__init__.py similarity index 100% rename from platformio/commands/home/rpc/handlers/__init__.py rename to platformio/home/rpc/__init__.py diff --git a/platformio/commands/home/__init__.py b/platformio/home/rpc/handlers/__init__.py similarity index 92% rename from platformio/commands/home/__init__.py rename to platformio/home/rpc/handlers/__init__.py index a889291e..b0514903 100644 --- a/platformio/commands/home/__init__.py +++ b/platformio/home/rpc/handlers/__init__.py @@ -11,5 +11,3 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - -from platformio.commands.home.command import cli diff --git a/platformio/commands/home/rpc/handlers/app.py b/platformio/home/rpc/handlers/app.py similarity index 100% rename from platformio/commands/home/rpc/handlers/app.py rename to platformio/home/rpc/handlers/app.py diff --git a/platformio/commands/home/rpc/handlers/ide.py b/platformio/home/rpc/handlers/ide.py similarity index 100% rename from platformio/commands/home/rpc/handlers/ide.py rename to platformio/home/rpc/handlers/ide.py diff --git a/platformio/commands/home/rpc/handlers/misc.py b/platformio/home/rpc/handlers/misc.py similarity index 97% rename from platformio/commands/home/rpc/handlers/misc.py rename to platformio/home/rpc/handlers/misc.py index 004c14a3..5503cf8c 100644 --- a/platformio/commands/home/rpc/handlers/misc.py +++ b/platformio/home/rpc/handlers/misc.py @@ -18,7 +18,7 @@ import time from twisted.internet import defer, reactor # pylint: disable=import-error from platformio import app -from platformio.commands.home.rpc.handlers.os import OSRPC +from platformio.home.rpc.handlers.os import OSRPC class MiscRPC(object): diff --git a/platformio/commands/home/rpc/handlers/os.py b/platformio/home/rpc/handlers/os.py similarity index 99% rename from platformio/commands/home/rpc/handlers/os.py rename to platformio/home/rpc/handlers/os.py index 960f04e6..7f5f5ece 100644 --- a/platformio/commands/home/rpc/handlers/os.py +++ b/platformio/home/rpc/handlers/os.py @@ -25,8 +25,8 @@ import click from twisted.internet import defer # pylint: disable=import-error from platformio import app, util -from platformio.commands.home import helpers from platformio.compat import PY2, get_filesystem_encoding +from platformio.home import helpers class OSRPC(object): diff --git a/platformio/commands/home/rpc/handlers/piocore.py b/platformio/home/rpc/handlers/piocore.py similarity index 99% rename from platformio/commands/home/rpc/handlers/piocore.py rename to platformio/home/rpc/handlers/piocore.py index 9ef39a03..f2a692d0 100644 --- a/platformio/commands/home/rpc/handlers/piocore.py +++ b/platformio/home/rpc/handlers/piocore.py @@ -26,8 +26,8 @@ from twisted.internet import threads # pylint: disable=import-error from twisted.internet import utils # pylint: disable=import-error from platformio import __main__, __version__, fs -from platformio.commands.home import helpers from platformio.compat import PY2, get_filesystem_encoding, is_bytes, string_types +from platformio.home import helpers try: from thread import get_ident as thread_get_ident diff --git a/platformio/commands/home/rpc/handlers/project.py b/platformio/home/rpc/handlers/project.py similarity index 98% rename from platformio/commands/home/rpc/handlers/project.py rename to platformio/home/rpc/handlers/project.py index c6f6a89f..4a0acfb5 100644 --- a/platformio/commands/home/rpc/handlers/project.py +++ b/platformio/home/rpc/handlers/project.py @@ -22,9 +22,9 @@ from os.path import basename, expanduser, getmtime, isdir, isfile, join, realpat import jsonrpc # pylint: disable=import-error from platformio import exception, fs -from platformio.commands.home.rpc.handlers.app import AppRPC -from platformio.commands.home.rpc.handlers.piocore import PIOCoreRPC from platformio.compat import PY2, get_filesystem_encoding +from platformio.home.rpc.handlers.app import AppRPC +from platformio.home.rpc.handlers.piocore import PIOCoreRPC from platformio.ide.projectgenerator import ProjectGenerator from platformio.managers.platform import PlatformManager from platformio.project.config import ProjectConfig diff --git a/platformio/commands/home/rpc/server.py b/platformio/home/rpc/server.py similarity index 100% rename from platformio/commands/home/rpc/server.py rename to platformio/home/rpc/server.py diff --git a/platformio/commands/home/web.py b/platformio/home/web.py similarity index 100% rename from platformio/commands/home/web.py rename to platformio/home/web.py