Merge lp:~cjwatson/lazr.restful/py3-dict-methods into lp:lazr.restful
Proposed by
Colin Watson
Status: | Merged |
---|---|
Merged at revision: | 248 |
Proposed branch: | lp:~cjwatson/lazr.restful/py3-dict-methods |
Merge into: | lp:lazr.restful |
Diff against target: |
202 lines (+22/-22) 10 files modified
src/lazr/restful/_resource.py (+3/-3) src/lazr/restful/declarations.py (+2/-2) src/lazr/restful/docs/webservice-declarations.rst (+1/-1) src/lazr/restful/docs/webservice-marshallers.rst (+1/-1) src/lazr/restful/docs/webservice.rst (+2/-3) src/lazr/restful/example/base/tests/representation-cache.txt (+6/-5) src/lazr/restful/metazcml.py (+1/-1) src/lazr/restful/simple.py (+1/-1) src/lazr/restful/tales.py (+1/-1) src/lazr/restful/tests/test_declarations.py (+4/-4) |
To merge this branch: | bzr merge lp:~cjwatson/lazr.restful/py3-dict-methods |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
William Grant | code | Approve | |
Review via email: mp+387905@code.launchpad.net |
Commit message
Handle dict method changes in Python 3.
To post a comment you must log in.