Merge remote-tracking branch 'origin/pr/250'

This commit is contained in:
Ross Lawley 2013-04-12 14:24:18 +00:00
commit d134e11c6d
2 changed files with 33 additions and 1 deletions

View file

@ -171,6 +171,7 @@ class DeReference(object):
if not hasattr(items, 'items'):
is_list = True
as_tuple = isinstance(items, tuple)
iterator = enumerate(items)
data = []
else:
@ -205,7 +206,7 @@ class DeReference(object):
if instance and name:
if is_list:
return BaseList(data, instance, name)
return tuple(data) if as_tuple else BaseList(data, instance, name)
return BaseDict(data, instance, name)
depth += 1
return data