Fix signature of six.with_metaclass. #54

Merged
merged 1 commit into from Sep 16, 2013

Projects

None yet

2 participants

@carljm
Contributor
carljm commented Sep 13, 2013

In six 1.4, the signature of with_metaclass has changed from with_metaclass(meta, base=object) to with_metaclass(meta, *bases), allowing for multiple bases. This breaks django-jsonfield, which uses the base kwarg name explicitly. Since Django 1.6b3 updated the bundled django.utils.six to version 1.4.1, this also makes jsonfield broken with Django 1.6b3.

This pull request fixes django-jsonfield's use of six.with_metaclass to not specify the base as a kwarg, but rather as a positional arg, making it compatible with both older and newer versions of Django/six.

@bradjasper bradjasper merged commit f940c1b into dmkoch:master Sep 16, 2013

1 check was pending

default The Travis CI build is in progress
Details
Collaborator

Thanks @carljm!

@jacobb jacobb referenced this pull request in python/pythondotorg Jul 11, 2014
Closed

Upgrade to Django 1.5.8 #465

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment