PY-18029 _jetbrains_ply and _jetbrains_thrift renamed to _shaded_ply and _shaded_thrift respectively

python/helpers/profiler/_prof_imports.py

@@ -9,12 +9,12 @@ try:
 except AttributeError:
     pass  #Not all versions have sys.version_info
 
-import _jetbrains_thriftpy
-profiler = _jetbrains_thriftpy.load(os.path.join(os.path.dirname(os.path.realpath(__file__)), "profiler.thrift"), module_name="profiler_thrift")
+import _shaded_thriftpy
+profiler = _shaded_thriftpy.load(os.path.join(os.path.dirname(os.path.realpath(__file__)), "profiler.thrift"), module_name="profiler_thrift")
 
 
-from _jetbrains_thriftpy.protocol.binary import TBinaryProtocolFactory
-from _jetbrains_thriftpy.transport import TMemoryBuffer
+from _shaded_thriftpy.protocol.binary import TBinaryProtocolFactory
+from _shaded_thriftpy.transport import TMemoryBuffer
 
 # noinspection PyUnresolvedReferences
 from profiler_thrift import ProfilerRequest, ProfilerResponse, Stats, FuncStat, Function, TreeStats, CallTreeStat

python/helpers/pydev/_pydev_comm/rpc.py

@@ -1,9 +1,9 @@
 import socket
 import threading
 
-from _jetbrains_thriftpy.protocol import TBinaryProtocolFactory
-from _jetbrains_thriftpy.server import TThreadedServer
-from _jetbrains_thriftpy.thrift import TProcessor
+from _shaded_thriftpy.protocol import TBinaryProtocolFactory
+from _shaded_thriftpy.server import TThreadedServer
+from _shaded_thriftpy.thrift import TProcessor
 from _pydev_comm.transport import TSyncClient, open_transports_as_client, _create_client_server_transports
 
 

python/helpers/pydev/_pydev_comm/transport.py

@@ -3,8 +3,8 @@ import struct
 import sys
 import threading
 
-from _jetbrains_thriftpy.thrift import TClient
-from _jetbrains_thriftpy.transport import TTransportBase, readall
+from _shaded_thriftpy.thrift import TClient
+from _shaded_thriftpy.transport import TTransportBase, readall
 from _pydev_comm.io import PipeIO
 
 REQUEST = 0

python/helpers/pydev/pydev_console/protocol.py

@@ -1,10 +1,10 @@
 import os
 
-import _jetbrains_thriftpy
+import _shaded_thriftpy
 
 # dynamically import console.thrift classes into `console_thrift` module
-_console_thrift = _jetbrains_thriftpy.load(os.path.join(os.path.dirname(os.path.realpath(__file__)), "console.thrift"),
-                                           module_name="console_thrift")
+_console_thrift = _shaded_thriftpy.load(os.path.join(os.path.dirname(os.path.realpath(__file__)), "console.thrift"),
+                                        module_name="console_thrift")
 
 CompletionOption = _console_thrift.CompletionOption
 CompletionOptionType = _console_thrift.CompletionOptionType

python/helpers/pydev/pydevconsole.py

@@ -256,7 +256,7 @@ def enable_thrift_logging():
     import logging
 
     # create logger
-    logger = logging.getLogger('_jetbrains_thriftpy')
+    logger = logging.getLogger('_shaded_thriftpy')
     logger.setLevel(logging.DEBUG)
 
     # create console handler and set level to debug

python/helpers/third_party/thriftpy/_shaded_ply/cpp.py

@@ -881,7 +881,7 @@ class Preprocessor(object):
             return None
 
 if __name__ == '__main__':
-    import _jetbrains_ply.lex as lex
+    import _shaded_ply.lex as lex
     lexer = lex.lex()
 
     # Run a preprocessor

python/helpers/third_party/thriftpy/_shaded_thriftpy/parser/parser.py

@@ -11,7 +11,7 @@ import collections
 import os
 import sys
 import types
-from _jetbrains_ply import lex, yacc
+from _shaded_ply import lex, yacc
 from .lexer import *  # noqa
 from .exc import ThriftParserError, ThriftGrammerError
 from ..thrift import gen_init, TType, TPayload, TException

python/helpers/third_party/thriftpy/_shaded_thriftpy/protocol/__init__.py

@@ -7,7 +7,7 @@ from .json import TJSONProtocol, TJSONProtocolFactory
 from .compact import TCompactProtocol, TCompactProtocolFactory
 from .multiplex import TMultiplexedProtocol, TMultiplexedProtocolFactory
 
-from _jetbrains_thriftpy._compat import PYPY, CYTHON
+from _shaded_thriftpy._compat import PYPY, CYTHON
 if not PYPY:
     # enable cython binary by default for CPython.
     if CYTHON:

python/helpers/third_party/thriftpy/_shaded_thriftpy/protocol/compact.py

@@ -9,7 +9,7 @@ from .exc import TProtocolException
 from ..thrift import TException
 from ..thrift import TType
 
-from _jetbrains_thriftpy._compat import PY3
+from _shaded_thriftpy._compat import PY3
 
 CLEAR = 0
 FIELD_WRITE = 1

python/helpers/third_party/thriftpy/_shaded_thriftpy/protocol/json.py

@@ -5,7 +5,7 @@ from __future__ import absolute_import
 import json
 import struct
 
-from _jetbrains_thriftpy.thrift import TType
+from _shaded_thriftpy.thrift import TType
 
 from .exc import TProtocolException
 

python/helpers/third_party/thriftpy/_shaded_thriftpy/protocol/multiplex.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from _jetbrains_thriftpy.thrift import TMultiplexedProcessor, TMessageType
+from _shaded_thriftpy.thrift import TMultiplexedProcessor, TMessageType
 
 
 class TMultiplexedProtocol(object):

python/helpers/third_party/thriftpy/_shaded_thriftpy/rpc.py

@@ -5,10 +5,10 @@ from __future__ import absolute_import
 import contextlib
 import warnings
 
-from _jetbrains_thriftpy.protocol import TBinaryProtocolFactory
-from _jetbrains_thriftpy.server import TThreadedServer
-from _jetbrains_thriftpy.thrift import TProcessor, TClient
-from _jetbrains_thriftpy.transport import (
+from _shaded_thriftpy.protocol import TBinaryProtocolFactory
+from _shaded_thriftpy.server import TThreadedServer
+from _shaded_thriftpy.thrift import TProcessor, TClient
+from _shaded_thriftpy.transport import (
     TBufferedTransportFactory,
     TServerSocket,
     TSocket,

python/helpers/third_party/thriftpy/_shaded_thriftpy/server.py

@@ -5,8 +5,8 @@ from __future__ import absolute_import
 import logging
 import threading
 
-from _jetbrains_thriftpy.protocol import TBinaryProtocolFactory
-from _jetbrains_thriftpy.transport import (
+from _shaded_thriftpy.protocol import TBinaryProtocolFactory
+from _shaded_thriftpy.transport import (
     TBufferedTransportFactory,
     TTransportException
 )

python/helpers/third_party/thriftpy/_shaded_thriftpy/transport/__init__.py

@@ -2,7 +2,7 @@
 
 from __future__ import absolute_import
 
-from _jetbrains_thriftpy._compat import CYTHON
+from _shaded_thriftpy._compat import CYTHON
 
 from ..thrift import TType, TException
 

python/helpers/third_party/thriftpy/_shaded_thriftpy/transport/buffered/__init__.py

@@ -4,7 +4,7 @@ from __future__ import absolute_import
 
 from io import BytesIO
 
-from _jetbrains_thriftpy._compat import CYTHON
+from _shaded_thriftpy._compat import CYTHON
 from .. import TTransportBase
 
 

python/helpers/third_party/thriftpy/_shaded_thriftpy/transport/framed/__init__.py

@@ -5,7 +5,7 @@ from __future__ import absolute_import
 import struct
 from io import BytesIO
 
-from _jetbrains_thriftpy._compat import CYTHON
+from _shaded_thriftpy._compat import CYTHON
 from .. import TTransportBase, readall
 from ..buffered import TBufferedTransport
 

python/helpers/third_party/thriftpy/_shaded_thriftpy/transport/memory/__init__.py

@@ -4,7 +4,7 @@ from __future__ import absolute_import
 
 from io import BytesIO
 
-from _jetbrains_thriftpy._compat import CYTHON
+from _shaded_thriftpy._compat import CYTHON
 from .. import TTransportBase