Fix a couple of more iterator changes

Browse Source
This commit is contained in:
Stefan Wehrmeyer 2013-12-18 11:32:58 +01:00
parent 426095634c
commit 2870fdfb0b
5 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dataset/freeze/format/fcsv.py
View File

@ -20,7 +20,7 @@ class CSVSerializer(Serializer):
self.handles = {} self.handles = {}
def write(self, path, result): def write(self, path, result):
keys = result.keys() keys = list(result.keys())
if not path in self.handles: if not path in self.handles:
fh = open(path, 'wb') fh = open(path, 'wb')
writer = csv.writer(fh) writer = csv.writer(fh)
@ -31,7 +31,5 @@ class CSVSerializer(Serializer):
writer.writerow(values) writer.writerow(values)
def close(self): def close(self):
for (writer, fh) in self.handles.values(): for writer, fh in self.handles.values():
fh.close() fh.close()

1
dataset/freeze/format/fjson.py
View File

@ -46,4 +46,3 @@ class JSONSerializer(Serializer):
data) data)
fh.write(data) fh.write(data)
fh.close() fh.close()

2
dataset/freeze/format/ftabson.py
View File

@ -7,7 +7,7 @@ class TabsonSerializer(JSONSerializer):
fields = [] fields = []
data = [] data = []
if len(result): if len(result):
keys = result[0].keys() keys = list(result[0].keys())
fields = [{'id': k} for k in keys] fields = [{'id': k} for k in keys]
for row in result: for row in result:
d = [row.get(k) for k in keys] d = [row.get(k) for k in keys]

4
dataset/persistence/table.py
View File

@ -322,7 +322,7 @@ class Table(object):
self._check_dropped() self._check_dropped()
if not isinstance(order_by, (list, tuple)): if not isinstance(order_by, (list, tuple)):
order_by = [order_by] order_by = [order_by]
order_by = filter(lambda o: o in self.table.columns, order_by) order_by = [o for o in order_by if o in self.table.columns]
order_by = [self._args_to_order_by(o) for o in order_by] order_by = [self._args_to_order_by(o) for o in order_by]
args = self._args_to_clause(_filter) args = self._args_to_clause(_filter)
@ -358,7 +358,7 @@ class Table(object):
""" """
Returns the number of rows in the table. Returns the number of rows in the table.
""" """
d = self.database.query(self.table.count()).next() d = next(self.database.query(self.table.count()))
return list(d.values()).pop() return list(d.values()).pop()
def distinct(self, *columns, **_filter): def distinct(self, *columns, **_filter):

4
dataset/persistence/util.py
View File

@ -33,7 +33,7 @@ class ResultIter(object):
try: try:
self.rp = next(self.result_proxies) self.rp = next(self.result_proxies)
self.count += self.rp.rowcount self.count += self.rp.rowcount
self.keys = self.rp.keys() self.keys = list(self.rp.keys())
return True return True
except StopIteration: except StopIteration:
return False return False
@ -42,7 +42,7 @@ class ResultIter(object):
row = self.rp.fetchone() row = self.rp.fetchone()
if row is None: if row is None:
if self._next_rp(): if self._next_rp():
return self.next() return next(self)
else: else:
# stop here # stop here
raise StopIteration raise StopIteration