Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Check if the value is a string before attempting to deserialize #14

Merged
merged 1 commit into from Jun 1, 2012
Merged

Check if the value is a string before attempting to deserialize #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions jsonfield/fields.py
View file
Open in desktop
Expand Up @@ -14,10 +14,11 @@ def clean(self, value):

value = super(JSONFormField, self).clean(value)

try:
json.loads(value)
except ValueError:
raise FormValidationError(_("Enter valid JSON"))
if isinstance(value, basestring):
try:
json.loads(value)
except ValueError:
raise FormValidationError(_("Enter valid JSON"))
return value

class JSONField(models.TextField):
Expand Down