summaryrefslogtreecommitdiff
path: root/happybase/table.py
diff options
context:
space:
mode:
authorWouter Bolsterlee <uws@xs4all.nl>2016-03-20 22:17:41 +0100
committerWouter Bolsterlee <wouter@bolsterl.ee>2016-07-27 19:08:46 +0200
commitf5652822120041bfdde642a55f564f94a5d147fc (patch)
tree701ec8c1c337b92ccfc32d1926e8ce9423121aed /happybase/table.py
parent75356bf802c6a7e6b9eb46078447c81d260916e7 (diff)
downloadhappybase-f5652822120041bfdde642a55f564f94a5d147fc.tar.gz
Use six.iteritems()
Diffstat (limited to 'happybase/table.py')
-rw-r--r--happybase/table.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/happybase/table.py b/happybase/table.py
index 87be2f6..c0f2752 100644
--- a/happybase/table.py
+++ b/happybase/table.py
@@ -7,6 +7,8 @@ from numbers import Integral
from operator import attrgetter
from struct import Struct
+from six import iteritems
+
from .Hbase_thrift import TScan
from .util import thrift_type_to_dict, str_increment, OrderedDict
@@ -22,7 +24,7 @@ pack_i64 = Struct('>q').pack
def make_row(cell_map, include_timestamp):
"""Make a row dict for a cell mapping like ttypes.TRowResult.columns."""
cellfn = include_timestamp and make_cell_timestamp or make_cell
- return dict((cn, cellfn(cell)) for cn, cell in cell_map.iteritems())
+ return dict((cn, cellfn(cell)) for cn, cell in iteritems(cell_map))
def make_ordered_row(sorted_columns, include_timestamp):