Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to thriftpy2 #222

Merged
merged 1 commit into from
May 13, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion happybase/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"""

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')
Expand Down
6 changes: 3 additions & 3 deletions happybase/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
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

Expand Down
2 changes: 1 addition & 1 deletion happybase/pool.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

from six.moves import queue, range

from thriftpy.thrift import TException
from thriftpy2.thrift import TException

from .connection import Connection

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
six
thriftpy>=0.3.8
thriftpy2>=0.4
2 changes: 1 addition & 1 deletion tests/test_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down