diff --git a/requirements.txt b/requirements.txt index 81a7143..6ce2887 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -sacrud>=0.3.4 +sacrud>=0.3.5 saexttype colander>=1.0b1 deform>=2.0a2 diff --git a/sacrud_deform/__init__.py b/sacrud_deform/__init__.py index 7ca702f..af6cfed 100644 --- a/sacrud_deform/__init__.py +++ b/sacrud_deform/__init__.py @@ -21,7 +21,7 @@ from .widgets import HiddenCheckboxWidget -class JSONType(colander.String): +class JSONType(colander.SchemaType): def serialize(self, node, appstruct): if appstruct is colander.null: return colander.null @@ -33,7 +33,6 @@ def deserialize(self, node, cstruct): return colander.null try: - return json.loads(cstruct) return cstruct except Exception: raise colander.Invalid( diff --git a/setup.py b/setup.py index 6e64f0f..4286fd0 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ def read(name): setup( name='sacrud_deform', - version="0.1.1", + version="0.1.2", url='http://github.com/ITCase/sacrud_deform/', author='Svintsov Dmitry', author_email='root@uralbash.ru',