Skip to content

Commit b14af88

Browse files
Fix "unexpected keyword argument 'max_length'" in Django 1.7
1 parent 7775f07 commit b14af88

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

json_field/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
from json_field.fields import JSONField
22

3-
__version__ = '0.5.5'
3+
__version__ = '0.5.6'

json_field/forms.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,13 @@ class JSONFormField(fields.Field):
1111

1212
def __init__(self, *args, **kwargs):
1313
from .fields import JSONEncoder, JSONDecoder
14+
1415
self.evaluate = kwargs.pop('evaluate', False)
1516
self.encoder_kwargs = kwargs.pop('encoder_kwargs', {'cls':JSONEncoder})
1617
self.decoder_kwargs = kwargs.pop('decoder_kwargs', {'cls':JSONDecoder, 'parse_float':Decimal})
18+
19+
kwargs.pop('max_length', None)
20+
1721
super(JSONFormField, self).__init__(*args, **kwargs)
1822

1923
def clean(self, value):

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
setup(
1212
name = 'django-json-field',
13-
version = '0.5.5',
13+
version = '0.5.6',
1414
description = description,
1515
author = 'Derek Schaefer',
1616
author_email = '[email protected]',

test_project/app/tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
from django.test import TestCase
1212
from django.db.utils import IntegrityError
13-
from django.utils import simplejson as json
13+
import json
1414

1515
import datetime
1616
from decimal import Decimal

0 commit comments

Comments
 (0)