Bitbucket cannot automatically merge this request.
The commits that make up this pull request have been removed.
Bitbucket cannot automatically merge this request due to conflicts.
Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:
hg update default
hg pull -r get-classes-issue https://bitbucket.org/evildmp/semanticeditor
hg merge get-classes-issue
hg commit -m 'Merged in evildmp/semanticeditor/get-classes-issue (pull request #8)'
I proposed https://bitbucket.org/spookylukey/semanticeditor/pull-request/5/better-way-of-getting-class-list-in-editor/diff as a solution to https://bitbucket.org/spookylukey/semanticeditor/issue/45/multiselectfield-doesnt-like-being
The problem though is still extant.
When a CssClass with a null templates attribute is saved, templates is saved as [u''] rather than , so the check for templates in models.get_classes() won't find it.
The test attached fails because of this.