diff options
| author | Wouter Bolsterlee <uws@xs4all.nl> | 2013-11-17 00:53:19 +0100 |
|---|---|---|
| committer | Wouter Bolsterlee <uws@xs4all.nl> | 2013-11-17 00:53:19 +0100 |
| commit | 69babd1f163596dfd16a68134ecd600a7aa4623a (patch) | |
| tree | 45e84613b39d06e3e2381fb85fba75a8891c9edb | |
| parent | 24685ceb98ee4d051d388875b8dd99aaf738cfd1 (diff) | |
| download | happybase-69babd1f163596dfd16a68134ecd600a7aa4623a.tar.gz | |
Minor cleanups
| -rw-r--r-- | happybase/table.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/happybase/table.py b/happybase/table.py index 0441a2c..cbbe144 100644 --- a/happybase/table.py +++ b/happybase/table.py @@ -246,8 +246,8 @@ class Table(object): If `limit` is given, at most `limit` results will be returned. If `sorted_columns` is `True`, the columns in the rows returned - by this scanner will be retrieved in sorted_columns order, and - the data will be stored in `OrderedDict` instances. + by this scanner will be retrieved in sorted order, and the data + will be stored in `OrderedDict` instances. The `batch_size` argument specifies how many results should be retrieved per batch when retrieving results from the scanner. Only set @@ -361,14 +361,13 @@ class Table(object): n_fetched += len(items) for n_returned, item in enumerate(items, n_returned + 1): - row_key = item.row if sorted_columns: row = make_ordered_row(item.sortedColumns, include_timestamp) else: row = make_row(item.columns, include_timestamp) - yield row_key, row + yield item.row, row if limit is not None and n_returned == limit: return |