Commit 4008109a authored by Petrus J.v.Rensburg's avatar Petrus J.v.Rensburg

Merge branch 'master' into docs

parents 3fe20103 532be52b
......@@ -76,7 +76,7 @@ class InlineFieldList(FieldList):
_fake = type(str('_fake'), (object, ), {})
output = []
for field, data in itertools.izip(self.entries, candidates):
for field, data in zip(self.entries, candidates):
if not self.should_delete(field):
fake_obj = _fake()
fake_obj.data = data
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment