Merge lp:~jtv/maas/bug-1311433 into lp:~maas-committers/maas/trunk
Proposed by
Jeroen T. Vermeulen
Status: | Merged |
---|---|
Approved by: | Jeroen T. Vermeulen |
Approved revision: | no longer in the source branch. |
Merged at revision: | 2277 |
Proposed branch: | lp:~jtv/maas/bug-1311433 |
Merge into: | lp:~maas-committers/maas/trunk |
Diff against target: |
35 lines (+10/-3) 1 file modified
src/maasserver/views/combo.py (+10/-3) |
To merge this branch: | bzr merge lp:~jtv/maas/bug-1311433 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jeroen T. Vermeulen (community) | Approve | ||
Review via email: mp+216807@code.launchpad.net |
Commit message
Work around Django failure “AttributeError: 'functools.partial' object has no attribute '__module__'”.
Description of the change
This makes our tests pass again. I also did a very minimal smoke-test run — just run the server and load the front page — though one would hope that the tests cover the views much more thoroughly.
Jeroen
To post a comment you must log in.
Julian saw the patch and told me to land it. I take that as a review approval. And it's hardly likely to make things worse, is it?