From b79fedc2152544876f6483c884f5b9f69e9d20ed Mon Sep 17 00:00:00 2001 From: Oskar Hahn Date: Fri, 14 Dec 2012 15:36:57 +0100 Subject: [PATCH] fixed jsonfield for django 1.5 --- openslides/utils/jsonfield/fields.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openslides/utils/jsonfield/fields.py b/openslides/utils/jsonfield/fields.py index 45c66aee4..9b1762214 100644 --- a/openslides/utils/jsonfield/fields.py +++ b/openslides/utils/jsonfield/fields.py @@ -1,8 +1,8 @@ +import json + from django.db import models from django.core.serializers.json import DjangoJSONEncoder -from django.utils import simplejson as json from django.utils.translation import ugettext_lazy as _ - from django.forms.fields import Field from django.forms.util import ValidationError as FormValidationError