MAAS

Merge lp://staging/~danilo/maas/django-upgrade-immutable-querydict into lp://staging/~maas-committers/maas/trunk

django-upgrade-immutable-querydict
Merge into trunk

Proposed by Данило Шеган on 2017-06-20

Status:	Merged
Approved by:	Данило Шеган on 2017-06-21
Approved revision:	no longer in the source branch.
Merged at revision:	6101
Proposed branch:	lp://staging/~danilo/maas/django-upgrade-immutable-querydict
Merge into:	lp://staging/~maas-committers/maas/trunk
Prerequisite:	lp://staging/~danilo/maas/django-upgrade-legacy-migrations
Diff against target:	259 lines (+60/-38) 9 files modified src/maasserver/api/boot_resources.py (+1/-1) src/maasserver/api/commissioning_scripts.py (+8/-6) src/maasserver/api/dnsresourcerecords.py (+6/-5) src/maasserver/api/dnsresources.py (+2/-2) src/maasserver/api/scripts.py (+10/-8) src/maasserver/forms/__init__.py (+9/-0) src/maasserver/forms/ephemeral.py (+1/-1) src/maasserver/forms/iprange.py (+2/-0) src/maasserver/forms/script.py (+21/-15)
To merge this branch:	bzr merge lp://staging/~danilo/maas/django-upgrade-immutable-querydict
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Blake Rouse (community)		2017-06-20	Approve on 2017-06-20
Review via email: mp+325995@code.staging.launchpad.net

Commit message

Replace all in-place modifying of POST data which is immutable in more recent Django versions.

Description of the change

request.data contains QueryDict objects which have become immutable by default.

In most cases, it was sufficient to create a copy of the data on the API side before passing it on to the form processing machinery (or instantiating the form with it).

But for some reason that did not work that well in LicenseKeyForm: I had to modify the internal "_mutable" attribute to be able to edit the data in-place. The problem is how the data is processed there: it wants to allow API to pass in a combined osystem/distro_series in the distro_series field, thus combines those into one in full_clean(), and then clean() splits those up again. Officially, Django only supports overriding clean(), so we are basically playing with internals that we shouldn't be playing with. I am not sure how to best highlight this case. Perhaps an XXX?

This gets us down to 66 test failures with django 1.11 from ppa:danilo/django-1.11 and django-piston3 from ppa:danilo/django-piston3