Merge lp:~leonardr/lazr.restful/encode-xhtml-field into lp:lazr.restful
Status: | Merged |
---|---|
Approved by: | Curtis Hovey |
Approved revision: | 166 |
Merged at revision: | 167 |
Proposed branch: | lp:~leonardr/lazr.restful/encode-xhtml-field |
Merge into: | lp:lazr.restful |
Diff against target: |
228 lines (+100/-11) (has conflicts) 5 files modified
src/lazr/restful/NEWS.txt (+9/-0) src/lazr/restful/_resource.py (+15/-2) src/lazr/restful/example/base/tests/field.txt (+26/-8) src/lazr/restful/tests/test_webservice.py (+46/-1) src/lazr/restful/version.txt (+4/-0) Text conflict in src/lazr/restful/NEWS.txt Text conflict in src/lazr/restful/tests/test_webservice.py Text conflict in src/lazr/restful/version.txt |
To merge this branch: | bzr merge lp:~leonardr/lazr.restful/encode-xhtml-field |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Curtis Hovey (community) | code | Approve | |
j.c.sackett (community) | code* | Approve | |
Review via email: mp+47536@code.launchpad.net |
Description of the change
Currently, IFieldHTMLRenderer instances must return Unicode, which is encoded to UTF-8. But, the default IFieldHTMLRenderer returns UTF-8, and double-encoding that value can cause problems.
This branch normalizes the behavior of the FieldEntryResource so that IFieldHTMLRenderer instances can return *either* UTF-8 or Unicode. It makes more sense to be flexible than to force developers to remember to do the conversion themselves.
I added a unit test for the default IFieldHTMLRenderer and added to an existing pagetest to test custom IFieldHTMLRende
This branch is off of revision 164 of lazr.restful and will become a point release, which will be integrated into Launchpad to unblock deployment. I did this because later revisions of lazr.restful include changes that aren't ready to go into Launchpad yet.
Here's the diff against revision 164:
http://
I'm not sure, mechanically, how to get this branch into the lazr.restful trunk. I may revert back to revision 164, commit this branch, do a release, and then re-integrate my work in progress.
Looks good to me. Good luck with the merge.