Skip to content
This repository was archived by the owner on Sep 15, 2021. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions jsonmapper/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -331,10 +331,22 @@ class DictField(Field):
>>> blog.post.author.name
u'John Doe'

>>> class Blog(Mapping):
... post = DictField(Post, default=None)

>>> blog = Blog()
>>> blog.post is None
True

"""
def __init__(self, mapping=None, name=None, default=None):
default = default or {}
Field.__init__(self, name=name, default=lambda: default.copy())
def __init__(self, mapping=None, name=None, default=DEFAULT):
if default is DEFAULT:
default = {}
elif callable(getattr(default, 'copy', None)):
default = default.copy
else:
default = default
Field.__init__(self, name=name, default=default)
self.mapping = mapping

def _to_python(self, value):
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

setup(
name = 'JSONMapper',
version = '0.1',
version = '0.2',
description = '',
long_description = '',
author = 'Matt Good',
Expand Down