From 4f0f3f5b31d710c5b48adefbcc5031c79b1a91b3 Mon Sep 17 00:00:00 2001 From: Alexander Koshevoy Date: Wed, 25 Jul 2018 11:52:29 +0300 Subject: [PATCH] PY-18029 _jetbrains_ply and _jetbrains_thrift renamed to _shaded_ply and _shaded_thrift respectively --- python/helpers/profiler/_prof_imports.py | 8 ++++---- python/helpers/pydev/_pydev_comm/rpc.py | 6 +++--- python/helpers/pydev/_pydev_comm/transport.py | 4 ++-- python/helpers/pydev/pydev_console/protocol.py | 6 +++--- python/helpers/pydev/pydevconsole.py | 2 +- .../thriftpy/{_jetbrains_ply => _shaded_ply}/__init__.py | 0 .../thriftpy/{_jetbrains_ply => _shaded_ply}/cpp.py | 2 +- .../thriftpy/{_jetbrains_ply => _shaded_ply}/ctokens.py | 0 .../thriftpy/{_jetbrains_ply => _shaded_ply}/lex.py | 0 .../thriftpy/{_jetbrains_ply => _shaded_ply}/yacc.py | 0 .../thriftpy/{_jetbrains_ply => _shaded_ply}/ygen.py | 0 .../{_jetbrains_thriftpy => _shaded_thriftpy}/__init__.py | 0 .../{_jetbrains_thriftpy => _shaded_thriftpy}/_compat.py | 0 .../contrib/__init__.py | 0 .../contrib/tracking/__init__.py | 0 .../contrib/tracking/tracker.py | 0 .../contrib/tracking/tracking.thrift | 0 .../{_jetbrains_thriftpy => _shaded_thriftpy}/hook.py | 0 .../parser/__init__.py | 0 .../parser/exc.py | 0 .../parser/lexer.py | 0 .../parser/parser.py | 2 +- .../protocol/__init__.py | 2 +- .../protocol/binary.py | 0 .../protocol/compact.py | 2 +- .../protocol/cybin/cybin.pyx | 0 .../protocol/cybin/endian_port.h | 0 .../protocol/exc.py | 0 .../protocol/json.py | 2 +- .../protocol/multiplex.py | 2 +- .../{_jetbrains_thriftpy => _shaded_thriftpy}/rpc.py | 8 ++++---- .../{_jetbrains_thriftpy => _shaded_thriftpy}/server.py | 4 ++-- .../{_jetbrains_thriftpy => _shaded_thriftpy}/thrift.py | 0 .../{_jetbrains_thriftpy => _shaded_thriftpy}/tornado.py | 0 .../transport/__init__.py | 2 +- .../transport/_ssl.py | 0 .../transport/buffered/__init__.py | 2 +- .../transport/buffered/cybuffered.pyx | 0 .../transport/cybase.pxd | 0 .../transport/cybase.pyx | 0 .../transport/framed/__init__.py | 2 +- .../transport/framed/cyframed.pyx | 0 .../transport/memory/__init__.py | 2 +- .../transport/memory/cymemory.pyx | 0 .../transport/socket.py | 0 .../transport/sslsocket.py | 0 .../{_jetbrains_thriftpy => _shaded_thriftpy}/utils.py | 0 47 files changed, 29 insertions(+), 29 deletions(-) rename python/helpers/third_party/thriftpy/{_jetbrains_ply => _shaded_ply}/__init__.py (100%) rename python/helpers/third_party/thriftpy/{_jetbrains_ply => _shaded_ply}/cpp.py (99%) rename python/helpers/third_party/thriftpy/{_jetbrains_ply => _shaded_ply}/ctokens.py (100%) rename python/helpers/third_party/thriftpy/{_jetbrains_ply => _shaded_ply}/lex.py (100%) rename python/helpers/third_party/thriftpy/{_jetbrains_ply => _shaded_ply}/yacc.py (100%) rename python/helpers/third_party/thriftpy/{_jetbrains_ply => _shaded_ply}/ygen.py (100%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/__init__.py (100%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/_compat.py (100%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/contrib/__init__.py (100%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/contrib/tracking/__init__.py (100%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/contrib/tracking/tracker.py (100%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/contrib/tracking/tracking.thrift (100%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/hook.py (100%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/parser/__init__.py (100%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/parser/exc.py (100%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/parser/lexer.py (100%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/parser/parser.py (99%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/protocol/__init__.py (95%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/protocol/binary.py (100%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/protocol/compact.py (99%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/protocol/cybin/cybin.pyx (100%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/protocol/cybin/endian_port.h (100%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/protocol/exc.py (100%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/protocol/json.py (99%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/protocol/multiplex.py (93%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/rpc.py (92%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/server.py (96%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/thrift.py (100%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/tornado.py (100%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/transport/__init__.py (98%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/transport/_ssl.py (100%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/transport/buffered/__init__.py (97%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/transport/buffered/cybuffered.pyx (100%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/transport/cybase.pxd (100%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/transport/cybase.pyx (100%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/transport/framed/__init__.py (97%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/transport/framed/cyframed.pyx (100%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/transport/memory/__init__.py (96%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/transport/memory/cymemory.pyx (100%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/transport/socket.py (100%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/transport/sslsocket.py (100%) rename python/helpers/third_party/thriftpy/{_jetbrains_thriftpy => _shaded_thriftpy}/utils.py (100%) diff --git a/python/helpers/profiler/_prof_imports.py b/python/helpers/profiler/_prof_imports.py index 7d7f91d9c84d..1a82e8495b9a 100644 --- a/python/helpers/profiler/_prof_imports.py +++ b/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 diff --git a/python/helpers/pydev/_pydev_comm/rpc.py b/python/helpers/pydev/_pydev_comm/rpc.py index 676c1da3331a..51b592e2a425 100644 --- a/python/helpers/pydev/_pydev_comm/rpc.py +++ b/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 diff --git a/python/helpers/pydev/_pydev_comm/transport.py b/python/helpers/pydev/_pydev_comm/transport.py index 897cb00f48d0..20d259c2fd4e 100644 --- a/python/helpers/pydev/_pydev_comm/transport.py +++ b/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 diff --git a/python/helpers/pydev/pydev_console/protocol.py b/python/helpers/pydev/pydev_console/protocol.py index a791e6cd4bdc..63bd6720d217 100644 --- a/python/helpers/pydev/pydev_console/protocol.py +++ b/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 diff --git a/python/helpers/pydev/pydevconsole.py b/python/helpers/pydev/pydevconsole.py index df8cf30011a4..f02b4c2383de 100644 --- a/python/helpers/pydev/pydevconsole.py +++ b/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 diff --git a/python/helpers/third_party/thriftpy/_jetbrains_ply/__init__.py b/python/helpers/third_party/thriftpy/_shaded_ply/__init__.py similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_ply/__init__.py rename to python/helpers/third_party/thriftpy/_shaded_ply/__init__.py diff --git a/python/helpers/third_party/thriftpy/_jetbrains_ply/cpp.py b/python/helpers/third_party/thriftpy/_shaded_ply/cpp.py similarity index 99% rename from python/helpers/third_party/thriftpy/_jetbrains_ply/cpp.py rename to python/helpers/third_party/thriftpy/_shaded_ply/cpp.py index afa07ef22c0b..884329a6ca66 100644 --- a/python/helpers/third_party/thriftpy/_jetbrains_ply/cpp.py +++ b/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 diff --git a/python/helpers/third_party/thriftpy/_jetbrains_ply/ctokens.py b/python/helpers/third_party/thriftpy/_shaded_ply/ctokens.py similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_ply/ctokens.py rename to python/helpers/third_party/thriftpy/_shaded_ply/ctokens.py diff --git a/python/helpers/third_party/thriftpy/_jetbrains_ply/lex.py b/python/helpers/third_party/thriftpy/_shaded_ply/lex.py similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_ply/lex.py rename to python/helpers/third_party/thriftpy/_shaded_ply/lex.py diff --git a/python/helpers/third_party/thriftpy/_jetbrains_ply/yacc.py b/python/helpers/third_party/thriftpy/_shaded_ply/yacc.py similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_ply/yacc.py rename to python/helpers/third_party/thriftpy/_shaded_ply/yacc.py diff --git a/python/helpers/third_party/thriftpy/_jetbrains_ply/ygen.py b/python/helpers/third_party/thriftpy/_shaded_ply/ygen.py similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_ply/ygen.py rename to python/helpers/third_party/thriftpy/_shaded_ply/ygen.py diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/__init__.py b/python/helpers/third_party/thriftpy/_shaded_thriftpy/__init__.py similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/__init__.py rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/__init__.py diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/_compat.py b/python/helpers/third_party/thriftpy/_shaded_thriftpy/_compat.py similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/_compat.py rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/_compat.py diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/contrib/__init__.py b/python/helpers/third_party/thriftpy/_shaded_thriftpy/contrib/__init__.py similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/contrib/__init__.py rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/contrib/__init__.py diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/contrib/tracking/__init__.py b/python/helpers/third_party/thriftpy/_shaded_thriftpy/contrib/tracking/__init__.py similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/contrib/tracking/__init__.py rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/contrib/tracking/__init__.py diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/contrib/tracking/tracker.py b/python/helpers/third_party/thriftpy/_shaded_thriftpy/contrib/tracking/tracker.py similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/contrib/tracking/tracker.py rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/contrib/tracking/tracker.py diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/contrib/tracking/tracking.thrift b/python/helpers/third_party/thriftpy/_shaded_thriftpy/contrib/tracking/tracking.thrift similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/contrib/tracking/tracking.thrift rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/contrib/tracking/tracking.thrift diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/hook.py b/python/helpers/third_party/thriftpy/_shaded_thriftpy/hook.py similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/hook.py rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/hook.py diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/parser/__init__.py b/python/helpers/third_party/thriftpy/_shaded_thriftpy/parser/__init__.py similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/parser/__init__.py rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/parser/__init__.py diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/parser/exc.py b/python/helpers/third_party/thriftpy/_shaded_thriftpy/parser/exc.py similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/parser/exc.py rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/parser/exc.py diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/parser/lexer.py b/python/helpers/third_party/thriftpy/_shaded_thriftpy/parser/lexer.py similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/parser/lexer.py rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/parser/lexer.py diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/parser/parser.py b/python/helpers/third_party/thriftpy/_shaded_thriftpy/parser/parser.py similarity index 99% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/parser/parser.py rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/parser/parser.py index add15e26567a..5b2a79d8f8e6 100644 --- a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/parser/parser.py +++ b/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 diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/protocol/__init__.py b/python/helpers/third_party/thriftpy/_shaded_thriftpy/protocol/__init__.py similarity index 95% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/protocol/__init__.py rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/protocol/__init__.py index 5abd4738f06d..af6b445ffde2 100644 --- a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/protocol/__init__.py +++ b/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: diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/protocol/binary.py b/python/helpers/third_party/thriftpy/_shaded_thriftpy/protocol/binary.py similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/protocol/binary.py rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/protocol/binary.py diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/protocol/compact.py b/python/helpers/third_party/thriftpy/_shaded_thriftpy/protocol/compact.py similarity index 99% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/protocol/compact.py rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/protocol/compact.py index d4fcd0eda26f..d0a210cfc178 100644 --- a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/protocol/compact.py +++ b/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 diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/protocol/cybin/cybin.pyx b/python/helpers/third_party/thriftpy/_shaded_thriftpy/protocol/cybin/cybin.pyx similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/protocol/cybin/cybin.pyx rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/protocol/cybin/cybin.pyx diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/protocol/cybin/endian_port.h b/python/helpers/third_party/thriftpy/_shaded_thriftpy/protocol/cybin/endian_port.h similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/protocol/cybin/endian_port.h rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/protocol/cybin/endian_port.h diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/protocol/exc.py b/python/helpers/third_party/thriftpy/_shaded_thriftpy/protocol/exc.py similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/protocol/exc.py rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/protocol/exc.py diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/protocol/json.py b/python/helpers/third_party/thriftpy/_shaded_thriftpy/protocol/json.py similarity index 99% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/protocol/json.py rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/protocol/json.py index 046520c08333..ea60d215a14c 100644 --- a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/protocol/json.py +++ b/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 diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/protocol/multiplex.py b/python/helpers/third_party/thriftpy/_shaded_thriftpy/protocol/multiplex.py similarity index 93% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/protocol/multiplex.py rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/protocol/multiplex.py index 85fff4e32320..7ff32ad7dae3 100644 --- a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/protocol/multiplex.py +++ b/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): diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/rpc.py b/python/helpers/third_party/thriftpy/_shaded_thriftpy/rpc.py similarity index 92% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/rpc.py rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/rpc.py index 8d1e5fd86752..53eec7bfd0d0 100644 --- a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/rpc.py +++ b/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, diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/server.py b/python/helpers/third_party/thriftpy/_shaded_thriftpy/server.py similarity index 96% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/server.py rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/server.py index 74b922b7c2aa..b5380b4e6ee0 100644 --- a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/server.py +++ b/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 ) diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/thrift.py b/python/helpers/third_party/thriftpy/_shaded_thriftpy/thrift.py similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/thrift.py rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/thrift.py diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/tornado.py b/python/helpers/third_party/thriftpy/_shaded_thriftpy/tornado.py similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/tornado.py rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/tornado.py diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/transport/__init__.py b/python/helpers/third_party/thriftpy/_shaded_thriftpy/transport/__init__.py similarity index 98% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/transport/__init__.py rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/transport/__init__.py index 20f9f320e2d0..52e4faf6e70d 100644 --- a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/transport/__init__.py +++ b/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 diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/transport/_ssl.py b/python/helpers/third_party/thriftpy/_shaded_thriftpy/transport/_ssl.py similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/transport/_ssl.py rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/transport/_ssl.py diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/transport/buffered/__init__.py b/python/helpers/third_party/thriftpy/_shaded_thriftpy/transport/buffered/__init__.py similarity index 97% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/transport/buffered/__init__.py rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/transport/buffered/__init__.py index 8e5e3cee23d6..edcec4393d48 100644 --- a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/transport/buffered/__init__.py +++ b/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 diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/transport/buffered/cybuffered.pyx b/python/helpers/third_party/thriftpy/_shaded_thriftpy/transport/buffered/cybuffered.pyx similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/transport/buffered/cybuffered.pyx rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/transport/buffered/cybuffered.pyx diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/transport/cybase.pxd b/python/helpers/third_party/thriftpy/_shaded_thriftpy/transport/cybase.pxd similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/transport/cybase.pxd rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/transport/cybase.pxd diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/transport/cybase.pyx b/python/helpers/third_party/thriftpy/_shaded_thriftpy/transport/cybase.pyx similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/transport/cybase.pyx rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/transport/cybase.pyx diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/transport/framed/__init__.py b/python/helpers/third_party/thriftpy/_shaded_thriftpy/transport/framed/__init__.py similarity index 97% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/transport/framed/__init__.py rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/transport/framed/__init__.py index 91800b0e1851..edc6db03ed9b 100644 --- a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/transport/framed/__init__.py +++ b/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 diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/transport/framed/cyframed.pyx b/python/helpers/third_party/thriftpy/_shaded_thriftpy/transport/framed/cyframed.pyx similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/transport/framed/cyframed.pyx rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/transport/framed/cyframed.pyx diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/transport/memory/__init__.py b/python/helpers/third_party/thriftpy/_shaded_thriftpy/transport/memory/__init__.py similarity index 96% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/transport/memory/__init__.py rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/transport/memory/__init__.py index 58065b584c19..5b220f09b660 100644 --- a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/transport/memory/__init__.py +++ b/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 diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/transport/memory/cymemory.pyx b/python/helpers/third_party/thriftpy/_shaded_thriftpy/transport/memory/cymemory.pyx similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/transport/memory/cymemory.pyx rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/transport/memory/cymemory.pyx diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/transport/socket.py b/python/helpers/third_party/thriftpy/_shaded_thriftpy/transport/socket.py similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/transport/socket.py rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/transport/socket.py diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/transport/sslsocket.py b/python/helpers/third_party/thriftpy/_shaded_thriftpy/transport/sslsocket.py similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/transport/sslsocket.py rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/transport/sslsocket.py diff --git a/python/helpers/third_party/thriftpy/_jetbrains_thriftpy/utils.py b/python/helpers/third_party/thriftpy/_shaded_thriftpy/utils.py similarity index 100% rename from python/helpers/third_party/thriftpy/_jetbrains_thriftpy/utils.py rename to python/helpers/third_party/thriftpy/_shaded_thriftpy/utils.py