summaryrefslogtreecommitdiff
path: root/happybase/connection.py
diff options
context:
space:
mode:
authorWouter Bolsterlee <wouter@bolsterl.ee>2016-08-01 22:45:09 +0200
committerWouter Bolsterlee <wouter@bolsterl.ee>2016-08-01 22:45:09 +0200
commit06108ce838727d415ec2cd7d01c8e93ada587ce0 (patch)
tree0690027d94d21a25d19fe8ce93aebab625e095d7 /happybase/connection.py
parentf536bdaabf7fa1c03fc8e623dc96d1e0c7c7afe9 (diff)
downloadhappybase-06108ce838727d415ec2cd7d01c8e93ada587ce0.tar.gz
Avoid thriftpy import hook
...since it's a global thing. Make importing more explicit by specifying a path (using pkg_resources) to the .thrift file and loading it explicitly.
Diffstat (limited to 'happybase/connection.py')
-rw-r--r--happybase/connection.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/happybase/connection.py b/happybase/connection.py
index 1dad7d6..36c6735 100644
--- a/happybase/connection.py
+++ b/happybase/connection.py
@@ -11,7 +11,8 @@ from thriftpy.thrift import TClient
from thriftpy.transport import TBufferedTransport, TFramedTransport, TSocket
from thriftpy.protocol import TBinaryProtocol, TCompactProtocol
-from .Hbase_thrift import Hbase, ColumnDescriptor
+from Hbase_thrift import Hbase, ColumnDescriptor
+
from .table import Table
from .util import ensure_bytes, pep8_to_camel_case