Move from thriftpy to thriftpy2 since thriftpy is deprecated (#481)

pystorm · Oct 7, 2020 · 6859c17 · 6859c17
1 parent 8d5757c
commit 6859c17
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -7,4 +7,4 @@ ruamel.yaml
 setuptools
 simplejson
 texttable
-thriftpy>=0.3.2
+thriftpy2
diff --git a/streamparse/dsl/topology.py b/streamparse/dsl/topology.py
@@ -3,8 +3,8 @@
 """
 import simplejson as json
 from pystorm.component import Component
-from thriftpy.transport import TMemoryBuffer
-from thriftpy.protocol import TBinaryProtocol
+from thriftpy2.transport import TMemoryBuffer
+from thriftpy2.protocol import TBinaryProtocol
 
 from ..thrift import Bolt, SpoutSpec, StormTopology
 from .bolt import JavaBoltSpec, ShellBoltSpec

diff --git a/streamparse/thrift.py b/streamparse/thrift.py
@@ -4,7 +4,7 @@
 
 import io
 
-import thriftpy
+import thriftpy2
 
 # Apache storm.thrift file as string to simplify loading it.
 _THRIFT_STR = """
@@ -782,7 +782,7 @@
 }
 """
 
-storm_thrift = thriftpy.load_fp(io.StringIO(_THRIFT_STR), module_name="storm_thrift")
+storm_thrift = thriftpy2.load_fp(io.StringIO(_THRIFT_STR), module_name="storm_thrift")
 # Fix a lovely issue where GlobalStreamIds didn't have consistent hash values
 storm_thrift.GlobalStreamId.__hash__ = lambda self: (
     hash(self.componentId) ^ hash(self.streamId)

diff --git a/streamparse/util.py b/streamparse/util.py
@@ -19,9 +19,9 @@
 from fabric.colors import red, yellow
 from pkg_resources import parse_version
 from texttable import Texttable
-from thriftpy.protocol import TBinaryProtocolFactory
-from thriftpy.rpc import make_client
-from thriftpy.transport import TFramedTransportFactory
+from thriftpy2.protocol import TBinaryProtocolFactory
+from thriftpy2.rpc import make_client
+from thriftpy2.transport import TFramedTransportFactory
 
 from .dsl.topology import Topology, TopologyType
 from .thrift import Nimbus