diff options
| author | bwo <wolfson@gmail.com> | 2019-05-13 13:32:21 -0700 |
|---|---|---|
| committer | wouter bolsterlee <wouter@bolsterl.ee> | 2019-05-13 22:32:21 +0200 |
| commit | 1c3c24bb23536a88d17aeb326879fea6c76a2c03 (patch) | |
| tree | 8c17f8653703cb30f3e2de425372bb33876c70f7 | |
| parent | dacc526c5f07f0644d518ed4b8e25505882f2906 (diff) | |
| download | happybase-1c3c24bb23536a88d17aeb326879fea6c76a2c03.tar.gz | |
update to thriftpy2 (#222)
| -rw-r--r-- | happybase/__init__.py | 2 | ||||
| -rw-r--r-- | happybase/connection.py | 6 | ||||
| -rw-r--r-- | happybase/pool.py | 2 | ||||
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | tests/test_api.py | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/happybase/__init__.py b/happybase/__init__.py index 978c1d6..feb2fec 100644 --- a/happybase/__init__.py +++ b/happybase/__init__.py @@ -4,7 +4,7 @@ HBase. """ import pkg_resources as _pkg_resources -import thriftpy as _thriftpy +import thriftpy2 as _thriftpy _thriftpy.load( _pkg_resources.resource_filename('happybase', 'Hbase.thrift'), 'Hbase_thrift') diff --git a/happybase/connection.py b/happybase/connection.py index f367552..a36a474 100644 --- a/happybase/connection.py +++ b/happybase/connection.py @@ -7,9 +7,9 @@ HappyBase connection module. import logging import six -from thriftpy.thrift import TClient -from thriftpy.transport import TBufferedTransport, TFramedTransport, TSocket -from thriftpy.protocol import TBinaryProtocol, TCompactProtocol +from thriftpy2.thrift import TClient +from thriftpy2.transport import TBufferedTransport, TFramedTransport, TSocket +from thriftpy2.protocol import TBinaryProtocol, TCompactProtocol from Hbase_thrift import Hbase, ColumnDescriptor diff --git a/happybase/pool.py b/happybase/pool.py index 2d6fee2..5a9bd90 100644 --- a/happybase/pool.py +++ b/happybase/pool.py @@ -9,7 +9,7 @@ import threading from six.moves import queue, range -from thriftpy.thrift import TException +from thriftpy2.thrift import TException from .connection import Connection diff --git a/requirements.txt b/requirements.txt index dfd9ea0..852a22d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ six -thriftpy>=0.3.8 +thriftpy2>=0.4 diff --git a/tests/test_api.py b/tests/test_api.py index f5242a5..7c562da 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -518,7 +518,7 @@ def test_connection_pool_construction(): def test_connection_pool(): - from thriftpy.thrift import TException + from thriftpy2.thrift import TException def run(): name = threading.current_thread().name |