PY-18029 Move communication scripts from pydev_console to _pydev_comm package

python/helpers/pydev/_pydev_comm/rpc.py

@@ -1,10 +1,10 @@
 import socket
 import threading
 
-from pydev_console.thrift_transport import TSyncClient, open_transports_as_client, _create_client_server_transports
 from _jetbrains_thriftpy.protocol import TBinaryProtocolFactory
 from _jetbrains_thriftpy.server import TThreadedServer
 from _jetbrains_thriftpy.thrift import TProcessor
+from _pydev_comm.transport import TSyncClient, open_transports_as_client, _create_client_server_transports
 
 
 def make_rpc_client(client_service, host, port, proto_factory=TBinaryProtocolFactory(strict_read=False, strict_write=False)):

python/helpers/pydev/_pydev_comm/transport.py

@@ -5,7 +5,7 @@ import threading
 
 from _jetbrains_thriftpy.thrift import TClient
 from _jetbrains_thriftpy.transport import TTransportBase, readall
-from pydev_console.io import PipeIO
+from _pydev_comm.io import PipeIO
 
 REQUEST = 0
 RESPONSE = 1

python/helpers/pydev/pydevconsole.py

@@ -3,7 +3,7 @@ Entry point module to start the interactive console.
 '''
 from _pydev_bundle._pydev_getopt import gnu_getopt
 from _pydev_imps._pydev_saved_modules import thread
-from pydev_console.thrift_rpc import make_rpc_client, start_rpc_server, start_rpc_server_and_make_client
+from _pydev_comm.rpc import make_rpc_client, start_rpc_server, start_rpc_server_and_make_client
 
 start_new_thread = thread.start_new_thread
 

python/helpers/pydev/tests_pydevd/test_pydev_ipython_011.py

@@ -7,9 +7,9 @@ import pytest
 
 from _pydev_bundle.pydev_console_utils import StdIn
 from _pydev_bundle.pydev_localhost import get_localhost
+from _pydev_comm.rpc import make_rpc_client
 from _pydevd_bundle import pydevd_io
 from pydev_console.thrift_communication import console_thrift
-from pydev_console.thrift_rpc import make_rpc_client
 from pydevconsole import enable_thrift_logging
 
 try:
@@ -205,7 +205,7 @@ class TestRunningCode(TestBase):
             return
 
         from _pydev_bundle.pydev_ipython_console_011 import get_pydev_frontend
-        from pydev_console.thrift_rpc import start_rpc_server_and_make_client
+        from _pydev_comm.rpc import start_rpc_server_and_make_client
 
         called_RequestInput = [False]
         called_IPythonEditor = [False]

python/helpers/pydev/tests_pydevd/test_pydevconsole.py

@@ -3,9 +3,9 @@ import threading
 import unittest
 
 import pydevconsole
+from _pydev_comm.rpc import make_rpc_client, start_rpc_server_and_make_client, start_rpc_server
 from _pydevd_bundle import pydevd_io
 from pydev_console.thrift_communication import console_thrift
-from pydev_console.thrift_rpc import make_rpc_client, start_rpc_server_and_make_client, start_rpc_server
 from pydevconsole import enable_thrift_logging
 
 try: