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

make json_field work with django 1.7+ properly #41

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

make json_field work with django 1.7+ properly #41

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion json_field/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,14 @@
import json
except ImportError: # python < 2.6
from django.utils import simplejson as json
from django.forms import fields, util

from django.forms import fields

import warnings
try:
from django.forms import util
except (Warning, ImportError):
from django.forms import utils as util

import datetime
from decimal import Decimal
Expand Down