diff options
| author | Wouter Bolsterlee <uws@xs4all.nl> | 2016-03-20 21:32:17 +0100 |
|---|---|---|
| committer | Wouter Bolsterlee <uws@xs4all.nl> | 2016-03-20 21:32:17 +0100 |
| commit | 5afb6114646032d8792df61922eb643e4e1d243e (patch) | |
| tree | 73b36a81dc66ee0dbf1dd6a249284d7a2457f5ad /happybase/table.py | |
| parent | 9cbd718c10a3089f234f1eac1236b631e1f8e7cd (diff) | |
| parent | 12be787c9abf40e67acc396fce05bbf276c09ca9 (diff) | |
| download | happybase-dev.tar.gz | |
Merge branch 'port-to-thriftpy'dev
Diffstat (limited to 'happybase/table.py')
| -rw-r--r-- | happybase/table.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/happybase/table.py b/happybase/table.py index 3cb26b7..87be2f6 100644 --- a/happybase/table.py +++ b/happybase/table.py @@ -7,7 +7,8 @@ from numbers import Integral from operator import attrgetter from struct import Struct -from .hbase.ttypes import TScan +from .Hbase_thrift import TScan + from .util import thrift_type_to_dict, str_increment, OrderedDict from .batch import Batch |